From c2dc433d878e4228b492126b94edba28f896b8e4 Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Sat, 30 Nov 2024 13:21:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/workAdd/workAdd.vue | 13 ++++---------
 src/renderer/views/dashboard/index.vue      |  8 ++++----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue
index 79cbcbe..80ae7b0 100644
--- a/src/renderer/components/workAdd/workAdd.vue
+++ b/src/renderer/components/workAdd/workAdd.vue
@@ -321,7 +321,7 @@ export default {
         req_type: 1,
         req_info: {
           uuid: '',
-          file_name: 'templ.csv',
+          file_name: 'temp.csv',
           file_text: ''
         }
       },
@@ -558,15 +558,10 @@ export default {
           if (item.type == 1&&that.$refs[item.origin_name][0].files[0]) {
             item.val = that.$refs[item.origin_name][0].files[0].path
           }
+          if (!item.val) {
+            item.val = item.default
+          }
         })
-        const isEmpty = that.soonList.some((item) => item.val === '')
-        if (isEmpty) {
-          that.$message({
-            message: '可变字段不能为空',
-            type: 'warning'
-          })
-          return
-        }
         let csv1 = that.soonList.map(item => item.origin_name).join(',')
         let csv2 = that.soonList.map(item => item.val).join(',')
         that.csvForm.req_info.file_text = csv1 + '\n' + csv2
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue
index 24b97bb..9174105 100644
--- a/src/renderer/views/dashboard/index.vue
+++ b/src/renderer/views/dashboard/index.vue
@@ -177,8 +177,8 @@
                   <div class="device_right_top_text">已刻录{{ $filterSize(cd_list[0].use_size) }}，共{{ $filterSize(cd_list[0].total_size) }}<span v-if="cd_list[0].burn_speed">，速度{{ cd_list[0].burn_speed }}X</span></div>
                 </template>
                 <div class="device_right_top_text">状态：{{ $store.state.chat.CDStatus[cd_list[0].cd_status] }}</div>
-                <div class="device_right_top_text">任务：{{ cd_list[0].cd_taskid || '' }}</div>
-                <div class="device_right_top_text">光盘：{{ cd_list[0].cd_assid || '' }}</div>
+                <div class="device_right_top_text">任务：{{ cd_list[0].cd_taskid && cd_list[0].copy_scheduler ? cd_list[0].cd_taskid : '' }}</div>
+                <div class="device_right_top_text">光盘：{{ cd_list[0].cd_assid && cd_list[0].copy_scheduler ? cd_list[0].cd_assid : '' }}</div>
               </div>
             </div>
             <div class="device_right_top_line"></div>
@@ -198,8 +198,8 @@
                   <div class="device_right_top_text">已刻录{{ $filterSize(cd_list[1].use_size) }}，共{{ $filterSize(cd_list[1].total_size) }}<span v-if="cd_list[1].burn_speed">，速度{{ cd_list[1].burn_speed }}X</span></div>
                 </template>
                 <div class="device_right_top_text">状态：{{ $store.state.chat.CDStatus[cd_list[1].cd_status] }}</div>
-                <div class="device_right_top_text">任务：{{ cd_list[1].cd_taskid || '' }}</div>
-                <div class="device_right_top_text">光盘：{{ cd_list[1].cd_assid || '' }}</div>
+                <div class="device_right_top_text">任务：{{ cd_list[1].cd_taskid && cd_list[1].copy_scheduler ? cd_list[1].cd_taskid : '' }}</div>
+                <div class="device_right_top_text">光盘：{{ cd_list[1].cd_assid && cd_list[1].copy_scheduler ? cd_list[1].cd_assid : '' }}</div>
               </div>
             </div>
           </div>