From b77ad54309c2dcb5bc485eefe467aa6d8de11e98 Mon Sep 17 00:00:00 2001 From: GYYM <704080176@qq.com> Date: Fri, 22 Nov 2024 11:45:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=94=B5=E8=84=91=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/dataCheckChangeErrSysPopup.vue | 682 +++++++++++++++++- .../views/home/components/dataCheckPopup.vue | 6 +- 2 files changed, 669 insertions(+), 19 deletions(-) diff --git a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue index a5d88c1..8e9fe56 100644 --- a/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue +++ b/frontend/src/views/home/components/dataCheckChangeErrSysPopup.vue @@ -45,7 +45,7 @@
合格92项/共103项 - 合格92项/共103项 + 合格92项/共103项
@@ -191,6 +191,10 @@
+ @@ -214,6 +218,7 @@ import DataCheckResultTable from './dataCheckResultTable.vue' import DataCheckRawDataTable from './dataCheckRawDataTable.vue' import {dictPattern,dictTestState,dictReportState,dictResult,testPlanDataList,sourceDataList,deviceDataList,testSoureDataList,testScriptDataList,testErrSystDataList,planData,testFatherPlanList} from '@/api/plan/planData' import ReportPopup from './reportPopup.vue' +import dataCheckSingleChannelSingleTestPopup from './dataCheckSingleChannelSingleTestPopup.vue' const reportDisabled = ref(true) const reportDialogVisible = ref(false) @@ -279,8 +284,17 @@ const props = defineProps<{ (e: 'submit', data: any): void; }>(); + function clear() { + activeIndex.value = 0; + } + const handleCancel = () => { emit('update:visible', false); // 关闭对话框 + //clearInterval(timer.value); + activeIndex.value = 0; + tableData.value.length = 0; + tableData.value = operatorTableData.value; + }; const openReportDlg = () => { @@ -447,8 +461,6 @@ const isPause = ref(false); const resultDialogVisible = ref(false) const dataCheckSingleChannelSingleTestDialogVisable = ref(false); -function clear() { -} function traverseTableData(data: any[],id: string): void { data.forEach(item => { @@ -522,7 +534,644 @@ interface User { // resultType3: 'danger', // resultValue3:'×', - +const operatorTableData = ref([ + { + id: '1', + scriptItemName: '频率', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + children: [ + { + id: '1-1', + scriptItemName: '额定条件下的测量', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + children: [ + { + id: '1-1-1', + scriptItemName: '频率：42.5Hz', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '1-1-2', + scriptItemName: '频率：50Hz', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '1-1-3', + scriptItemName: '频率：50.5Hz', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '1-1-4', + scriptItemName: '频率：57.5Hz', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + ], + }, + { + id: '1-2', + scriptItemName: '电压对频率测量的影响', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + children: [ + { + id: '1-2-1', + scriptItemName: '频率：50.5Hz 电压：10%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + ], + }, + { + id: '1-3', + scriptItemName: '谐波对频率测量的影响', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + children: [ + { + id: '1-3-1', + scriptItemName: '频率：50.5Hz 谐波电压：h3 10%Un;h7 10%Un;h11 10%Un;h15 4%Un; h19 5%Un; h23 5%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + ], + }, + ], + }, + { + id: '2', + scriptItemName: '电压', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + children: [ + { + id: '2-1', + scriptItemName: '额定条件下的测量', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + children: [ + { + id: '2-1-1', + scriptItemName: '频率：50Hz 电压：10%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '2-1-2', + scriptItemName: '频率：50Hz 电压：45%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '2-1-3', + scriptItemName: '频率：50Hz 电压：80%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '2-1-4', + scriptItemName: '频率：50Hz 电压：115%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '2-1-5', + scriptItemName: '频率：50Hz 电压：150%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + ], + }, + { + id: '2-2', + scriptItemName: '频率对电压测量的影响', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + children: [ + { + id: '2-2-1', + scriptItemName: '频率：42.5Hz 电压：80%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + ], + }, + { + id: '2-3', + scriptItemName: '谐波对电压测量的影响', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + children: [ + { + id: '2-3-1', + scriptItemName: '频率：50Hz 电压：80%Un 谐波电压：h3 10%Un;h7 10%Un;h11 10%Un;h15 4%Un; h19 5%Un; h23 5%Un', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + ], + }, + ], + }, + { + id: '3', + scriptItemName: '谐波电压', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '4', + scriptItemName: '谐波电流', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '5', + scriptItemName: '谐波有功功率', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '6', + scriptItemName: '间谐波电压', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '7', + scriptItemName: '间谐波电流', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '8', + scriptItemName: '暂态', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '9', + scriptItemName: '电流', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '10', + scriptItemName: '电压不平衡度', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '11', + scriptItemName: '电流不平衡度', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, + { + id: '12', + scriptItemName: '短时闪变', + resultType1: 'info', + resultValue1:'-', + resultType2: 'info', + resultValue2:'-', + resultType3: 'info', + resultValue3:'-', + resultType4: 'info', + resultValue4:'-', + resultType5: 'info', + resultValue5:'-', + resultType6: 'info', + resultValue6:'-', + resultType7: 'info', + resultValue7:'-', + resultType8: 'info', + resultValue8:'-', + }, +]) const tableData = ref([ { @@ -1170,11 +1819,11 @@ const ts = ref(''); const startTimer = () => { //if (timer.value !== null) return; // 如果定时器已经启动，则不再重复启动 timer.value = setInterval(() => { + + console.log(activeIndex.value,111) if(activeIndex.value <= activeTotalNum.value) { - activeIndex.value++; - updateLog() switch(activeIndex.value) { @@ -1218,23 +1867,24 @@ const startTimer = () => { } - if (percentage.value < 100) { - percentage.value = Math.trunc(activeIndex.value/activeTotalNum.value * 100); + // if (percentage.value < 100) { + // percentage.value = Math.trunc(activeIndex.value/activeTotalNum.value * 100); - } else { - percentage.value = 100; - clearInterval(timer) + // } else { + // percentage.value = 100; + // clearInterval(timer) - reportDisabled.value = false; - - clear(); - } + // reportDisabled.value = false; + + // } } else { - clearInterval(timer) + console.log(activeIndex.value,222) + clearInterval(timer.value) reportDisabled.value = false; + console.log(activeIndex.value,333) } }, 100); diff --git a/frontend/src/views/home/components/dataCheckPopup.vue b/frontend/src/views/home/components/dataCheckPopup.vue index a5b82d2..ba073f3 100644 --- a/frontend/src/views/home/components/dataCheckPopup.vue +++ b/frontend/src/views/home/components/dataCheckPopup.vue @@ -1,5 +1,5 @@