From b992b2653a15b2e92e4b46ebc8ec6ab8a812a2e5 Mon Sep 17 00:00:00 2001 From: GYYM <704080176@qq.com> Date: Wed, 20 Nov 2024 21:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=B5=81=E7=A8=8B=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/plan/interface/index.ts | 3 +- frontend/src/api/plan/planData.ts | 9 +- .../src/views/home/components/preTest.vue | 16 +- frontend/src/views/home/components/table.vue | 4 +- .../src/views/home/components/temptest.vue | 67 ++ frontend/src/views/home/components/test.vue | 942 +++++++++++++++++- .../src/views/home/components/testPopup.vue | 30 +- .../plan/planList/components/planPopup.vue | 6 +- frontend/src/views/plan/planList/index.vue | 6 +- 9 files changed, 1035 insertions(+), 48 deletions(-) create mode 100644 frontend/src/views/home/components/temptest.vue diff --git a/frontend/src/api/plan/interface/index.ts b/frontend/src/api/plan/interface/index.ts index 215f870..a8ae026 100644 --- a/frontend/src/api/plan/interface/index.ts +++ b/frontend/src/api/plan/interface/index.ts @@ -10,7 +10,7 @@ export namespace Plan { name: string; //检测计划名称 pattern: string; //模式，字典表（数字、模拟、比对） father_Plan_Id?: string; //父计划ID - dataSource_Id: string; //数据源ID + dataSource_Id: string[]; //数据源ID script_Id: string; //检测脚本ID error_Sys_Id: string;//误差体系ID test_State: string; //检测状态 @@ -30,6 +30,7 @@ export namespace Plan { source_Id: string[]; device_Id?: string[]; testSourceList?: string[];//临时测试 + dataSource_Ids:string; } // // 检测计划列表 // export interface PlanList { diff --git a/frontend/src/api/plan/planData.ts b/frontend/src/api/plan/planData.ts index 7f8a923..9498ebc 100644 --- a/frontend/src/api/plan/planData.ts +++ b/frontend/src/api/plan/planData.ts @@ -246,7 +246,8 @@ const planData = ref([ 'pattern':'1', "source_Id" : ['1'], "testSourceName":'标准源-福禄克-6100A', - 'dataSource_Id':'1', + 'dataSource_Id':['1'], + 'dataSource_Ids':'实时数据', 'script_Id':'1', 'error_Sys_Id':'1', 'test_State':'1', @@ -260,7 +261,8 @@ const planData = ref([ "source_Id" : ['5','6','7','8'], "testSourceName":'高精度设备-PQV520-1', 'father_Plan_Id':'1', - 'dataSource_Id':'2', + 'dataSource_Id':['5'], + 'dataSource_Ids':'分钟统计数据CP95值', 'script_Id':'2', 'error_Sys_Id':'2', 'test_State':'2', @@ -277,7 +279,8 @@ const planData = ref([ "source_Id" : ['3'], "testSourceName":'标准源-丹迪克-DKLN1', 'father_Plan_Id':'1', - 'dataSource_Id':'3', + 'dataSource_Id':['1'], + 'dataSource_Ids':'实时数据', 'script_Id':'3', 'error_Sys_Id':'3', 'test_State':'1', diff --git a/frontend/src/views/home/components/preTest.vue b/frontend/src/views/home/components/preTest.vue index 43c05cb..4e83494 100644 --- a/frontend/src/views/home/components/preTest.vue +++ b/frontend/src/views/home/components/preTest.vue @@ -27,22 +27,22 @@
-
+
暂无数据，等待检测开始
-
+
暂无数据，等待检测开始
-
+
暂无数据，等待检测开始
-
+
暂无数据，等待检测开始
@@ -153,6 +153,7 @@ watch(ts, function (newValue, oldValue) { diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue index a65bafc..84725c3 100644 --- a/frontend/src/views/home/components/table.vue +++ b/frontend/src/views/home/components/table.vue @@ -115,14 +115,14 @@ v-if="form.activeTabs === 3" >生成 - 数据查看 + > --> + + + + + + + + + + \ No newline at end of file diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index afb97a7..a77444c 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -27,12 +27,141 @@ >
+ +
- - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -45,6 +174,7 @@
+ (null); +// const currentRow = ref(null); // 用于存储当前选中的行 +const monitorList = ref([ + { + deviceID: '1', + deviceName: '被检设备1', + monitorIdx: 1, + label:'被检设备1通道1', + prop: 'Result1', + }, + { + deviceID: '1', + deviceName: '被检设备1', + monitorIdx: 2, + label:'被检设备1通道2', + prop: 'Result2', + }, + { + deviceID: '2', + deviceName: '被检设备2', + monitorIdx: 1, + label:'被检设备2通道1', + prop: 'Result3', + }, + { + deviceID: '2', + deviceName: '被检设备2', + monitorIdx: 2, + label:'被检设备2通道2', + prop: 'Result4', + } +]) +const tableData1= [ + { + date: '2016-05-03', + name: 'Tom', + address: 'No. 189, Grove St, Los Angeles', + }, + { + date: '2016-05-02', + name: 'Tom', + address: 'No. 189, Grove St, Los Angeles', + }, + { + date: '2016-05-04', + name: 'Tom', + address: 'No. 189, Grove St, Los Angeles', + }, + { + date: '2016-05-01', + name: 'Tom', + address: 'No. 189, Grove St, Los Angeles', + }, +] + +const tableKey = ref(0); +const currentIdx = ref(0); + +const tableRowClassName = ({ + row, + rowIndex, +}: { + row: any + rowIndex: number +}) => { + // console.log(currentIdx.value,rowIndex,row) + + if (row.id === currentIdx.value.toString()) { + return 'warning-row' + } + // else if (rowIndex === 3) { + // return 'success-row' + // } + return '' +} const percentage = ref(0); const customColors = [ { color: "#5cb87a", percentage: 100 }, //绿 @@ -67,7 +274,45 @@ const customColors = [ const isPause = ref(false); const resultDialogVisible = ref(false) const dataCheckSingleChannelSingleTestDialogVisable = ref(false); + +function clear() { +} +const updateTableData = (id: string, field: string, value: any) => { + const item = tableData.value.find(item => item.id === id); + + if (item) { + item[field] = value; + } +}; + +let timer: any = ref(""); const handlePauseTest = () => { + + timer.value = setInterval(() => { + currentIdx.value++; + + updateTableData(currentIdx.value.toString(),"resultType1","success") + updateTableData(currentIdx.value.toString(),"resultValue1","√") + tableKey.value ++; + if (percentage.value < 100) { + percentage.value = Math.trunc(currentIdx.value/12 * 100); + + } else { + + clearInterval(timer.value) + clear(); + ElMessageBox.confirm( + '检测全部结束,你可以停留在此页面查看检测结果，或返回首页进行复检、报告生成和归档等操作', + '检测完成', + { + confirmButtonText: '确定', + type: 'success', + }) + } + }, 5000); + + + return; if (!isPause.value) { } else { @@ -82,36 +327,675 @@ const handleFinishTest = () => { }; const handleClick = (row:any) => { - console.log(111) + console.log(111,row) dataCheckSingleChannelSingleTestDialogVisable.value = true; }; -const errorData = ref([ +interface User { + id: number + scriptItemName: string + name: string + address: string + hasChildren?: boolean + children?: User[] +} +//resultType2: 'success', + // resultValue2:'√', + // resultType3: 'danger', + // resultValue3:'×', + + + +const tableData = 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: [ { - deviceName: '额定条件下频率检测42.5Hz', - updataTime: '√', - ErrorValue:'×', - Result: '/', + 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:'-', + }, + ], }, { - deviceName: '额定条件下频率检测50Hz', - updataTime: '/', - ErrorValue:'√', - Result: '×', + 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:'-', + }, + ], }, { - deviceName: '额定条件下频率检测50.05Hz', - updataTime: '—', - ErrorValue:'—', - Result: '—', + 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:'-', + }, + ], }, { - deviceName: '额定条件下频率检测57.5Hz', - updataTime: '—', - ErrorValue:'—', - Result: '—', + 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 selectRow = (id: number) => { + +// console.log(id); + +// const row = tableData.find(item => item.id === id); + +// console.log(row); +// if (row) { +// currentRow.value = row ; +// } +// }; +// selectRow(2) const currentStepStatus = ref<'error' | 'finish' | 'wait' | 'success' | 'process'>('finish'); @@ -157,6 +1041,16 @@ watch(ts, function (newValue, oldValue) {