diff --git a/src/api/device-boot/line.ts b/src/api/device-boot/line.ts index 59646421..846a35d0 100644 --- a/src/api/device-boot/line.ts +++ b/src/api/device-boot/line.ts @@ -1,32 +1,47 @@ -import request from '@/utils/request' - -import { DEVICE_BOOT } from '@/utils/constantRequest' - -const MAPPING_PATH = DEVICE_BOOT + '/line' - -/** - * 查询终端详细信息 - */ -export const getDeviceDetailData = (id: string) => { - return request({ - url: MAPPING_PATH + '/getDeviceDetailData?id=' + id, - method: 'POST' - }) -} - -/** - * 查询监测点详细信息 - */ -export const getLineDetailData = (id: string) => { - return request({ - url: MAPPING_PATH + '/getLineDetailData?id=' + id, - method: 'POST' - }) -} - -export const getSubstationSelect = () => { - return request({ - url: 'device-boot/substation/getSubstationSelect', - method: 'get' - }) -} +import request from '@/utils/request' + +import { DEVICE_BOOT } from '@/utils/constantRequest' + +const MAPPING_PATH = DEVICE_BOOT + '/line' + +/** + * 查询终端详细信息 + */ +export const getDeviceDetailData = (id: string) => { + return request({ + url: MAPPING_PATH + '/getDeviceDetailData?id=' + id, + method: 'POST' + }) +} + +/** + * 查询监测点详细信息 + */ +export const getLineDetailData = (id: string) => { + return request({ + url: MAPPING_PATH + '/getLineDetailData?id=' + id, + method: 'POST' + }) +} + +export const getSubstationSelect = () => { + return request({ + url: 'device-boot/substation/getSubstationSelect', + method: 'get' + }) +} +// 查询变电站详情 +export const getSubstationSelectLine = (id: string) => { + return request({ + url: '/device-boot/line/getSubstationData', + method: 'post', + data: [id] + }) +} +// 查询监测点 +export const getLineOverLimitData = (id: string) => { + return request({ + url: '/device-boot/line/getLineOverLimitData?id=' + id, + method: 'post' + }) +} diff --git a/src/components/cockpit/integrity/index.vue b/src/components/cockpit/integrity/index.vue index 1564c1ca..78911a26 100644 --- a/src/components/cockpit/integrity/index.vue +++ b/src/components/cockpit/integrity/index.vue @@ -31,7 +31,7 @@
低于90%监测点数 - + {{ monitoringPoints.abnormalNum }}
@@ -90,7 +90,7 @@ {{ o.citTotalNum }} - + {{ o.citBelowNum }} { + if (tableStore.table.params.statisticalType.name == '终端厂家') { + return k.citTotalNum != 0 + } else { + return k.citName != '上送国网' && k.citName != '非上送国网' + } + }) } }) tableStore.table.params.deptIndex = dictData.state.area[0].id +tableStore.table.params.lineRunFlag = 0 const echart = () => { percentage.value = { color: ['#FF9100'], diff --git a/src/components/cockpit/onlineRate/index.vue b/src/components/cockpit/onlineRate/index.vue index a6c15d27..b9312fc9 100644 --- a/src/components/cockpit/onlineRate/index.vue +++ b/src/components/cockpit/onlineRate/index.vue @@ -31,7 +31,7 @@
低于90%终端数 - + {{ monitoringPoints.abnormalNum }}
@@ -88,7 +88,7 @@ {{ o.citTotalNum }}
- + {{ o.citBelowNum }} k.citName != '上送国网' && k.citName != '非上送国网' - ) + abnormal.value = tableStore.table.data.citDetailList.filter((k: any) => { + if (tableStore.table.params.statisticalType.name == '终端厂家') { + return k.citTotalNum != 0 + } else { + return k.citName != '上送国网' && k.citName != '非上送国网' + } + }) + } }) tableStore.table.params.deptIndex = dictData.state.area[0].id +tableStore.table.params.lineRunFlag = 0 const echart = () => { percentage.value = { color: ['#FF9100'], diff --git a/src/components/cockpit/terminalEvaluation/index.vue b/src/components/cockpit/terminalEvaluation/index.vue index c8470806..488d05b9 100644 --- a/src/components/cockpit/terminalEvaluation/index.vue +++ b/src/components/cockpit/terminalEvaluation/index.vue @@ -108,7 +108,7 @@ @@ -123,7 +123,7 @@ {{ o.qualified }} @@ -229,11 +229,17 @@ const tableStore: any = new TableStore({ statisticsList.value.checkNum = totalData.value.filter(item => item.runFlag === '调试').length statisticsList.value.stopRunNum = totalData.value.filter(item => item.runFlag === '停运').length - abnormal.value = tableStore.table.data.filter((k: any) => k.name != '上送国网' && k.name != '非上送国网') + abnormal.value = tableStore.table.data.filter((k: any) => { + if (tableStore.table.params.statisticalType.name == '终端厂家') { + return k.count != 0 + } else { + return k.name != '上送国网' && k.name != '非上送国网' + } + }) } }) tableStore.table.params.deptIndex = dictData.state.area[0].id - +tableStore.table.params.lineRunFlag = 0 provide('tableStore', tableStore) onMounted(() => { diff --git a/src/components/echarts/color.ts b/src/components/echarts/color.ts index 649ed395..6c5825bc 100644 --- a/src/components/echarts/color.ts +++ b/src/components/echarts/color.ts @@ -1,14 +1,17 @@ -export let color = [ - '#07CCCA', - '#00BFF5', - '#FFBF00', - '#77DA63', - '#D5FF6B', - '#Ff6600', - '#FF9100', - '#5B6E96', - '#66FFCC', - '#B3B' -] -export const gradeColor3 = ['#339966', '#FFCC33', '#A52a2a'] -export const gradeColor5 = ['#00CC00', '#99CC99', '#FF9900', '#996600', '#A52a2a'] +export const color = [ + '#07CCCA', + '#00BFF5', + '#FFBF00', + '#77DA63', + '#D5FF6B', + '#Ff6600', + '#FF9100', + '#5B6E96', + '#66FFCC', + '#B266FF', + '#FF6680', + '#40A0FF', + '#33CC99' +] +export const gradeColor3 = ['#339966', '#FFCC33', '#A52a2a'] +export const gradeColor5 = ['#00CC00', '#99CC99', '#FF9900', '#996600', '#A52a2a'] diff --git a/src/components/tree/details/monitoringPointDetails.vue b/src/components/tree/details/monitoringPointDetails.vue new file mode 100644 index 00000000..7632f624 --- /dev/null +++ b/src/components/tree/details/monitoringPointDetails.vue @@ -0,0 +1,205 @@ + + + diff --git a/src/components/tree/details/substationDetails.vue b/src/components/tree/details/substationDetails.vue new file mode 100644 index 00000000..e7536008 --- /dev/null +++ b/src/components/tree/details/substationDetails.vue @@ -0,0 +1,34 @@ + + + diff --git a/src/components/tree/index.vue b/src/components/tree/index.vue index a100abd3..e16feaed 100644 --- a/src/components/tree/index.vue +++ b/src/components/tree/index.vue @@ -1,162 +1,245 @@ - - - - - + + + + + + diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue index 01983476..f735a94a 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue @@ -1,865 +1,865 @@ - - - - - + + + + + diff --git a/src/views/LN/newEnergy/newEnergyAnalysis/test.vue b/src/views/LN/newEnergy/newEnergyAnalysis/test.vue index e440f632..a3958eae 100644 --- a/src/views/LN/newEnergy/newEnergyAnalysis/test.vue +++ b/src/views/LN/newEnergy/newEnergyAnalysis/test.vue @@ -1,875 +1,875 @@ - - - - - + + + + + diff --git a/src/views/pqs/business/terminal/ProgramManagement/index.vue b/src/views/pqs/business/terminal/ProgramManagement/index.vue index 75d45618..dd41b1fa 100644 --- a/src/views/pqs/business/terminal/ProgramManagement/index.vue +++ b/src/views/pqs/business/terminal/ProgramManagement/index.vue @@ -1,355 +1,355 @@ - - + + diff --git a/src/views/pqs/business/terminal/TerminalManagement/index.vue b/src/views/pqs/business/terminal/TerminalManagement/index.vue index 4cc79618..5a927743 100644 --- a/src/views/pqs/business/terminal/TerminalManagement/index.vue +++ b/src/views/pqs/business/terminal/TerminalManagement/index.vue @@ -1,282 +1,282 @@ - - + + diff --git a/src/views/pqs/business/terminal/deviceter/index.vue b/src/views/pqs/business/terminal/deviceter/index.vue index 16b33897..cd951041 100644 --- a/src/views/pqs/business/terminal/deviceter/index.vue +++ b/src/views/pqs/business/terminal/deviceter/index.vue @@ -3073,7 +3073,7 @@ const setDown = () => { onMounted(() => { const dom = document.getElementById('navigation-splitpanes') if (dom) { - size.value = Math.round((180 / dom.offsetHeight) * 100) + size.value = Math.round((180 / dom.offsetHeight) * 120) } if (VITE_FLAG) { getYwZtSubstation({ orgId: '' }).then(res => { diff --git a/src/views/pqs/database/algorithm/index.vue b/src/views/pqs/database/algorithm/index.vue index cba0b8b2..d211cf52 100644 --- a/src/views/pqs/database/algorithm/index.vue +++ b/src/views/pqs/database/algorithm/index.vue @@ -1,341 +1,341 @@ - - - + + + diff --git a/src/views/pqs/database/model/components/harmonicImpedance.vue b/src/views/pqs/database/model/components/harmonicImpedance.vue index b0def071..85eae2bd 100644 --- a/src/views/pqs/database/model/components/harmonicImpedance.vue +++ b/src/views/pqs/database/model/components/harmonicImpedance.vue @@ -1,6 +1,6 @@