diff --git a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue index 47bc4f7..e72af0a 100644 --- a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue +++ b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue @@ -1,63 +1,62 @@ - - - - - - - - - - - - - - - - 注1:UN:测量的标称电压;IN:测量仪器的标称电流;Uh和Ih:测量值,h表示谐波次数。 - - - 注2:对于数字式接入监测终端,与电能质量信号采集单元联合准确度需满足本表要求。 - - - - - - + diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue index e9566c8..42c449d 100644 --- a/frontend/src/views/plan/planList/index.vue +++ b/frontend/src/views/plan/planList/index.vue @@ -219,9 +219,7 @@ const columns = reactive[]>([ width: 360, render: scope => { return ( - showTestScript(scope.row.scriptId)}> - {scope.row.scriptName} - + {scope.row.scriptName} ) }, }, @@ -231,7 +229,7 @@ const columns = reactive[]>([ width: 200, render: scope => { return ( - showData(scope.row.errorSysName || '')}> + showData(scope.row)}> {scope.row.errorSysName} ) @@ -282,8 +280,9 @@ function isVisible(row: Plan.ReqPlan) { } -function showData(row: string) { - errorStandardPopup.value?.open(row, row) +function showData(row: any) { + let split = row.errorSysName.split('-') + errorStandardPopup.value?.open(row.errorSysName, {id:row.errorSysId,devLevel:split[split.length-1]}) } async function showTestSource(row:string) {