From 50573bb748c26e88085ebbfc0d9bf96979d13c0b Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Mon, 10 Mar 2025 09:13:12 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hbaccountoperation/Monitoringpoint.js | 10 + src/api/hbaccountoperation/setInformation.js | 8 + .../components/uploadGw/Monitoringpoint.vue | 205 ++++-------------- .../components/uploadGw/statistics.vue | 52 ++--- 4 files changed, 79 insertions(+), 196 deletions(-) diff --git a/src/api/hbaccountoperation/Monitoringpoint.js b/src/api/hbaccountoperation/Monitoringpoint.js index 058ff04..b051097 100644 --- a/src/api/hbaccountoperation/Monitoringpoint.js +++ b/src/api/hbaccountoperation/Monitoringpoint.js @@ -8,6 +8,16 @@ export function getAllMonitorPageList(data) { data }) } + +export function getAllMainUserPageList(data) { + return request({ + url: '/device-boot/pms/monitor/getAllMainUserPageList', + method: 'post', + data + }) +} + + // 新增牵引站信息 export function addMonitor(data) { return request({ diff --git a/src/api/hbaccountoperation/setInformation.js b/src/api/hbaccountoperation/setInformation.js index d485468..7e26e23 100644 --- a/src/api/hbaccountoperation/setInformation.js +++ b/src/api/hbaccountoperation/setInformation.js @@ -51,3 +51,11 @@ export function objType(data) { params: data }) } + +export function objTypeStatis(data) { + return request({ + url: '/device-boot/monitorStatistics/objTypeStatis', + method: 'post', + params: data + }) +} diff --git a/src/views/Account-management/components/uploadGw/Monitoringpoint.vue b/src/views/Account-management/components/uploadGw/Monitoringpoint.vue index a9c78f8..6096be0 100644 --- a/src/views/Account-management/components/uploadGw/Monitoringpoint.vue +++ b/src/views/Account-management/components/uploadGw/Monitoringpoint.vue @@ -22,35 +22,6 @@ children: 'children' }"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -59,26 +30,13 @@ >重置 --> 导出 - - 网公司上送 - - - 网公司上送 - + - + - + - - + + - - + + - - + + @@ -345,8 +256,8 @@ :value="item.id"> - - + + @@ -383,7 +294,7 @@ import { getTerminalSelectList, getPowerClientList, getPowerGenerationUserList, - getAllMonitorPageList, + getAllMainUserPageList, addMonitor, updateMonitor, delMonitor, @@ -491,7 +402,7 @@ export default { trigger: 'blur' } ], - name: [{ required: true, message: '请输入监测点名称', trigger: 'blur' }], + name: [{ required: true, message: '请输入用户名称', trigger: 'blur' }], fieldStation: [{ required: true, message: '请输入新能源场', trigger: 'blur' }], // valueTitle: [ // { required: true, message: "请输入组织机构名称", trigger:["blur",'change']}, @@ -518,8 +429,8 @@ export default { } ], voltageLevel: [{ required: true, message: '请选择电压等级', trigger: 'change' }], - monitorState: [{ required: true, message: '请选择监测点状态', trigger: 'change' }], - monitorType: [{ required: true, message: '请选择监测点类型', trigger: 'change' }], + monitorState: [{ required: true, message: '请选择用户状态', trigger: 'change' }], + monitorType: [{ required: true, message: '请选择用户类型', trigger: 'change' }], pt1: [ { required: true, message: '请输入pt1', trigger: 'blur' }, { pattern: /^[0-9]*$/, message: '只可以输入数字', trigger: 'blur' } @@ -599,7 +510,7 @@ export default { isUpToGrid: [ { required: true, - message: '请选择是否是上送网公司监测点', + message: '请选择是否是上送网公司用户', trigger: 'change' } ], @@ -614,39 +525,18 @@ export default { monitorTagList: [], //台区台账表头 tableHeaderMonitoring: [ - // { prop: 'id', label: '监测点编号', width: 120 }, + // { prop: 'id', label: '用户编号', width: 120 }, { prop: 'monitorObjectName', label: '监测对象名称', width: 250 }, { 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: 'name', label: '测点名称', width: 220 }, + { prop: 'voltageLevel', label: '电压等级', width: 100 }, - { prop: 'monitorState', label: '监测点状态', width: 120 }, - { prop: 'monitorType', label: '监测点类型', width: 120 }, - { prop: 'minShortCircuitCapacity', label: '最小短路容量', width: 120 }, - { prop: 'powerSupplyEqCapacity', label: '供电设备容量', width: 120 }, - { prop: 'userAgreementCapacity', label: '用户协议容量', width: 120 }, - { - prop: 'voltageDeviationUpperLimit', - label: '电压偏差限值（上）', - width: 170 - }, - { - prop: 'voltageDeviationLowerLimit', - label: '电压偏差限值（下）', - width: 170 - }, - { - prop: 'potentialTransFormerType', - label: '电压互感器类型', - width: 170 - }, - { prop: 'neutralGroundingMode', label: '中性点接地方式', width: 170 }, + { prop: 'isSpecialSupplyElectricity', label: '是否用户专线', @@ -658,14 +548,9 @@ export default { // { prop: "monitorObjectId", label: "监测对象编号", width:170 }, { prop: 'tradeCode', label: '行业分类', width: 170 }, - { prop: 'statisticalInterval', label: '统计间隔(min)', width: 140 }, - { prop: 'terminalCode', label: '关联的监测终端编号', width: 190 }, - { prop: 'devIp', label: '监测终端IP', width: 150 }, - { prop: 'terminalWiringMethod', label: '监测终端接线方式', width: 160 }, + { prop: 'fieldStation', label: '新能源场', width: 120 }, - { prop: 'tractionId', label: '关联牵引站编号', width: 190 }, - { prop: 'isUpToGrid', label: '是否是上送网公司', width: 160 } - // { prop: "status", label: "数据状态", width:100 }, + ], whether: [ { @@ -739,10 +624,10 @@ export default { TerminalNo: [], //关联的监测终端编号 voltageLevelList: [], //电压等级 industryType: [], //行业分类 - monitorStateList: [], //监测点状态 - monitorTypeList: [], //监测点标签 - MonitoringPointType: [], //监测点类型 - MonitoringPointTypes: [], //监测点类型 + monitorStateList: [], //用户状态 + monitorTypeList: [], //用户标签 + MonitoringPointType: [], //用户类型 + MonitoringPointTypes: [], //用户类型 potentialTransFormerTypeList: [], //电压互感器类型 neutralGroundingModeList: [], //中性点接地方式 @@ -849,23 +734,23 @@ export default { getclassificationData() { //电压等级 this.voltageLevelList = dicData('Dev_Voltage', []) - //监测点状态 + //用户状态 this.monitorStateList = dicData('Line_State', []) - //监测点标签 + //用户标签 this.monitorTypeList = dicData('Line_Type', []) //电压互感器类型 this.potentialTransFormerTypeList = dicData('Voltage_Transformer', []) //中性点接地方式 this.neutralGroundingModeList = dicData('Neutral_Point', []) - //监测点标签 + //用户标签 this.monitorTagList = dicData('Monitoring_Labels', []) //监测终端接线方式 this.terminalWiringMethodList = dicData('Dev_Connect', []) //行业分类 this.industryType = dicData('industry_type', []) - // 监测点类型 + // 用户类型 queryTree({}).then(res => { if (res && res.code == `A0000`) { this.MonitoringPointType = this.getTreeData(res.data) @@ -926,7 +811,7 @@ export default { } else { this.ruleForm.objType = '' } - getAllMonitorPageList(this.ruleForm).then(res => { + getAllMainUserPageList(this.ruleForm).then(res => { this.isLoading = false this.UserData = res.data.records this.total = res.data.total @@ -1160,7 +1045,7 @@ export default { this.disabled = false this.modify = false this.add = true - this.title = '新增主网监测点台帐' + this.title = '新增主网用户台帐' this.addinformation = true // this.getData(); }, @@ -1212,7 +1097,7 @@ export default { }, handleClose() { this.addinformation = false - if (this.title == '新增主网监测点台帐') { + if (this.title == '新增主网用户台帐') { this.$refs.Operation.form.valueTitle = '' this.$refs.Organization.form.valueTitle = '' } @@ -1224,7 +1109,7 @@ export default { this.modify = true this.add = false - this.title = '修改主网监测点台帐' + this.title = '修改主网用户台帐' if (this.$refs.Monitoringpoint.getCheckboxRecords().length != 1) { this.$message({ showClose: true, @@ -1383,9 +1268,9 @@ export default { let form = JSON.parse(JSON.stringify(this.ruleForm)) form.pageNum = 1 form.pageSize = this.total - getAllMonitorPageList(form).then(res => { + getAllMainUserPageList(form).then(res => { this.$refs.Monitoringpoint.exportData({ - filename: '监测点台账', // 文件名字 + filename: '用户台账', // 文件名字 sheetName: 'Sheet1', type: 'xlsx', //导出文件类型 xlsx 和 csv useStyle: true, @@ -1416,7 +1301,7 @@ export default { let flagState = true if (this.$refs.Monitoringpoint.getCheckboxRecords().length == 0) { return this.$message({ - message: '请选择监测点!', + message: '请选择用户!', type: 'warning' }) } @@ -1474,18 +1359,18 @@ export default { }) } else if (flag == false) { return this.$message({ - message: '所选监测点与监测对象不符合,请重新选择!', + message: '所选用户与监测对象不符合,请重新选择!', type: 'warning' }) } else if (isUpToGrid == false) { return this.$message({ - message: '所选监测点存在非上送网公司监测点!', + message: '所选用户存在非上送网公司用户!', type: 'warning' }) } else if (flagState == false) { return this.$message({ type: 'warning', - message: '请选择运行状态的监测点进行上送!' + message: '请选择运行状态的用户进行上送!' }) } // this.objTypeVisible = true @@ -1511,7 +1396,7 @@ export default { if (isUpToGrid && flagState) { if (this.$refs.Monitoringpoint.getCheckboxRecords().length == 0) { - this.$confirm('是否上送全部监测点?', '提示', { + this.$confirm('是否上送全部用户?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' @@ -1553,13 +1438,13 @@ export default { } } else if (isUpToGrid == false) { return this.$message({ - message: '所选监测点存在非上送网公司监测点!', + message: '所选用户存在非上送网公司用户!', type: 'warning' }) } else if (flagState == false) { return this.$message({ type: 'warning', - message: '请选择运行状态的监测点进行上送!' + message: '请选择运行状态的用户进行上送!' }) } }, diff --git a/src/views/Account-management/components/uploadGw/statistics.vue b/src/views/Account-management/components/uploadGw/statistics.vue index 11e3c13..9e835c4 100644 --- a/src/views/Account-management/components/uploadGw/statistics.vue +++ b/src/views/Account-management/components/uploadGw/statistics.vue @@ -23,24 +23,18 @@ v-loading="isLoading" header-cell-class-name="table_header" > - - + + - + @@ -48,7 +42,7 @@