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 @@ 筛选设备 - 导出设备 + 导出设备 批量移除 @@ -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 }) => {