From a04bb33206e485e5f26f2c4d9d35d3a78201d610 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 21 Mar 2025 08:58:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=B8=BB=E9=85=8D=E7=BD=91=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E6=95=B0=E6=8D=AE=E9=87=8D=E7=AE=97=E5=8A=9F=E8=83=BD?= =?UTF-8?q?bug=202.=E7=9B=91=E7=9D=A3=E8=AE=A1=E5=88=92=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Monitoringpoint.vue | 7 ++++--- .../Supervisionmanage2/Workplan.vue | 18 ++++++++++++++++++ .../harmonicmanagement/Planmanagement.vue | 4 ++-- .../Undocumentednonlinear.vue | 2 +- .../Process-supervision/harmonicmanagement.vue | 4 ++-- .../ElectricRailwayLine.vue | 4 ++-- .../flow_task/components/normalPlanInit.vue | 2 +- src/views/harmonic-boot/data-feed/index.vue | 6 +++--- 8 files changed, 33 insertions(+), 14 deletions(-) diff --git a/src/views/Account-management/components/Monitoringpoint.vue b/src/views/Account-management/components/Monitoringpoint.vue index d6d6fa1..418746c 100644 --- a/src/views/Account-management/components/Monitoringpoint.vue +++ b/src/views/Account-management/components/Monitoringpoint.vue @@ -615,17 +615,18 @@ export default { //台区台账表头 tableHeaderMonitoring: [ // { prop: 'id', label: '监测点编号', width: 120 }, - { prop: 'monitorObjectName', label: '监测对象名称', width: 250 }, + { prop: 'name', label: '测点名称', width: 220 }, + { prop: 'monitorId', label: '测点编号', width: 220 }, { prop: 'orgName', label: '组织机构名称', width: 170 }, { prop: 'operationName', label: '运维单位名称', width: 170 }, { prop: 'powerrName', label: '变电站名称', width: 120 }, - //{ prop: "generatrixName", label: "母线名称", width: 120 }, { prop: 'busId', label: '母线编号', width: 180 }, { prop: 'lineName', label: '母线名称', width: 180 }, - // { prop: "lineId", label: "监测线路ID", width: 180 }, + { prop: "lineNum", label: "装置接线序号", width: 180 }, { prop: 'voltageLevel', label: '电压等级', width: 100 }, { prop: 'monitorState', label: '监测点状态', width: 120 }, + { prop: 'monitorObjectName', label: '监测对象名称', width: 250 }, { prop: 'monitorType', label: '监测点类型', width: 120 }, { prop: 'minShortCircuitCapacity', label: '最小短路容量', width: 120 }, { prop: 'powerSupplyEqCapacity', label: '供电设备容量', width: 120 }, diff --git a/src/views/Process-supervision/Supervisionmanage2/Workplan.vue b/src/views/Process-supervision/Supervisionmanage2/Workplan.vue index 2796177..97cabd7 100644 --- a/src/views/Process-supervision/Supervisionmanage2/Workplan.vue +++ b/src/views/Process-supervision/Supervisionmanage2/Workplan.vue @@ -2024,12 +2024,22 @@ export default { this.$refs.ruleform.validate(value => { // console.log(value); if (value == true) { + if(this.ruleform.ifReleaseWarning == 1){ + //需要提示预告警单不能为空 + if(this.ruleform.workAlarmId == null || this.ruleform.workAlarmId == ''){ + this.$message.warning("关联告预警单不可为空！"); + return + } + } + this.$confirm('是否确认新增?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }) .then(() => { + + addProblem(this.ruleform).then(res => { if (res.code == 'A0000') { this.$message({ @@ -2194,6 +2204,14 @@ export default { this.$refs.ruleform.validate(value => { // console.log(value); if (value == true) { + if(this.ruleform.ifReleaseWarning == 1){ + //需要提示预告警单不能为空 + if(this.ruleform.workAlarmId == null || this.ruleform.workAlarmId == ''){ + this.$message.warning("关联告预警单不可为空！"); + return + } + } + this.$confirm('是否确认修改?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/Process-supervision/components/harmonicmanagement/Planmanagement.vue b/src/views/Process-supervision/components/harmonicmanagement/Planmanagement.vue index b976f3b..5380dc7 100644 --- a/src/views/Process-supervision/components/harmonicmanagement/Planmanagement.vue +++ b/src/views/Process-supervision/components/harmonicmanagement/Planmanagement.vue @@ -29,7 +29,7 @@
新增计划 - 提交审核 +
@@ -667,7 +667,7 @@ export default { //获取审核人列表 getAuditUser() { - let param = {roleType: 3} + let param = {roleType: 1} getAuditUser(param).then(res => { if (res && res.code === 'A0000') { this.auditUserList = res.data diff --git a/src/views/Process-supervision/components/interferencemanagement/Undocumentednonlinear.vue b/src/views/Process-supervision/components/interferencemanagement/Undocumentednonlinear.vue index ee451ea..dc0d600 100644 --- a/src/views/Process-supervision/components/interferencemanagement/Undocumentednonlinear.vue +++ b/src/views/Process-supervision/components/interferencemanagement/Undocumentednonlinear.vue @@ -1195,7 +1195,7 @@ export default { //获取审核人列表 getAuditUser() { - let param = {roleType: 3} + let param = {roleType: 1} getAuditUser(param).then(res => { if (res && res.code === 'A0000') { this.auditUserList = res.data diff --git a/src/views/Process-supervision/harmonicmanagement.vue b/src/views/Process-supervision/harmonicmanagement.vue index 165c3f3..da05b64 100644 --- a/src/views/Process-supervision/harmonicmanagement.vue +++ b/src/views/Process-supervision/harmonicmanagement.vue @@ -6,9 +6,9 @@ - + + diff --git a/src/views/flow_task/components/normalPlanInit.vue b/src/views/flow_task/components/normalPlanInit.vue index c471f82..f28fbee 100644 --- a/src/views/flow_task/components/normalPlanInit.vue +++ b/src/views/flow_task/components/normalPlanInit.vue @@ -264,7 +264,7 @@ export default { //获取审核人列表 getAuditUser() { - let param = {roleType: 3} + let param = {roleType: 1} getAuditUser(param).then(res => { if (res && res.code === 'A0000') { this.auditUserList = res.data diff --git a/src/views/harmonic-boot/data-feed/index.vue b/src/views/harmonic-boot/data-feed/index.vue index 0381f84..b863048 100644 --- a/src/views/harmonic-boot/data-feed/index.vue +++ b/src/views/harmonic-boot/data-feed/index.vue @@ -69,7 +69,7 @@ - + {{ storeList[activeName].label + '重新计算' }} @@ -605,7 +605,7 @@ export default { let dateMonth = this.store.params.searchBeginTime.substring(0, 7) //月 request - .get('/prepare-boot/dimGlobal/reCalMonthUploadAlgorithm?statisticDate=' + dateMonth + '&type=' + type) + .get('/prepare-boot/dimGlobal/reCalMonthUploadAlgorithm?statisticDate=' + dateMonth + '&type=1') .then(res => { if (res && res.code === 'A0000') { this.$message({ @@ -617,7 +617,7 @@ export default { }) } else { request - .get('/prepare-boot/dimGlobal/reCalUploadAlgorithm?statisticDate=' + this.store.params.searchBeginTime + '&type=' + type) + .get('/prepare-boot/dimGlobal/reCalUploadAlgorithm?statisticDate=' + this.store.params.searchBeginTime + '&type=1') .then(res => { if (res && res.code === 'A0000') { this.$message({ From 263cd764f3faae1a536babc70487fa2e04400eeb Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Fri, 21 Mar 2025 16:20:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=B8=BB=E7=BD=91=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Account-management/components/Monitoringpoint.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/Account-management/components/Monitoringpoint.vue b/src/views/Account-management/components/Monitoringpoint.vue index 418746c..24f95b9 100644 --- a/src/views/Account-management/components/Monitoringpoint.vue +++ b/src/views/Account-management/components/Monitoringpoint.vue @@ -620,6 +620,7 @@ export default { { prop: 'monitorId', label: '测点编号', width: 220 }, { prop: 'orgName', label: '组织机构名称', width: 170 }, { prop: 'operationName', label: '运维单位名称', width: 170 }, + { prop: 'midStation', label: '变电站编号', width: 150 }, { prop: 'powerrName', label: '变电站名称', width: 120 }, { prop: 'busId', label: '母线编号', width: 180 }, { prop: 'lineName', label: '母线名称', width: 180 }, @@ -631,6 +632,7 @@ export default { { prop: 'minShortCircuitCapacity', label: '最小短路容量', width: 120 }, { prop: 'powerSupplyEqCapacity', label: '供电设备容量', width: 120 }, { prop: 'userAgreementCapacity', label: '用户协议容量', width: 120 }, + { prop: 'putDate', label: '投运日期', width: 120 }, { prop: 'voltageDeviationUpperLimit', label: '电压偏差限值（上）', @@ -1385,7 +1387,7 @@ export default { form.pageSize = this.total getAllMonitorPageList(form).then(res => { this.$refs.Monitoringpoint.exportData({ - filename: '监测点台账', // 文件名字 + filename: '监测点台账'+new Date().getTime(), // 文件名字 sheetName: 'Sheet1', type: 'xlsx', //导出文件类型 xlsx 和 csv useStyle: true,