From 9c3850db98aab692653347b12cb957557b31ca44 Mon Sep 17 00:00:00 2001 From: GYYM <704080176@qq.com> Date: Fri, 6 Dec 2024 09:21:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/home/components/dataCheckChangeErrSysPopup.vue | 2 +- frontend/src/views/home/components/dataCheckPopup.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue index a2d5b28..69df91b 100644 --- a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue +++ b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue @@ -268,7 +268,7 @@ import dataCheckSingleChannelSingleTestPopup from './dataCheckSingleChannelSingl const qualified = ref(0) const reportDisabled = ref(true) const reportDialogVisible = ref(false) -const deviceName = ref('被检设备1'); +const deviceName = ref('240001'); const error_Sys_Id = ref('2'); const testScriptName = ref('Q/GDW 10650.4-2021 模拟式'); const errorSysName = ref('Q/GDW 10650.2 - 2021'); diff --git a/frontend/src/views/home/components/dataCheckPopup.vue b/frontend/src/views/home/components/dataCheckPopup.vue index 9d8f5ee..f36e526 100644 --- a/frontend/src/views/home/components/dataCheckPopup.vue +++ b/frontend/src/views/home/components/dataCheckPopup.vue @@ -9,7 +9,7 @@ - + @@ -102,7 +102,7 @@ import DataCheckResultTable from './dataCheckResultTable.vue' import DataCheckRawDataTable from './dataCheckRawDataTable.vue' const formContent = ref({}) const activeName = ref('rawDataTab') -const deviceName = ref('被检设备1'); +const deviceName = ref('240001'); const monitorIdx = ref('1'); const reCheckIdx = ref('3'); const testScriptName = ref('Q/GDW 10650.4-2021 模拟式'); From a73417ea02dcd9e202249092a68817695b438ec1 Mon Sep 17 00:00:00 2001 From: GYYM <704080176@qq.com> Date: Fri, 6 Dec 2024 15:06:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E6=A3=80?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/device/device/deviceData.ts | 48 +++++++++---------- frontend/src/api/plan/static.json | 2 +- frontend/src/views/home/components/table.vue | 22 ++++----- frontend/src/views/home/components/test.vue | 12 ++++- .../src/views/home/components/testPopup.vue | 2 +- .../src/views/home/components/timeTest.vue | 12 ++--- frontend/src/views/home/components/tree.vue | 2 +- frontend/src/views/home/tabs/dashboard.vue | 8 ++-- .../views/plan/autoTest/components/table.vue | 4 +- .../src/views/plan/singlePlanList/index.vue | 4 +- 10 files changed, 63 insertions(+), 53 deletions(-) diff --git a/frontend/src/api/device/device/deviceData.ts b/frontend/src/api/device/device/deviceData.ts index d49aeab..11b38a9 100644 --- a/frontend/src/api/device/device/deviceData.ts +++ b/frontend/src/api/device/device/deviceData.ts @@ -50,10 +50,10 @@ const data = [ name: '240001', //设备名称 dev_Type: 'PQS-882B4',//设备类型 dev_Chns: 4, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -61,10 +61,10 @@ const data = [ name: '240002', //设备名称 dev_Type: 'PQS-882B4',//设备类型 dev_Chns: 4, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -72,10 +72,10 @@ const data = [ name: '240003', //设备名称 dev_Type: 'PQS-882B4',//设备类型 dev_Chns: 4, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -83,10 +83,10 @@ const data = [ name: '240004', //设备名称 dev_Type: 'PQS-882B4',//设备类型 dev_Chns: 4, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -182,10 +182,10 @@ const data = [ name: '240013', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -193,10 +193,10 @@ const data = [ name: '240014', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -204,10 +204,10 @@ const data = [ name: '240013', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -215,10 +215,10 @@ const data = [ name: '240014', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -226,10 +226,10 @@ const data = [ name: '240017', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -237,10 +237,10 @@ const data = [ name: '240018', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -248,10 +248,10 @@ const data = [ name: '240019', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, { @@ -259,10 +259,10 @@ const data = [ name: '240020', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '未检测', //检测结果 + check_Result: '未检', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 - check_State:'未检测',//检测状态 + check_State:'未检',//检测状态 reCheck_Num: 0, //复检次数 }, ] diff --git a/frontend/src/api/plan/static.json b/frontend/src/api/plan/static.json index f34325e..298f8da 100644 --- a/frontend/src/api/plan/static.json +++ b/frontend/src/api/plan/static.json @@ -2,7 +2,7 @@ "code": "200", "data": [ { - "name": "未检测", + "name": "未检", "children": [ { "id": 4, diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index faff8d1..f32c8e0 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -286,7 +286,7 @@ const selectionShow = ref(true); //检测状态数据 let checkStatusList = reactive([ { - label: "未检测", + label: "未检", value: 0, disabled: false, }, @@ -309,7 +309,7 @@ let checkStatusList = reactive([ //检测报告状态数据 let checkReportStatusList = reactive([ { - label: "未检测", + label: "未检", value: 0, disabled: false, }, @@ -327,7 +327,7 @@ let checkReportStatusList = reactive([ //检测结果数组 let checkResultList = reactive([ { - label: "未检测", + label: "未检", value: 0, disabled: false, }, @@ -553,7 +553,7 @@ const columns = reactive([ // width: 120, // render: (scope) => { // return scope.row.checkStatus == 1 - // ? "未检测" + // ? "未检" // : scope.row.checkStatus == 2 // ? "检测中" // : scope.row.checkStatus == 3 @@ -756,7 +756,7 @@ function tableHeaderInit(val: number) { // form.value.checkStatus = 2;//检测状态默认为检测完成 // form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告 // form.value.checkResult = 1;//检测结果默认为不合格 - // disableCheckStatus("未检测") + // disableCheckStatus("未检") // disableCheckStatus("检测中") // disableCheckStatus("归档") // disablecheckResultList("未出结果") @@ -766,11 +766,11 @@ function tableHeaderInit(val: number) { // form.value.checkStatus = 2;//检测状态默认为检测完成 // form.value.checkReportStatus = 0;//检测报告状态默认为未生成报告 // form.value.checkResult = 2;//检测结果默认为合格 - // disableCheckStatus("未检测") + // disableCheckStatus("未检") // disableCheckStatus("检测中") // disableCheckStatus("归档") - disablecheckResultList("未检测") - disableCheckReportStatus("未检测") + disablecheckResultList("未检") + disableCheckReportStatus("未检") columns[columns.length - 1].minWidth = 180; tableKey.value += 1; operationShow.value = true; @@ -782,7 +782,7 @@ function tableHeaderInit(val: number) { // form.value.checkStatus = 2;//检测状态默认为检测完成 // form.value.checkReportStatus = 1;//检测报告状态默认为已生成报告 // form.value.checkResult = 2;//检测结果默认为合格 - // disableCheckStatus("未检测") + // disableCheckStatus("未检") // disableCheckStatus("检测中") // disableCheckStatus("归档") disableCheckReportStatus("未生成报告") @@ -795,8 +795,8 @@ function tableHeaderInit(val: number) { selectionShow.value = true; break; case 5://数据查询 - disablecheckResultList("未检测") - disableCheckReportStatus("未检测") + disablecheckResultList("未检") + disableCheckReportStatus("未检") columns[columns.length - 1].minWidth = 250; operationShow.value = true; documentStateShow.value = true; diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 2888842..52f9508 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -1916,10 +1916,20 @@ watch(ts, function (newValue, oldValue) { :deep(.el-table .warning-row) { // background-color:var(--el-color-warning-light-9); //background-color:#bed96557; - color:red; + color:red; // font-size:30px; // --el-table-tr-bg-color: var(--el-color-warning-light-9); + // background-color:#f5f7fa; + // position: relative; } + +// :deep(.el-table .warning-row::before) { +// content: '*'; /* 必须设置content属性 */ +// position: absolute; +// color:red; +// background-color:#f5f7fa; +// } + .el-table .success-row { --el-table-tr-bg-color: var(--el-color-success-light-9); } diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue index 417990c..48a26fe 100644 --- a/frontend/src/views/home/components/testPopup.vue +++ b/frontend/src/views/home/components/testPopup.vue @@ -3,7 +3,7 @@
- + diff --git a/frontend/src/views/home/components/timeTest.vue b/frontend/src/views/home/components/timeTest.vue index 9d4d014..c4dc9ac 100644 --- a/frontend/src/views/home/components/timeTest.vue +++ b/frontend/src/views/home/components/timeTest.vue @@ -4,11 +4,11 @@
- - - - - + + + + + diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue index becaf49..114f5f1 100644 --- a/frontend/src/views/home/tabs/dashboard.vue +++ b/frontend/src/views/home/tabs/dashboard.vue @@ -251,13 +251,13 @@ const chartsData1: any = ref([]), const getPieData = () => { chartsData1.value = [ - { value: 12, name: "未检测", itemStyle: { color: '#fac858' } }, + { value: 12, name: "未检", itemStyle: { color: '#fac858' } }, { value: 0, name: "检测中", itemStyle: { color: '#ee6666' } }, { value: 6, name: "检测完成", itemStyle: { color: '#91cc75' } }, { value: 2, name: "归档", itemStyle: { color: '#5470c6' } }, ]; chartsData2.value = [ - { value: 12, name: "未检测" , itemStyle: { color: '#fac858' } }, + { value: 12, name: "未检" , itemStyle: { color: '#fac858' } }, { value: 3, name: "不合格" , itemStyle: { color: '#ee6666' } }, { value: 5, name: "合格", itemStyle: { color: '#91cc75' } }, // { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项" , itemStyle: { color: '#ee6666' } }, @@ -268,12 +268,12 @@ const getPieData = () => { // { value: Math.floor(Math.random() * 100) + 1, name: "已生成报告" }, // { value: Math.floor(Math.random() * 100) + 1, name: "未生成报告" }, - { value: 12, name: "未检测" , itemStyle: { color: '#fac858' } }, + { value: 12, name: "未检" , itemStyle: { color: '#fac858' } }, { value: 4, name: "未生成" , itemStyle: { color: '#ee6666' } }, { value: 4, name: "已生成", itemStyle: { color: '#91cc75' } }, - // { value: Math.floor(Math.random() * 100) + 1, name: "未检测" , itemStyle: { color: '#fac858' } }, + // { value: Math.floor(Math.random() * 100) + 1, name: "未检" , itemStyle: { color: '#fac858' } }, // { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项未生成报告" }, // { value: Math.floor(Math.random() * 100) + 1, name: "全部合格未生成报告" }, // { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项已生成报告" }, diff --git a/frontend/src/views/plan/autoTest/components/table.vue b/frontend/src/views/plan/autoTest/components/table.vue index 6c76edc..cfec6a9 100644 --- a/frontend/src/views/plan/autoTest/components/table.vue +++ b/frontend/src/views/plan/autoTest/components/table.vue @@ -157,7 +157,7 @@ tableHeight.value = window.innerHeight - 630; //检测状态数据 const checkStatusList = [ { - label: "未检测", + label: "未检", value: 0, }, { @@ -385,7 +385,7 @@ const columns = reactive[]>([ // width: 120, // render: (scope) => { // return scope.row.checkStatus == 1 - // ? "未检测" + // ? "未检" // : scope.row.checkStatus == 2 // ? "检测中" // : scope.row.checkStatus == 3 diff --git a/frontend/src/views/plan/singlePlanList/index.vue b/frontend/src/views/plan/singlePlanList/index.vue index 224b303..77ecf79 100644 --- a/frontend/src/views/plan/singlePlanList/index.vue +++ b/frontend/src/views/plan/singlePlanList/index.vue @@ -36,7 +36,7 @@ - + @@ -342,7 +342,7 @@ const columns = reactive[]>([ width: 120, render: (scope) => { return scope.row.checkStatus == 1 - ? "未检测" + ? "未检" : scope.row.checkStatus == 2 ? "检测中" : scope.row.checkStatus == 3 From 6d7f045bced2b2b318e14f7a41300500995bd1b0 Mon Sep 17 00:00:00 2001 From: GYYM <704080176@qq.com> Date: Mon, 9 Dec 2024 16:17:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BD=92=E6=A1=A3=E9=A1=B5=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/device/device/deviceData.ts | 16 ++-- frontend/src/views/home/components/table.vue | 82 +++++++------------- frontend/src/views/home/components/test.vue | 11 +-- frontend/src/views/home/tabs/dashboard.vue | 25 +++--- 4 files changed, 55 insertions(+), 79 deletions(-) diff --git a/frontend/src/api/device/device/deviceData.ts b/frontend/src/api/device/device/deviceData.ts index 11b38a9..94b3590 100644 --- a/frontend/src/api/device/device/deviceData.ts +++ b/frontend/src/api/device/device/deviceData.ts @@ -94,7 +94,7 @@ const data = [ name: '240005', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '不合格', //检测结果 + check_Result: '不符合', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 check_State:'检测完成',//检测状态 @@ -105,7 +105,7 @@ const data = [ name: '240006', //设备名称 dev_Type: 'PQS-882B4',//设备类型 dev_Chns: 4, //设备通道数 - check_Result: '不合格', //检测结果 + check_Result: '不符合', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 check_State:'检测完成',//检测状态 @@ -116,7 +116,7 @@ const data = [ name: '240007', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '合格', //检测结果 + check_Result: '符合', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 check_State:'检测完成',//检测状态 @@ -127,7 +127,7 @@ const data = [ name: '240008', //设备名称 dev_Type: 'PQS-882B4',//设备类型 dev_Chns: 4, //设备通道数 - check_Result: '合格', //检测结果 + check_Result: '符合', //检测结果 report_State: '未生成', //报告状态 document_State: '未归档', //归档状态 check_State:'检测完成',//检测状态 @@ -138,7 +138,7 @@ const data = [ name: '240009', //设备名称 dev_Type: 'PQS-882B4',//设备类型 dev_Chns: 4, //设备通道数 - check_Result: '不合格', //检测结果 + check_Result: '不符合', //检测结果 report_State: '已生成', //报告状态 document_State: '未归档', //归档状态 check_State:'检测完成',//检测状态 @@ -149,7 +149,7 @@ const data = [ name: '240010', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '合格', //检测结果 + check_Result: '符合', //检测结果 report_State: '已生成', //报告状态 document_State: '未归档', //归档状态 check_State:'检测完成',//检测状态 @@ -160,7 +160,7 @@ const data = [ name: '240011', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 - check_Result: '合格', //检测结果 + check_Result: '符合', //检测结果 report_State: '已生成', //报告状态 document_State: '已归档', //归档状态 check_State:'检测完成',//检测状态 @@ -171,7 +171,7 @@ const data = [ name: '240012', //设备名称 dev_Type: 'PQS-882B4',//设备类型 dev_Chns: 4, //设备通道数 - check_Result: '合格', //检测结果 + check_Result: '符合', //检测结果 report_State: '已生成', //报告状态 document_State: '已归档', //归档状态 check_State:'检测完成',//检测状态 diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index f32c8e0..3d6af8e 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -21,7 +21,7 @@ - + - + - 归档 + 归档 设备新增 + >设备新增 @@ -166,7 +164,7 @@ link :icon="Notebook" @click="openDrawer('归档', scope.row)" - v-if="form.activeTabs === 0" + v-if="form.activeTabs === 4" :disabled = "scope.row.check_State != '检测完成'" >归档 @@ -332,12 +330,12 @@ let checkResultList = reactive([ disabled: false, }, { - label: "不合格", + label: "不符合", value: 1, disabled: false, }, { - label: "合格", + label: "符合", value: 2, disabled: false, }, @@ -434,7 +432,7 @@ const columns = reactive([ minWidth: 100, sortable:true, render: (scope) => { - if(scope.row.check_Result === '不合格') + if(scope.row.check_Result === '不符合') { return ( { scope.row.check_Result } @@ -636,7 +634,7 @@ const handleSelectionChange = (selection: any[]) => { } devTestedNum = selection.filter((item) => item.check_State === '检测完成').length; - const result = selection.filter((item) => item.check_Result != "不合格") + const result = selection.filter((item) => item.check_Result != "不符合") if(result.length > 0) { testType= "test"; @@ -650,10 +648,14 @@ const handleSelectionChange = (selection: any[]) => { //查询 const handleSearch = () => { - if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档 + if(form.value.activeTabs === 0)//设备检测、设备归档 { deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.document_State === "未归档") } + else if(form.value.activeTabs === 4) + { + deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档"); + } else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询 { deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成"); @@ -668,11 +670,14 @@ const handleRefresh = () => { form.value.checkResult = null; form.value.checkReportStatus = null; - - if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档 + if(form.value.activeTabs === 0)//设备检测、设备归档 { deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.document_State === "未归档") } + else if(form.value.activeTabs === 4) + { + deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档"); + } else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询 { deviceData.value = deviceDataList.plan_devicedata.filter((item) => item.check_State === "检测完成"); @@ -691,42 +696,7 @@ const sortTable = ({ ElMessage.success("修改列表排序成功"); }; -// 删除用户信息 -const deleteAccount = async (params: User.ResUserList) => { - await useHandleData( - deleteUser, - { id: [params.id] }, - `删除【${params.username}】` - ); - proTable.value?.getTableList(); -}; -// 批量删除用户信息 -const batchDelete = async (id: string[]) => { - await useHandleData(deleteUser, { id }, "删除所选用户信息"); - proTable.value?.clearSelection(); - proTable.value?.getTableList(); -}; - -// 重置用户密码 -const resetPass = async (params: User.ResUserList) => { - await useHandleData( - resetUserPassWord, - { id: params.id }, - `重置【${params.username}】用户密码` - ); - proTable.value?.getTableList(); -}; - -// 切换用户状态 -const changeStatus = async (row: User.ResUserList) => { - await useHandleData( - changeUserStatus, - { id: row.id, status: row.status == 1 ? 0 : 1 }, - `切换【${row.username}】用户状态` - ); - proTable.value?.getTableList(); -}; //顶部功能切换时修改activeTabs const changeActiveTabs = (val: number,val2: number,tabledata:any[]) => { form.value.activeTabs = val; @@ -745,9 +715,9 @@ function tableHeaderInit(val: number) { //disableCheckStatus("检测中") disableCheckStatus("归档") // operationShow.value = false; - columns[columns.length - 1].minWidth = 100; + // columns[columns.length - 1].minWidth = 100; tableKey.value ++; - operationShow.value = true; + operationShow.value = false; documentStateShow.value = false; checkStateShow.value = true; selectionShow.value = true; @@ -785,12 +755,12 @@ function tableHeaderInit(val: number) { // disableCheckStatus("未检") // disableCheckStatus("检测中") // disableCheckStatus("归档") - disableCheckReportStatus("未生成报告") - disablecheckResultList("未出结果") + disablecheckResultList("未检") + disableCheckReportStatus("未检") columns[columns.length - 1].minWidth = 100; - tableKey.value ++; + tableKey.value += 1; operationShow.value = true; - documentStateShow.value = true; + documentStateShow.value = false; checkStateShow.value = false; selectionShow.value = true; break; diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 52f9508..819cf63 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -8,10 +8,11 @@ :color="customColors" /> + 暂停检测继续检测 - 重新检测 + > --> @@ -228,7 +229,7 @@
- +

{{ item.log }}
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue index 114f5f1..c10d67e 100644 --- a/frontend/src/views/home/tabs/dashboard.vue +++ b/frontend/src/views/home/tabs/dashboard.vue @@ -183,17 +183,17 @@ const tabsList = ref([ checked: false, }, { - label: "数据查询", + label: "设备归档", + value: 4, + img: "/src/assets/images/plan/static/4.svg", + checked: false, + }, + { + label: "数据操作", value: 5, img: "/src/assets/images/plan/static/5.svg", checked: false, }, - // { - // label: "设备归档", - // value: 4, - // img: "/src/assets/images/plan/static/4.svg", - // checked: false, - // }, ]); form.value.activeTabs = tabsList.value[0].value; @@ -208,11 +208,16 @@ watch( console.log(form.value.activeTabs,111); - if(form.value.activeTabs === 0 || form.value.activeTabs === 4)//设备检测、设备归档 + if(form.value.activeTabs === 0 )//设备检测 { const tabledata = deviceData.filter((item) => item.document_State === "未归档") tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs,form.value.activeChildTabs,tabledata); } + else if(form.value.activeTabs === 4)//设备归档 + { + const tabledata = deviceData.filter((item) => item.check_State === "检测完成" && item.document_State === "未归档") + tableRef1.value && tableRef1.value.changeActiveTabs(form.value.activeTabs,form.value.activeChildTabs,tabledata); + } else if(form.value.activeTabs === 3 || form.value.activeTabs === 5)//报告生成、数据查询 { const tabledata = deviceData.filter((item) => item.check_State === "检测完成"); @@ -258,8 +263,8 @@ const getPieData = () => { ]; chartsData2.value = [ { value: 12, name: "未检" , itemStyle: { color: '#fac858' } }, - { value: 3, name: "不合格" , itemStyle: { color: '#ee6666' } }, - { value: 5, name: "合格", itemStyle: { color: '#91cc75' } }, + { value: 3, name: "不符合" , itemStyle: { color: '#ee6666' } }, + { value: 5, name: "符合", itemStyle: { color: '#91cc75' } }, // { value: Math.floor(Math.random() * 100) + 1, name: "有不合格项" , itemStyle: { color: '#ee6666' } }, // { value: Math.floor(Math.random() * 100) + 1, name: "全部合格", itemStyle: { color: '#91cc75' } }, ]; From 167716e61b8979df5150bee74a51940504c0c397 Mon Sep 17 00:00:00 2001 From: GYYM <704080176@qq.com> Date: Wed, 11 Dec 2024 17:46:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E3=80=81=E5=AE=88?= =?UTF-8?q?=E6=97=B6=E6=A3=80=E6=B5=8B=E9=A1=B5=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/device/device/deviceData.ts | 4 +- .../components/dataCheckChangeErrSysPopup.vue | 2 +- frontend/src/views/home/components/table.vue | 37 ++- frontend/src/views/home/components/test.vue | 52 ++++- .../src/views/home/components/timeTest.vue | 217 +++++++++++------- frontend/src/views/home/tabs/dashboard.vue | 7 +- 6 files changed, 224 insertions(+), 95 deletions(-) diff --git a/frontend/src/api/device/device/deviceData.ts b/frontend/src/api/device/device/deviceData.ts index 94b3590..58e2215 100644 --- a/frontend/src/api/device/device/deviceData.ts +++ b/frontend/src/api/device/device/deviceData.ts @@ -201,7 +201,7 @@ const data = [ }, { id: '15', //装置序号ID - name: '240013', //设备名称 + name: '240015', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 check_Result: '未检', //检测结果 @@ -212,7 +212,7 @@ const data = [ }, { id: '16', //装置序号ID - name: '240014', //设备名称 + name: '240016', //设备名称 dev_Type: 'PQS-882A',//设备类型 dev_Chns: 1, //设备通道数 check_Result: '未检', //检测结果 diff --git a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue index 69df91b..16f56c6 100644 --- a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue +++ b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue @@ -269,7 +269,7 @@ const qualified = ref(0) const reportDisabled = ref(true) const reportDialogVisible = ref(false) const deviceName = ref('240001'); -const error_Sys_Id = ref('2'); +const error_Sys_Id = ref('1'); const testScriptName = ref('Q/GDW 10650.4-2021 模拟式'); const errorSysName = ref('Q/GDW 10650.2 - 2021'); const dataRule = ref('所有值'); diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index 3d6af8e..4907839 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -112,8 +112,8 @@ 归档 - 设备新增 + @@ -128,7 +128,17 @@ v-if="form.activeTabs === 3 && form.activeChildTabs === 1" >查看 -

+ + 报告下载 + + 误差体系更换 + +
+ + +
报告下载
+ + + +
- - 设备已合格 {{ qualified }} 台/共 4 台 - -
+ + + + 标准时间: {{ gpsTime }} + +
+
+ + 守时误差≤1000ms + + +
+ + 守时误差>1000ms + +
+ - -
-
- + + - + + - - --> + +
@@ -62,8 +89,9 @@