From 50bebf451dcb973f56bec43b8756badb2337d5d4 Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Fri, 8 Nov 2024 09:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=97=E5=AE=BD=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/plan/planList/components/devPopup.vue  | 12 ++++++------
 frontend/src/views/plan/planList/index.vue           |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/views/plan/planList/components/devPopup.vue b/frontend/src/views/plan/planList/components/devPopup.vue
index 484ea60..f77095b 100644
--- a/frontend/src/views/plan/planList/components/devPopup.vue
+++ b/frontend/src/views/plan/planList/components/devPopup.vue
@@ -24,7 +24,7 @@
           <el-button type='primary' :icon='Download' tooltip @click="showDeviceSelectOpen">筛选设备</el-button>
         </el-tooltip>
         <el-tooltip content="把设备列表导出成文件" placement="top" :disabled='!scope.isSelected'>
-          <el-button type='primary' :icon='Download' tooltip >导出设备</el-button>
+          <el-button type='primary' :icon='Download' :disabled='!scope.isSelected' tooltip >导出设备</el-button>
         </el-tooltip>
           <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>
            批量移除
@@ -68,7 +68,7 @@
     {
       prop: 'dev_Type',
       label: '类型',
-      minWidth: 100,
+      minWidth: 180,
     },
     {
       prop: 'dev_Chns',
@@ -83,22 +83,22 @@
     {
       prop: 'report_State',
       label: '报告状态',
-      minWidth: 130,
+      minWidth: 110,
     },
     {
       prop: 'check_Result',
       label: '检测结果',
-      minWidth: 130,
+      minWidth: 110,
     },
     {
       prop: 'check_State',
       label: '检测状态',
-      minWidth: 130,
+      minWidth: 110,
     },
     {
       prop: 'document_State',
       label: '归档状态',
-      minWidth: 130,
+      minWidth: 110,
     },
     { prop: 'operation', label: '操作', fixed: 'right', minWidth: 150 },
   ])
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index efb2da9..b7340a3 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -224,8 +224,8 @@ const combineClick = () => {
     '请输入合并后的计划名称',
     '检测计划合并',
     {
-      confirmButtonText: 'OK',
-      cancelButtonText: 'Cancel',
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
     }
   )
     .then(({ value }) => {