From 548781e8e5da9b5f8461a1a0b0ccf6ae00b6b6ef Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 8 Sep 2023 19:45:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B6=E6=AE=B5=E6=80=A7=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/book/clock-add-or-update.vue | 12 ++++++++++--
 src/views/modules/book/clock.vue               | 14 ++++++++------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/book/clock-add-or-update.vue b/src/views/modules/book/clock-add-or-update.vue
index 1835210..0d9bd4b 100644
--- a/src/views/modules/book/clock-add-or-update.vue
+++ b/src/views/modules/book/clock-add-or-update.vue
@@ -51,7 +51,7 @@
           <el-button slot="trigger" size="small" type="primary">上传文件</el-button>
         </el-upload>
         <div>          
-          <video controls width="250" v-if="dataForm.video">   
+          <video controls width="250" v-if="dataForm.video != ''">   
             <source :src="dataForm.video" type="video/mp4" />
             
           </video>
@@ -209,7 +209,11 @@
                 this.dataForm.days = data.bookTaskEntity.days
                 this.dataForm.productImages = data.bookTaskEntity.images 
                 this.dataForm.productDetails = data.bookTaskEntity.content             
-               console.log(this.dataForm.video,'this.dataForm.video')
+                console.log(this.dataForm.video, 'this.dataForm.video')
+                this.videoList.push({
+                  name: data.bookTaskEntity.heading,
+                  url: data.bookTaskEntity.video
+                  })
                 if (data.bookTaskEntity.images != "") {
                   var img = {
                     name: '',
@@ -274,6 +278,8 @@
                   onClose: () => {
                     this.visible = false
                     this.dataForm.productDetails = ''
+                    this.dataForm.video = ''
+                    this.videoList = []
                     this.$refs['dataForm'].resetFields()
                     // this.$refs['dataForm'].reset()
                     this.$emit('refreshDataList')
@@ -361,6 +367,8 @@
     },
       handlereset() {
         this.fileList = [],
+          this.videoList = [] // 清空视频列表
+        this.dataForm.video = ''
           this.visible = false
         this.swiperfileList = []
         this.$refs['dataForm'].resetFields()
diff --git a/src/views/modules/book/clock.vue b/src/views/modules/book/clock.vue
index 309ec1c..7a0e4ee 100644
--- a/src/views/modules/book/clock.vue
+++ b/src/views/modules/book/clock.vue
@@ -15,6 +15,7 @@
         border
         v-loading="dataListLoading"
         @selection-change="selectionChangeHandle"
+        :default-sort = "{prop: 'days', order: 'ascending'}"
         style="width: 100%;">
         <el-table-column
           type="selection"
@@ -22,11 +23,11 @@
           align="center"
           width="50">
         </el-table-column>
-        <el-table-column label="序号" width="70" align="center">
+        <!-- <el-table-column label="序号" width="70" align="center">
           <template slot-scope="scope">
             {{ (pageIndex - 1) * pageSize + scope.$index + 1 }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <!-- <el-table-column
           prop="id"
           header-align="center"
@@ -34,15 +35,16 @@
           label="">
         </el-table-column>
         -->
-        <el-table-column
-          prop="heading"
-          label="主题">
-        </el-table-column>
         <el-table-column
           prop="days"         
           align="center"
           label="第N天">
         </el-table-column>
+        <el-table-column
+          prop="heading"
+          label="主题">
+        </el-table-column>
+        
         <el-table-column
           prop="content"
           header-align="center"