From dd0dab76436160c0b862b55451e4ce0599804192 Mon Sep 17 00:00:00 2001 From: guanj Date: Mon, 2 Feb 2026 13:56:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E7=A8=8B=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=20=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/cs-device-boot/edData.ts | 63 ++- .../cockpit/exceedanceLevel/index.vue | 2 +- .../components/overLimitDetails.vue | 2 +- .../cockpit/gridSideStatistics/index.vue | 4 +- .../cockpit/indicatorCrossingTime/index.vue | 2 +- .../cockpit/indicatorDistribution/index.vue | 2 +- .../components/harmonicRatio‌.vue | 57 +-- .../components/overLimitDetails.vue | 38 +- .../components/overLimitDetails copy.vue | 23 +- .../components/overLimitDetails.vue | 2 +- .../components/overLimitDetails.vue | 31 +- .../components/overLimitDetails.vue | 2 +- .../cockpit/overLimitStatistics/index.vue | 4 +- src/views/govern/cloudDeviceEntry/index.vue | 94 +++- src/views/govern/manage/engineering.vue | 424 +++++++++--------- .../manage/engineering/components/itemAdd.vue | 221 +++++++++ .../manage/engineering/components/popup.vue | 106 +++++ src/views/govern/manage/engineering/index.vue | 239 ++++++++++ src/views/govern/reportForms/PopupForm.vue | 2 +- .../sags/operationsManagement/point.vue | 304 ++++++------- 20 files changed, 1152 insertions(+), 470 deletions(-) create mode 100644 src/views/govern/manage/engineering/components/itemAdd.vue create mode 100644 src/views/govern/manage/engineering/components/popup.vue create mode 100644 src/views/govern/manage/engineering/index.vue diff --git a/src/api/cs-device-boot/edData.ts b/src/api/cs-device-boot/edData.ts index dee458c..72fefca 100644 --- a/src/api/cs-device-boot/edData.ts +++ b/src/api/cs-device-boot/edData.ts @@ -1,41 +1,82 @@ import request from '@/utils/request' // 新增程序版本 -export const addEdData = (data) => { +export const addEdData = data => { return request({ url: '/cs-device-boot/edData/addEdData', method: 'post', headers: { - 'Content-Type': 'multipart/form-data', + 'Content-Type': 'multipart/form-data' }, - data: data, + data: data }) } -export const auditEdData = (data) => { +export const auditEdData = data => { return request({ url: '/cs-device-boot/edData/auditEdData', method: 'post', headers: { - 'Content-Type': 'multipart/form-data', + 'Content-Type': 'multipart/form-data' }, - data: data, + data: data }) } // 修改-删除工程 -export const auditEngineering = (data:any)=> { +export const auditEngineering = (data: any) => { return request({ url: '/cs-device-boot/engineering/auditEngineering', method: 'post', - data: data, + data: data }) } // 修改项目 -export const updateProject = (data:any) => { +export const updateProject = (data: any) => { return request({ url: '/cs-device-boot/project/updateProject', method: 'post', - data: data, + data: data }) -} \ No newline at end of file +} +// 新增工程 +export const addEngineering = (data: any) => { + return request({ + url: '/cs-device-boot/engineeringProjectRelation/addEngineering', + method: 'post', + data: data + }) +} +// 修改工程 +export const updateEngineering = (data: any) => { + return request({ + url: '/cs-device-boot/engineeringProjectRelation/updateEngineering', + method: 'post', + data: data + }) +} +// 刪除工程 +export const deleteEngineering = (data: any) => { + return request({ + url: '/cs-device-boot/engineeringProjectRelation/deleteEngineering', + method: 'post', + params: data + }) +} +// 刪除項目 +export const deleteProject = (data: any) => { + return request({ + url: '/cs-device-boot/engineeringProjectRelation/deleteProject', + method: 'post', + params: data + }) +} +// 新增项目 +export const addProject = (data: any) => { + return request({ + url: '/cs-device-boot/engineeringProjectRelation/addProject', + method: 'post', + data: data + }) +} + diff --git a/src/components/cockpit/exceedanceLevel/index.vue b/src/components/cockpit/exceedanceLevel/index.vue index 931f2bf..f4c5e12 100644 --- a/src/components/cockpit/exceedanceLevel/index.vue +++ b/src/components/cockpit/exceedanceLevel/index.vue @@ -143,7 +143,7 @@ const tableStore: any = new TableStore({ }, loadCallback: () => { // 定义 x 轴标签顺序 - const xAxisLabels = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'] + const xAxisLabels = ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'] // 根据指标名称顺序提取对应的 extent 数据 const chartData = xAxisLabels.map(label => { diff --git a/src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue b/src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue index 7f45e12..85d2957 100644 --- a/src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue +++ b/src/components/cockpit/gridSideStatistics/components/overLimitDetails.vue @@ -85,7 +85,7 @@ const tableStore: any = new TableStore({ width: '150' }, { - title: '闪变越限(%)', + title: '长时闪变越限(%)', field: 'flickerOvertime', width: '90', render: 'customTemplate', diff --git a/src/components/cockpit/gridSideStatistics/index.vue b/src/components/cockpit/gridSideStatistics/index.vue index 1131858..8ebf942 100644 --- a/src/components/cockpit/gridSideStatistics/index.vue +++ b/src/components/cockpit/gridSideStatistics/index.vue @@ -88,7 +88,7 @@ const initEcharts = () => { xAxis: { // name: '(区域)', - data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'] + data: ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'] }, yAxis: { @@ -149,7 +149,7 @@ const tableStore: any = new TableStore({ title: '越限占比(%)', children: [ { - title: '闪变', + title: '长时闪变', field: 'flicker', minWidth: '70', render: 'customTemplate', diff --git a/src/components/cockpit/indicatorCrossingTime/index.vue b/src/components/cockpit/indicatorCrossingTime/index.vue index a089aa6..32e1617 100644 --- a/src/components/cockpit/indicatorCrossingTime/index.vue +++ b/src/components/cockpit/indicatorCrossingTime/index.vue @@ -136,7 +136,7 @@ const initProbabilityData = () => { // 处理接口返回的数据，转换为图表所需格式 if (res.data && Array.isArray(res.data)) { // 定义指标类型顺序 - const indicatorOrder = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差'] + const indicatorOrder = ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差'] // 按照指定顺序排序数据 const sortedData = [...res.data].sort((a, b) => { return indicatorOrder.indexOf(a.indexName) - indicatorOrder.indexOf(b.indexName) diff --git a/src/components/cockpit/indicatorDistribution/index.vue b/src/components/cockpit/indicatorDistribution/index.vue index af60a0c..5547dca 100644 --- a/src/components/cockpit/indicatorDistribution/index.vue +++ b/src/components/cockpit/indicatorDistribution/index.vue @@ -135,7 +135,7 @@ const initProbabilityData = () => { // 处理接口返回的数据，转换为图表所需格式 if (res.data && Array.isArray(res.data)) { // 定义指标类型顺序 - const indicatorOrder = ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差'] + const indicatorOrder = ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相电压不平衡度', '频率偏差'] // 按照指定顺序排序数据 const sortedData = [...res.data].sort((a, b) => { return indicatorOrder.indexOf(a.indexName) - indicatorOrder.indexOf(b.indexName) diff --git a/src/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue b/src/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue index 4e2885b..6565f44 100644 --- a/src/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue +++ b/src/components/cockpit/indicatorFittingChart/components/harmonicRatio‌.vue @@ -12,7 +12,7 @@ multiple :multiple-limit="2" collapse-tags - collapse-tags-tooltip + collapse-tags-tooltip v-model="searchForm.index" placeholder="请选择统计指标" @change="onIndexChange($event)" @@ -66,7 +66,7 @@ @@ -81,12 +81,8 @@ -
- +
+
@@ -160,28 +156,40 @@ const countOptions: any = ref([]) const legendDictList: any = ref([]) const initCode = (field: string, title: string) => { - queryByCode('steady_state_limit_trend').then(res => { + queryByCode('gridSide_exceedTheLimit').then(res => { queryCsDictTree(res.data.id).then(item => { //排序 indexOptions.value = item.data.sort((a: any, b: any) => { return a.sort - b.sort }) - const titleMap: Record = { - flickerOvertime: 0, - uaberranceOvertime: 3, - ubalanceOvertime: 4, - freqDevOvertime: 5 - } + // const titleMap: Record = { + // flickerOvertime: 0, + // uaberranceOvertime: 3, + // ubalanceOvertime: 4, + // freqDevOvertime: 5 + // } - let defaultIndex = 0 // 默认值 + // let defaultIndex = 0 // 默认值 - if (field in titleMap) { - defaultIndex = titleMap[field] - } else if (field.includes('uharm')) { - defaultIndex = 1 - } else if (field.includes('iharm')) { - defaultIndex = 2 - } + // if (field in titleMap) { + // defaultIndex = titleMap[field] + // } else if (field.includes('uharm')) { + // defaultIndex = 1 + // } else if (field.includes('iharm')) { + // defaultIndex = 2 + // } + let codeKey = field.includes('flickerOvertime') + ? '闪变' + : field.includes('uharm') + ? '谐波电压' + : field.includes('iharm') + ? '谐波电流' + : field.includes('voltageDevOvertime') + ? '电压偏差' + : field.includes('ubalanceOvertime') + ? '不平衡' + : '' + let defaultIndex = indexOptions.value.findIndex((item: any) => item.name.includes(codeKey)) || 0 searchForm.value.index[0] = indexOptions.value[defaultIndex].id }) @@ -294,7 +302,7 @@ const init = async () => { } lists[index] = { statisticalId: item.index, - frequency: frequencys !== null && frequencys !== undefined ? String(frequencys) : '' + frequency: frequencys !== null && frequencys !== undefined ? String(frequencys) : '' } }) let obj = { @@ -579,7 +587,6 @@ const setTimeControl = () => { } const selectChange = (flag: boolean, height: any) => { - pageHeight.value = mainHeight(height * 1.6, 1.6) } //导出 diff --git a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue index 105aae4..a2124ca 100644 --- a/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue +++ b/src/components/cockpit/indicatorFittingChart/components/overLimitDetails.vue @@ -86,7 +86,7 @@ const tableStore: any = new TableStore({ width: '150' }, { - title: '闪变越限(分钟)', + title: '越限(分钟)', field: 'flickerOvertime', width: '90', render: 'customTemplate', @@ -101,6 +101,14 @@ const tableStore: any = new TableStore({ { title: '谐波电流越限(分钟)', children: loop50('iharm') + }, { + title: '电压偏差越限(分钟)', + field: 'uaberranceOvertime', + width: '100', + render: 'customTemplate', + customTemplate: (row: any) => { + return `${row.uaberranceOvertime}` + } }, { title: '三相不平衡度越限(分钟)', @@ -111,24 +119,16 @@ const tableStore: any = new TableStore({ return `${row.ubalanceOvertime}` } }, - { - title: '电压偏差越限(分钟)', - field: 'uaberranceOvertime', - width: '100', - render: 'customTemplate', - customTemplate: (row: any) => { - return `${row.uaberranceOvertime}` - } - }, - { - title: '频率偏差越限(分钟)', - field: 'freqDevOvertime', - width: '100', - render: 'customTemplate', - customTemplate: (row: any) => { - return `${row.freqDevOvertime}` - } - } + + // { + // title: '频率偏差越限(分钟)', + // field: 'freqDevOvertime', + // width: '100', + // render: 'customTemplate', + // customTemplate: (row: any) => { + // return `${row.freqDevOvertime}` + // } + // } ], beforeSearchFun: () => { }, diff --git a/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails copy.vue b/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails copy.vue index 6711d4a..b856d6c 100644 --- a/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails copy.vue +++ b/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails copy.vue @@ -69,7 +69,7 @@ const tableStore: any = new TableStore({ width: '150' }, { - title: '闪变越限(分钟)', + title: '长时闪变越限(分钟)', field: 'flicker', width: '80' }, @@ -99,26 +99,7 @@ const tableStore: any = new TableStore({ ], beforeSearchFun: () => {}, loadCallback: () => { - tableStore.table.data = [ - { - time: '2024-01-01 00:00:00', - name: '35kV进线', - flicker: '0', - - }, - { - time: '2024-01-01 00:00:00', - name: '35kV进线', - flicker: '0', - - }, - { - time: '2024-01-01 00:00:00', - name: '35kV进线', - flicker: '0', - - }, - ] + } }) diff --git a/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue b/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue index b7f5050..ee920b0 100644 --- a/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue +++ b/src/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue @@ -84,7 +84,7 @@ const tableStore: any = new TableStore({ width: '150' }, { - title: '闪变越限(分钟)', + title: '长时闪变越限(分钟)', field: 'flicker', width: '80', render: 'customTemplate', diff --git a/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue b/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue index 24feba5..dc0d57d 100644 --- a/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue +++ b/src/components/cockpit/monitoringPointList/components/overLimitDetails.vue @@ -85,7 +85,7 @@ const tableStore: any = new TableStore({ width: '150' }, { - title: '闪变越限(%)', + title: '长时闪变越限(%)', field: 'flickerOvertime', width: '90', render: 'customTemplate', @@ -101,16 +101,7 @@ const tableStore: any = new TableStore({ title: '谐波电流越限(%)', children: loop50('iharm') }, - { - title: '三相不平衡度越限(%)', - field: 'ubalanceOvertime', - width: '100', - render: 'customTemplate', - customTemplate: (row: any) => { - return `${row.ubalanceOvertime}` - } - }, - { + { title: '电压偏差越限(%)', field: 'voltageDevOvertime', width: '100', @@ -120,14 +111,24 @@ const tableStore: any = new TableStore({ } }, { - title: '频率偏差越限(%)', - field: 'freqDevOvertime', + title: '三相不平衡度越限(%)', + field: 'ubalanceOvertime', width: '100', render: 'customTemplate', customTemplate: (row: any) => { - return `${row.freqDevOvertime}` + return `${row.ubalanceOvertime}` } - } + }, + + // { + // title: '频率偏差越限(%)', + // field: 'freqDevOvertime', + // width: '100', + // render: 'customTemplate', + // customTemplate: (row: any) => { + // return `${row.freqDevOvertime}` + // } + // } ], beforeSearchFun: () => { }, diff --git a/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue b/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue index adcf3e5..c6796f8 100644 --- a/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue +++ b/src/components/cockpit/overLimitStatistics/components/overLimitDetails.vue @@ -85,7 +85,7 @@ const tableStore: any = new TableStore({ width: '150' }, { - title: '闪变越限(%)', + title: '长时闪变越限(%)', field: 'flickerOvertime', width: '90', render: 'customTemplate', diff --git a/src/components/cockpit/overLimitStatistics/index.vue b/src/components/cockpit/overLimitStatistics/index.vue index f339262..7900c62 100644 --- a/src/components/cockpit/overLimitStatistics/index.vue +++ b/src/components/cockpit/overLimitStatistics/index.vue @@ -89,7 +89,7 @@ const initEcharts = () => { xAxis: { // name: '(区域)', - data: ['闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'] + data: ['长时闪变', '谐波电压', '谐波电流', '电压偏差', '三相不平衡'] }, yAxis: { @@ -150,7 +150,7 @@ const tableStore: any = new TableStore({ title: '越限占比(%)', children: [ { - title: '闪变', + title: '长时闪变', field: 'flicker', minWidth: '70', render: 'customTemplate', diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue index 7a5fa37..dd77bac 100644 --- a/src/views/govern/cloudDeviceEntry/index.vue +++ b/src/views/govern/cloudDeviceEntry/index.vue @@ -481,7 +481,33 @@ :disabled="true" > - + + + + + + + + + + + +
@@ -1159,6 +1214,24 @@ const lineSpaceArr = ref([ { name: '5分钟', value: 5 }, { name: '10分钟', value: 10 } ]) +const logList = ref([ + { + value: 'DEBUG', + label: 'DEBUG' + }, + { + value: 'NORMAL', + label: 'NORMAL' + }, + { + value: 'WARN', + label: 'WARN' + }, + { + value: 'ERROR', + label: 'ERROR' + } +]) //工程 // const engineeringParam = ref({ // city: '', @@ -1179,6 +1252,7 @@ interface DeviceInfo { devModel: string devType: string devAccessMethod: string + devLogLevel: string mac: string ndid: string nodeId: string @@ -1203,6 +1277,7 @@ interface LineInfo { monitorObj: string position: string govern: string | number + lineLogLevel: string runStatus: string | number basicCapacity: number shortCircuitCapacity: number @@ -1555,6 +1630,7 @@ const add = () => { devModel: '', devType: '', devAccessMethod: 'CLD', + devLogLevel: 'WARN', mac: '', ndid: '', nodeId: '', @@ -1583,6 +1659,7 @@ const add = () => { monitorObj: '', position: '', govern: 0, + lineLogLevel: 'WARN', runStatus: 0, basicCapacity: 0, shortCircuitCapacity: 0, @@ -1695,8 +1772,9 @@ const updateEquipmentFunc = (id: any) => { id: id, // 设备ID用于修改 name: currentDevice.name, devModel: currentDevice.devModel, - devType: currentDevice.devType, + devType: currentDevice.devType, devAccessMethod: currentDevice.devAccessMethod, + devLogLevel: currentDevice.devLogLevel, mac: currentDevice.mac, nodeId: currentDevice.nodeId, cntractNo: currentDevice.cntractNo, @@ -1760,6 +1838,7 @@ const updateLineFunc = (id: any) => { monitorObj: currentLine.monitorObj || '', position: currentLine.position || '', govern: currentLine.govern, + lineLogLevel: currentLine.lineLogLevel, runStatus: currentLine.runStatus, basicCapacity: currentLine.basicCapacity || 0, shortCircuitCapacity: currentLine.shortCircuitCapacity || 0, @@ -1925,6 +2004,7 @@ const next = async () => { devModel: '', devType: '', devAccessMethod: 'CLD', + devLogLevel: 'WARN', mac: '', ndid: '', nodeId: '', @@ -1957,6 +2037,7 @@ const next = async () => { monitorObj: '', position: '', govern: 0, + lineLogLevel:'WARN', runStatus: 0, basicCapacity: 0, shortCircuitCapacity: 0, @@ -2361,6 +2442,8 @@ const resetAllForms = () => { device.devModel = '' device.devType = '' device.devAccessMethod = 'CLD' + device.devLogLevel = 'WARN' + device.mac = '' device.nodeId = '' device.cntractNo = '' @@ -2382,6 +2465,7 @@ const resetAllForms = () => { line.monitorObj = '' line.position = '' line.govern = 0 + line.lineLogLevel = 'WARN' line.runStatus = 0 line.basicCapacity = 0 line.shortCircuitCapacity = 0 @@ -2480,6 +2564,7 @@ const submitData = () => { devModel: currentDevice.devModel, devType: currentDevice.devType, devAccessMethod: currentDevice.devAccessMethod, + devLogLevel: currentDevice.devLogLevel, mac: currentDevice.mac, nodeId: currentDevice.nodeId, cntractNo: currentDevice.cntractNo, @@ -2550,6 +2635,7 @@ const submitData = () => { monitorObj: currentLine.monitorObj, position: currentLine.position, govern: currentLine.govern, + lineLogLevel: currentLine.lineLogLevel, runStatus: currentLine.runStatus, basicCapacity: currentLine.basicCapacity, shortCircuitCapacity: currentLine.shortCircuitCapacity, @@ -2664,6 +2750,7 @@ const handleBusBarTabsEdit = (targetName: any, action: any) => { devModel: '', devType: '', devAccessMethod: 'CLD', + devLogLevel: 'WARN', mac: '', ndid: '', nodeId: '', @@ -2740,6 +2827,7 @@ const handleLineTabsEdit = (targetName: any, action: any) => { monitorObj: '', position: '', govern: 0, + lineLogLevel: 'WARN', runStatus: 0, basicCapacity: 0, shortCircuitCapacity: 0, diff --git a/src/views/govern/manage/engineering.vue b/src/views/govern/manage/engineering.vue index e24842a..da89e3e 100644 --- a/src/views/govern/manage/engineering.vue +++ b/src/views/govern/manage/engineering.vue @@ -1,213 +1,211 @@ - - - + + + diff --git a/src/views/govern/manage/engineering/components/itemAdd.vue b/src/views/govern/manage/engineering/components/itemAdd.vue new file mode 100644 index 0000000..9c0ebb3 --- /dev/null +++ b/src/views/govern/manage/engineering/components/itemAdd.vue @@ -0,0 +1,221 @@ + + + diff --git a/src/views/govern/manage/engineering/components/popup.vue b/src/views/govern/manage/engineering/components/popup.vue new file mode 100644 index 0000000..17a7a83 --- /dev/null +++ b/src/views/govern/manage/engineering/components/popup.vue @@ -0,0 +1,106 @@ + + diff --git a/src/views/govern/manage/engineering/index.vue b/src/views/govern/manage/engineering/index.vue new file mode 100644 index 0000000..bcd40bd --- /dev/null +++ b/src/views/govern/manage/engineering/index.vue @@ -0,0 +1,239 @@ + + + diff --git a/src/views/govern/reportForms/PopupForm.vue b/src/views/govern/reportForms/PopupForm.vue index d1d5115..1ffc3c3 100644 --- a/src/views/govern/reportForms/PopupForm.vue +++ b/src/views/govern/reportForms/PopupForm.vue @@ -6,7 +6,7 @@ maxlength="32" show-word-limit v-model.trim="form.modelTypeName" - placeholder="请输入菜单名称" + placeholder="请输入报表名称" /> diff --git a/src/views/pms/voltage/sags/operationsManagement/point.vue b/src/views/pms/voltage/sags/operationsManagement/point.vue index 4d0c8c4..3bad92f 100644 --- a/src/views/pms/voltage/sags/operationsManagement/point.vue +++ b/src/views/pms/voltage/sags/operationsManagement/point.vue @@ -1,152 +1,152 @@ - - + +