From 13f11596e4e61cda4b55dd76f23851b9d5af58b0 Mon Sep 17 00:00:00 2001 From: guanj Date: Wed, 17 Jun 2026 13:30:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cockpit/gridSideStatistics/index.vue | 8 +++---- .../components/overLimitDetails.vue | 2 +- .../cockpit/indicatorFittingChart/index.vue | 8 +++---- .../cockpit/monitoringPointList/index.vue | 8 +++---- .../cockpit/overLimitStatistics/index.vue | 8 +++---- .../components/transientList.vue | 8 +++---- .../cockpit/transientStatistics/index.vue | 8 +++---- src/views/govern/alarm/Device.vue | 8 +++---- src/views/govern/alarm/Steady.vue | 8 +++---- src/views/govern/alarm/Transient.vue | 8 +++---- .../govern/alarm/steadyStateEvent/index.vue | 4 ++-- src/views/govern/analyze/DVR/index.vue | 8 +++---- .../device/planData/components/transient.vue | 4 ++-- src/views/govern/manage/monthly.vue | 6 ++--- .../govern/monitorRecall/eventRecall.vue | 2 +- .../sensitiveLoadMange/component/bindForm.vue | 24 ++++++++++++++++--- .../sags/operationsManagement/point.vue | 8 +++---- 17 files changed, 74 insertions(+), 56 deletions(-) diff --git a/src/components/cockpit/gridSideStatistics/index.vue b/src/components/cockpit/gridSideStatistics/index.vue index 53c0c26..44b5b00 100644 --- a/src/components/cockpit/gridSideStatistics/index.vue +++ b/src/components/cockpit/gridSideStatistics/index.vue @@ -129,11 +129,11 @@ const tableStore: any = new TableStore({ { title: '监测点名称', field: 'lineName', - minWidth: 120 + minWidth: 150 }, - { title: '设备名称', field: 'devName', minWidth: 130, align: 'center', }, - { title: '项目名称', field: 'projectName', minWidth: 130, align: 'center' }, - { title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' }, + { title: '设备名称', field: 'devName', minWidth: 150, align: 'center', }, + { title: '项目名称', field: 'projectName', minWidth: 150, align: 'center' }, + { title: '工程名称', field: 'engineeringName', minWidth: 150, align: 'center' }, { title: '越限占比(%)', children: [ diff --git a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue index 697965d..440c836 100644 --- a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue +++ b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue @@ -83,7 +83,7 @@ const tableStore: any = new TableStore({ { title: '监测点名称', field: 'lineName', - width: '120' + width: '150' }, { title: '长时闪变越限(分钟)', diff --git a/src/components/cockpit/indicatorFittingChart/index.vue b/src/components/cockpit/indicatorFittingChart/index.vue index ae01e8e..9f521e8 100644 --- a/src/components/cockpit/indicatorFittingChart/index.vue +++ b/src/components/cockpit/indicatorFittingChart/index.vue @@ -83,13 +83,13 @@ const tableStore: any = new TableStore({ { title: '监测点名称', field: 'lineName', - minWidth: 120, + minWidth: 150, }, - { title: '设备名称', field: 'devName', minWidth: 130, align: 'center' }, - { title: '项目名称', field: 'projectName', minWidth: 130, align: 'center' }, - { title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' }, + { title: '设备名称', field: 'devName', minWidth: 150, align: 'center' }, + { title: '项目名称', field: 'projectName', minWidth: 150, align: 'center' }, + { title: '工程名称', field: 'engineeringName', minWidth: 150, align: 'center' }, { title: '监测对象类型', field: 'objType', diff --git a/src/components/cockpit/monitoringPointList/index.vue b/src/components/cockpit/monitoringPointList/index.vue index 85b10d9..0531726 100644 --- a/src/components/cockpit/monitoringPointList/index.vue +++ b/src/components/cockpit/monitoringPointList/index.vue @@ -107,15 +107,15 @@ const tableStore: any = new TableStore({ { title: '监测点名称', field: 'lineName', - minWidth: 120, + minWidth: 150, render: 'customTemplate', customTemplate: (row: any) => { return `${row.lineName}` } }, - { title: '设备名称', field: 'devName', minWidth: 130, align: 'center' }, - { title: '项目名称', field: 'projectName', minWidth: 130, align: 'center' }, - { title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' }, + { title: '设备名称', field: 'devName', minWidth: 150, align: 'center' }, + { title: '项目名称', field: 'projectName', minWidth: 150, align: 'center' }, + { title: '工程名称', field: 'engineeringName', minWidth: 150, align: 'center' }, // { // title: '监测类型', // field: 'position', diff --git a/src/components/cockpit/overLimitStatistics/index.vue b/src/components/cockpit/overLimitStatistics/index.vue index e1ab240..e3604d3 100644 --- a/src/components/cockpit/overLimitStatistics/index.vue +++ b/src/components/cockpit/overLimitStatistics/index.vue @@ -144,11 +144,11 @@ const tableStore: any = new TableStore({ { title: '监测点名称', field: 'lineName', - minWidth: 120 + minWidth: 150 }, - { title: '设备名称', field: 'devName', minWidth: 130, align: 'center' }, - { title: '项目名称', field: 'projectName', minWidth: 130, align: 'center' }, - { title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' }, + { title: '设备名称', field: 'devName', minWidth: 150, align: 'center' }, + { title: '项目名称', field: 'projectName', minWidth: 150, align: 'center' }, + { title: '工程名称', field: 'engineeringName', minWidth: 150, align: 'center' }, { title: '越限占比(%)', children: [ diff --git a/src/components/cockpit/transientDetails/components/transientList.vue b/src/components/cockpit/transientDetails/components/transientList.vue index 5eda8f8..ccf2c4d 100644 --- a/src/components/cockpit/transientDetails/components/transientList.vue +++ b/src/components/cockpit/transientDetails/components/transientList.vue @@ -95,11 +95,11 @@ const tableStore: any = new TableStore({ align: 'center', formatter: (row: any) => EventTypeList.find((item: any) => item.id == row.cellValue)?.name || '其他' }, - { title: '监测点名称', field: 'lineName', minWidth: 130, align: 'center' }, + { title: '监测点名称', field: 'lineName', minWidth: 150, align: 'center' }, { title: '电压等级(kV)', field: 'lineVoltage', minWidth: 120, align: 'center', sortable: true }, - { title: '设备名称', field: 'equipmentName', minWidth: 130, align: 'center' }, - { title: '项目名称', field: 'projectName', minWidth: 130, align: 'center' }, - { title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' }, + { title: '设备名称', field: 'equipmentName', minWidth: 150, align: 'center' }, + { title: '项目名称', field: 'projectName', minWidth: 150, align: 'center' }, + { title: '工程名称', field: 'engineeringName', minWidth: 150, align: 'center' }, { title: '发生位置', field: 'sagSource', diff --git a/src/components/cockpit/transientStatistics/index.vue b/src/components/cockpit/transientStatistics/index.vue index f078178..05ff19e 100644 --- a/src/components/cockpit/transientStatistics/index.vue +++ b/src/components/cockpit/transientStatistics/index.vue @@ -166,20 +166,20 @@ const tableStore: any = new TableStore({ { title: '监测点名称', field: 'name', - minWidth: 120 + minWidth: 150 }, { - title: '设备名称', field: 'devName', minWidth: 130, align: 'center', formatter: (row: any) => { + title: '设备名称', field: 'devName', minWidth: 150, align: 'center', formatter: (row: any) => { return row.cellValue || '/' } }, { - title: '项目名称', field: 'projectName', minWidth: 130, align: 'center', formatter: (row: any) => { + title: '项目名称', field: 'projectName', minWidth: 150, align: 'center', formatter: (row: any) => { return row.cellValue || '/' } }, { - title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center', formatter: (row: any) => { + title: '工程名称', field: 'engineeringName', minWidth: 150, align: 'center', formatter: (row: any) => { return row.cellValue || '/' } }, diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue index 545cab0..fa36cc0 100644 --- a/src/views/govern/alarm/Device.vue +++ b/src/views/govern/alarm/Device.vue @@ -100,13 +100,13 @@ const tableStore = new TableStore({ }, { title: '发生时刻', field: 'startTime', align: 'center', minWidth: 180, sortable: true }, { - title: '监测点名称', field: 'lineName', minWidth: 130, align: 'center', formatter: (row: any) => { + title: '监测点名称', field: 'lineName', minWidth: 150, align: 'center', formatter: (row: any) => { return row.cellValue ? row.cellValue : '/' } }, - { title: '设备名称', field: 'equipmentName', align: 'center', minWidth: 130 }, - { title: '项目名称', field: 'projectName', align: 'center', minWidth: 130 }, - { title: '工程名称', field: 'engineeringName', align: 'center', minWidth: 130 }, + { title: '设备名称', field: 'equipmentName', align: 'center', minWidth: 150 }, + { title: '项目名称', field: 'projectName', align: 'center', minWidth: 150 }, + { title: '工程名称', field: 'engineeringName', align: 'center', minWidth: 150 }, // { title: '监测点名称', field: 'lineName', align: 'center', minWidth: 120 }, diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue index 993c850..96ea5c2 100644 --- a/src/views/govern/alarm/Steady.vue +++ b/src/views/govern/alarm/Steady.vue @@ -80,12 +80,12 @@ const tableStore = new TableStore({ } }, { title: '发生时刻', field: 'startTime', align: 'center', sortable: true, minWidth: 180, }, - { title: '监测点名称', field: 'lineName', align: 'center', minWidth: 120,formatter: (row: any) => { + { title: '监测点名称', field: 'lineName', align: 'center', minWidth: 150,formatter: (row: any) => { return row.cellValue ? row.cellValue : '/' } }, - { title: '设备名称', field: 'equipmentName', align: 'center', minWidth: 120, }, - { title: '项目名称', field: 'projectName', align: 'center', minWidth: 120, }, - { title: '工程名称', field: 'engineeringName', align: 'center', minWidth: 120, }, + { title: '设备名称', field: 'equipmentName', align: 'center', minWidth: 150, }, + { title: '项目名称', field: 'projectName', align: 'center', minWidth: 150, }, + { title: '工程名称', field: 'engineeringName', align: 'center', minWidth: 150, }, { title: '事件描述', field: 'showName', align: 'center', minWidth: 250, } diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue index 67cbb55..bff7d2a 100644 --- a/src/views/govern/alarm/Transient.vue +++ b/src/views/govern/alarm/Transient.vue @@ -102,11 +102,11 @@ const tableStore = new TableStore({ return EventTypeList.find((item: any) => item.id == row.cellValue)?.name || '其他' } }, - { title: '监测点名称', field: 'lineName', minWidth: 130, align: 'center' }, + { title: '监测点名称', field: 'lineName', minWidth: 150, align: 'center' }, { title: '电压等级(kV)', field: 'lineVoltage', minWidth: 120, align: 'center', sortable: true, }, - { title: '设备名称', field: 'equipmentName', minWidth: 130, align: 'center' }, - { title: '项目名称', field: 'projectName', minWidth: 130, align: 'center' }, - { title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' }, + { title: '设备名称', field: 'equipmentName', minWidth: 150, align: 'center' }, + { title: '项目名称', field: 'projectName', minWidth: 150, align: 'center' }, + { title: '工程名称', field: 'engineeringName', minWidth: 150, align: 'center' }, { title: '发生位置', field: 'sagSource', minWidth: 120, align: 'center', formatter: (row: any) => { return row.cellValue == 1 ? '上游' : row.cellValue == 2 ? '下游' : '未知' diff --git a/src/views/govern/alarm/steadyStateEvent/index.vue b/src/views/govern/alarm/steadyStateEvent/index.vue index d928766..f3f166c 100644 --- a/src/views/govern/alarm/steadyStateEvent/index.vue +++ b/src/views/govern/alarm/steadyStateEvent/index.vue @@ -125,13 +125,13 @@
-
监测点绑定
+
绑定测点
保存
-
diff --git a/src/views/govern/analyze/DVR/index.vue b/src/views/govern/analyze/DVR/index.vue index 1c1ec5d..09a04f0 100644 --- a/src/views/govern/analyze/DVR/index.vue +++ b/src/views/govern/analyze/DVR/index.vue @@ -116,11 +116,11 @@ const tableStore = new TableStore({ - { title: '监测点名称', field: 'lineName', minWidth: 130, align: 'center' }, + { title: '监测点名称', field: 'lineName', minWidth: 150, align: 'center' }, { title: '电压等级(kV)', field: 'lineVoltage', minWidth: 120, align: 'center', sortable: true, }, - { title: '设备名称', field: 'equipmentName', minWidth: 130, align: 'center' }, - { title: '项目名称', field: 'projectName', minWidth: 130, align: 'center' }, - { title: '工程名称', field: 'engineeringName', minWidth: 130, align: 'center' }, + { title: '设备名称', field: 'equipmentName', minWidth: 150, align: 'center' }, + { title: '项目名称', field: 'projectName', minWidth: 150, align: 'center' }, + { title: '工程名称', field: 'engineeringName', minWidth: 150, align: 'center' }, { title: '发生位置', field: 'sagSource', minWidth: 120, align: 'center', formatter: (row: any) => { return row.cellValue == 1 ? '上游' : row.cellValue == 2 ? '下游' : '未知' diff --git a/src/views/govern/device/planData/components/transient.vue b/src/views/govern/device/planData/components/transient.vue index e9062b5..50bdd64 100644 --- a/src/views/govern/device/planData/components/transient.vue +++ b/src/views/govern/device/planData/components/transient.vue @@ -118,9 +118,9 @@ const tableStore = new TableStore({ return EventTypeList.find((item: any) => item.id == row.cellValue)?.name || '其他' } }, - { title: '监测点名称', field: 'lineName', minWidth: 120, align: 'center' }, + { title: '监测点名称', field: 'lineName', minWidth: 150, align: 'center' }, { title: '电压等级(kV)', field: 'lineVoltage', minWidth: 120, align: 'center', sortable: true, }, - { title: '设备名称', field: 'devName', minWidth: 120, align: 'center' }, + { title: '设备名称', field: 'devName', minWidth: 150, align: 'center' }, { title: '发生位置', field: 'sagSource', minWidth: 120, align: 'center', formatter: (row: any) => { diff --git a/src/views/govern/manage/monthly.vue b/src/views/govern/manage/monthly.vue index 3e4b1fb..25fa57e 100644 --- a/src/views/govern/manage/monthly.vue +++ b/src/views/govern/manage/monthly.vue @@ -62,9 +62,9 @@ const tableStore = new TableStore({ } }, { title: '工程名称', field: 'engineeringName', minWidth: 150 }, - { title: '项目名称', field: 'projectName', minWidth: 130 }, - { title: '设备名称', field: 'devName', minWidth: 130 }, - { title: '监测点名称', field: 'lineName', minWidth: 130 }, + { title: '项目名称', field: 'projectName', minWidth: 150 }, + { title: '设备名称', field: 'devName', minWidth: 150 }, + { title: '监测点名称', field: 'lineName', minWidth: 150 }, { title: '投运时间', field: 'operationalTime', diff --git a/src/views/govern/monitorRecall/eventRecall.vue b/src/views/govern/monitorRecall/eventRecall.vue index ed47d7d..57e635e 100644 --- a/src/views/govern/monitorRecall/eventRecall.vue +++ b/src/views/govern/monitorRecall/eventRecall.vue @@ -66,7 +66,7 @@ const tableStore: any = new TableStore({ { field: 'lineName', title: '监测点名称', - width: 100, + width: 150, formatter: row => { return row.cellValue ? row.cellValue : '/' } diff --git a/src/views/govern/sensitiveLoadMange/component/bindForm.vue b/src/views/govern/sensitiveLoadMange/component/bindForm.vue index 64c6a50..32c5547 100644 --- a/src/views/govern/sensitiveLoadMange/component/bindForm.vue +++ b/src/views/govern/sensitiveLoadMange/component/bindForm.vue @@ -8,7 +8,7 @@ - + @@ -67,6 +67,9 @@ const dialogVisible = ref(false) const title = ref('新增') const lineTreeData = ref([]) const filterNode = createTreeFilterNode() +/** 打开弹窗时传入的治理前/后监测点 id，未变更时不做绑定冲突校验 */ +const originalGovernBefore = ref(null) +const originalGovernAfter = ref(null) const treeProps = { value: 'id', @@ -88,6 +91,11 @@ const form = reactive({ const isEmptyPoint = (val: any) => val === '' || val === null || val === undefined +const isSamePointId = (current: any, original: any) => { + if (isEmptyPoint(current) && isEmptyPoint(original)) return true + return String(current) === String(original) +} + const getGovernPointError = (): string => { const beforeEmpty = isEmptyPoint(form.governBefore) const afterEmpty = isEmptyPoint(form.governAfter) @@ -136,13 +144,19 @@ const isPointBoundConflict = (node: any) => { const getBoundPointError = (): string => { const messages: string[] = [] - if (!isEmptyPoint(form.governBefore)) { + if ( + !isEmptyPoint(form.governBefore) && + !isSamePointId(form.governBefore, originalGovernBefore.value) + ) { const node = findTreeNodeById(lineTreeData.value, form.governBefore) if (node && isPointBoundConflict(node)) { messages.push(`治理前监测点「${node.name}」${getBoundSuffix(node)}`) } } - if (!isEmptyPoint(form.governAfter)) { + if ( + !isEmptyPoint(form.governAfter) && + !isSamePointId(form.governAfter, originalGovernAfter.value) + ) { const node = findTreeNodeById(lineTreeData.value, form.governAfter) if (node && isPointBoundConflict(node)) { messages.push(`治理后监测点「${node.name}」${getBoundSuffix(node)}`) @@ -178,6 +192,8 @@ const resetForm = () => { form.governBefore = '' form.governAfter = '' form.sort = 100 + originalGovernBefore.value = null + originalGovernAfter.value = null } const open = (text: string, data?: anyObj) => { @@ -194,6 +210,8 @@ const open = (text: string, data?: anyObj) => { form.governBefore = data.governBeforeId ?? data.governBefore ?? '' form.governAfter = data.governAfterId ?? data.governAfter ?? '' form.sort = data.sort ?? 100 + originalGovernBefore.value = form.governBefore + originalGovernAfter.value = form.governAfter } } diff --git a/src/views/pms/voltage/sags/operationsManagement/point.vue b/src/views/pms/voltage/sags/operationsManagement/point.vue index 8a168ea..6be7dfc 100644 --- a/src/views/pms/voltage/sags/operationsManagement/point.vue +++ b/src/views/pms/voltage/sags/operationsManagement/point.vue @@ -52,11 +52,11 @@ const tableStore = new TableStore({ url: '/device-boot/runManage/getLineLedger', method: 'POST', column: [ - { field: 'areaName', title: '省公司', width: 120 }, - { field: 'gdName', title: '市公司', width: 120 }, + { field: 'areaName', title: '省公司', width: 150 }, + { field: 'gdName', title: '市公司', width: 150 }, { field: 'scale', title: '监测点电压等级', width: 150 }, - { field: 'lineName', title: '监测点名称', width: 120 }, - { field: 'bdName', title: '所属变电站', width: 120 }, + { field: 'lineName', title: '监测点名称', width: 150 }, + { field: 'bdName', title: '所属变电站', width: 150 }, { field: 'loadType', title: '干扰源类型', width: 120 }, { field: 'objName', title: '监测对象名称', width: 180 }, { field: 'shortCapacity', title: '最小短路容量(MVA)', width: 190 },