From ed9a2364556542b1ba4314c1c458d16f2458a6d1 Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Thu, 26 Dec 2024 12:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9SE3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/store/modules/chat.js     | 13 ++++++++++---
 src/renderer/views/dashboard/index.vue |  9 +++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js
index f0dfed5..5a717c1 100644
--- a/src/renderer/store/modules/chat.js
+++ b/src/renderer/store/modules/chat.js
@@ -359,12 +359,19 @@ const actions = {
         // 驱动信息
       } else if (data.resp_name === 'cd_info') {
         const list = data.resp_info.cd_list
-        let cds = [{}, {}]
+        let cds = []
         let isBD = false
         for (let i = 0; i < list.length; i++) {
           if (list[i].dev_type == 3) isBD = true
-          if (list[i].cd_pos == 2) cds[0] = list[i]
-          else cds[1] = list[i]
+          if (i === 0) {
+            cds.push(list[i])
+          } else {
+            if (list[i].cd_pos == 2) {
+              cds.unshift(list[i])
+            } else {
+              cds.push(list[i])
+            }
+          }
         }
         let types = CDTypes
         let typeLists = cd_types
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue
index 42b2977..e9ed6b4 100644
--- a/src/renderer/views/dashboard/index.vue
+++ b/src/renderer/views/dashboard/index.vue
@@ -85,7 +85,7 @@
                           </el-dropdown>
                         </div>
                       </div>
-                      <div class="device_info_option">
+                      <div v-if="printer_info.strong_list[1]" class="device_info_option">
                         <div class="device_info_option_box">
                           <img src="@/assets/images/device4.png" />
                           <div class="device_info_option_cap">
@@ -202,8 +202,8 @@
                 <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>
-            <div class="flex_box flex_row_between device_right_top_item">
+            <div v-if="cd_list[1]" class="device_right_top_line"></div>
+            <div v-if="cd_list[1]" class="flex_box flex_row_between device_right_top_item">
               <div class="device_right_top_img">
                 <img v-if="cd_list[1].cd_status == 4 && cd_list[1].cd_type" src="@/assets/images/device3.png" />
                 <img v-else src="@/assets/images/device2.png" />
@@ -577,7 +577,8 @@ export default {
       that
         .$prompt('请输入管理员密码并点击确定以执行开启服务操作', '温馨提示', {
           confirmButtonText: '确定',
-          cancelButtonText: '取消'
+          cancelButtonText: '取消',
+          inputType: 'password',
         })
         .then(({ value }) => {
           that.serviceLoading = true