diff --git a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue index 6fd3bc07..4337af73 100644 --- a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue +++ b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue @@ -7,39 +7,74 @@ - - + + - - + + - - + + - - + + - -
@@ -80,16 +115,33 @@ const tableStore = new TableStore({ return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1 } }, - { field: 'startTime', title: '暂降发生时刻', minWidth: "150" }, - { field: 'lineName', title: '监测点名称',minWidth: "90" }, - { field: 'gdName', title: '供电公司',minWidth: "90" }, - { field: 'subName', title: '变电站',minWidth: "150" }, - { field: 'ip', title: '网络参数',minWidth: "90" }, - { field: 'scale', title: '电压等级' ,minWidth: "90"}, - { field: 'advanceType', title: '暂降类型',minWidth: "90" }, - { field: 'advanceReason', title: '暂降原因' ,minWidth: "90",}, + { field: 'startTime', title: '暂降发生时刻', minWidth: '150' }, + { field: 'lineName', title: '监测点名称', minWidth: '90' }, + { field: 'gdName', title: '供电公司', minWidth: '90' }, + { field: 'subName', title: '变电站', minWidth: '150' }, + { field: 'ip', title: '网络参数', minWidth: '90' }, + { field: 'scale', title: '电压等级', minWidth: '90' }, { - field: 'eventType', title: '暂态统计类型',minWidth: "100", formatter: (row: any) => { + field: 'advanceType', + title: '暂降类型', + minWidth: '90', + formatter: (row: any) => { + return row.cellValue || '其他' + } + }, + { + field: 'advanceReason', + title: '暂降原因', + minWidth: '90', + formatter: (row: any) => { + return row.cellValue || '其他' + } + }, + { + field: 'eventType', + title: '暂态统计类型', + minWidth: '100', + formatter: (row: any) => { return eventList.filter(item => item.id === row.cellValue)[0]?.name } }, @@ -99,20 +151,24 @@ const tableStore = new TableStore({ // } // }, { - field: 'featureAmplitude', title: '暂降幅值(%)',minWidth: "90", formatter: (row: any) => { + field: 'featureAmplitude', + title: '暂降幅值(%)', + minWidth: '90', + formatter: (row: any) => { return (row.cellValue * 100).toFixed(2) } }, { - field: 'eventDescribe', title: '暂降深度(%)',minWidth: "90", formatter: (row: any) => { + field: 'eventDescribe', + title: '暂降深度(%)', + minWidth: '90', + formatter: (row: any) => { let data: any = (100 - row.row.featureAmplitude * 100).toFixed(2) return data >= 0 ? data : '/' } }, - { field: 'duration', title: '持续时间(s)' ,minWidth: "80",}, - - + { field: 'duration', title: '持续时间(s)', minWidth: '80' }, { title: '操作', @@ -130,9 +186,9 @@ const tableStore = new TableStore({ render: 'basicButton', click: async row => { view.value = false - setTimeout(() => { - waveFormRef.value.open(row) - },100) + setTimeout(() => { + waveFormRef.value.open(row) + }, 100) // row.loading = true // boxoList.value = row // await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 }) @@ -163,7 +219,7 @@ const tableStore = new TableStore({ } ], - loadCallback: () => { } + loadCallback: () => {} }) tableStore.table.params.searchValue = '' tableStore.table.params.statisticalType = classificationData.filter(item => item.name == '电网拓扑')[0] @@ -183,9 +239,6 @@ onMounted(() => { tableStore.index() }) - - - const backbxlb = () => { view.value = true view2.value = false diff --git a/src/views/pqs/harmonicMonitoring/runManage/ledgerManage/index.vue b/src/views/pqs/harmonicMonitoring/runManage/ledgerManage/index.vue new file mode 100644 index 00000000..a576e3fe --- /dev/null +++ b/src/views/pqs/harmonicMonitoring/runManage/ledgerManage/index.vue @@ -0,0 +1,42 @@ + + + + + diff --git a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue index 35730166..b37e5a6e 100644 --- a/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue +++ b/src/views/pqs/harmonicMonitoring/runManage/monitoringPoints/index.vue @@ -106,14 +106,15 @@ const tableStore = new TableStore({ title: '供电公司', minWidth: 100 }, - { field: 'objName', title: '监测点对象名称' , minWidth: 240}, + { field: 'objName', title: '对象名称' , minWidth: 240}, + { field: 'lineName', title: '监测点名称' , minWidth: 100}, { field: 'manufacturer', title: '厂家' , minWidth: 100}, { field: 'scale', title: '电压等级' , minWidth: 100}, { field: 'businessType', title: '行业类型' , minWidth: 100}, { field: 'devName', title: '终端名称', minWidth: 80 }, { field: 'ip', title: '网络参数' , minWidth: 100}, - { field: 'lineName', title: '监测点名称' , minWidth: 100}, + // { field: 'comFlag', title: '通讯状态' , minWidth: 100}, { field: 'comFlag', diff --git a/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue b/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue index 9cc38d89..a53f6f65 100644 --- a/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue +++ b/src/views/pqs/harmonicMonitoring/runManage/terminalLedger/index.vue @@ -119,7 +119,7 @@ const tableStore = new TableStore({ field: 'runFlag', title: '终端状态', effect: 'dark', - render: 'tag', + render: 'tag',minWidth: 100, custom: { '投运': 'success', '热备用': 'warning', @@ -131,7 +131,7 @@ const tableStore = new TableStore({ field: 'comFlag', title: '通讯状态', render: 'tag', - effect: 'dark', + effect: 'dark',minWidth: 100, custom: { '正常': 'success', '中断': 'danger', @@ -143,7 +143,7 @@ const tableStore = new TableStore({ field: 'onlineEvaluate', title: '在线率评价', render: 'tag', - effect: 'dark', + effect: 'dark',minWidth: 100, custom: { '/': 'info', '优': 'success',