diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 0feab56..a61c47e 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -569,6 +569,7 @@ Getproperties.value.peopleUser = null; } console.log('Getproperties', Getproperties.value); + debugger GetBoxmenu('', item.stType); } diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 0feab56..a61c47e 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -569,6 +569,7 @@ Getproperties.value.peopleUser = null; } console.log('Getproperties', Getproperties.value); + debugger GetBoxmenu('', item.stType); } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue index 3f43bb1..ad70faf 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue @@ -3,7 +3,7 @@
{{i.label}} -
{{i.num}}
+
({{i.num}}{{i.uit}})
@@ -27,19 +27,28 @@ import bus from "@/bus"; import { drainageDispatchMonitorData, + pumpStationStatistics } from '@/api/FloodControlAndDrainage.js'; -const classData=[ - {label:'开泵',value:'1',num:'(0/34)'}, - {label:'今日抽排量',value:'2',num:'(0万方)'}, - {label:'实时抽排量',value:'3',num:'(0万方)'}, - {label:'指令响应',value:'4',num:'(0/0)'}, - {label:'语音提醒',value:'5',num:'(0/0)'}, -] +const classData=reactive([ + {label:'开泵',name:'pumpOn',num:'',uit:''}, + {label:'今日抽排量',name:'todayDisplacement',num:'',uit:'万方'}, + {label:'昨日抽排量',name:'yestodayDisplacement',num:'',uit:'万方'}, + {label:'指令响应',name:'commandedResponse',num:'',uit:''}, + {label:'语音提醒',name:'voiceReminder',num:'',uit:''}, +]) const tabActive=ref(1) const listData=ref([]) function gitDataFun() { + pumpStationStatistics().then(res => { + debugger + if (res && res.code == 200) { + classData.forEach(i=>{ + i.num=res.data[i.name] + }) + } + }); let params={ monitorType:'bzgq' } diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 971e705..86078ff 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -463,4 +463,11 @@ params }); } +export function pumpStationStatistics(params) { + return request({ + url: '/business/drainageMap/pumpStationStatistics', + method: 'get', + params + }); +} // ``````````EDN````````````````````` \ No newline at end of file diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 0feab56..a61c47e 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -569,6 +569,7 @@ Getproperties.value.peopleUser = null; } console.log('Getproperties', Getproperties.value); + debugger GetBoxmenu('', item.stType); } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue index 3f43bb1..ad70faf 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue @@ -3,7 +3,7 @@
{{i.label}} -
{{i.num}}
+
({{i.num}}{{i.uit}})
@@ -27,19 +27,28 @@ import bus from "@/bus"; import { drainageDispatchMonitorData, + pumpStationStatistics } from '@/api/FloodControlAndDrainage.js'; -const classData=[ - {label:'开泵',value:'1',num:'(0/34)'}, - {label:'今日抽排量',value:'2',num:'(0万方)'}, - {label:'实时抽排量',value:'3',num:'(0万方)'}, - {label:'指令响应',value:'4',num:'(0/0)'}, - {label:'语音提醒',value:'5',num:'(0/0)'}, -] +const classData=reactive([ + {label:'开泵',name:'pumpOn',num:'',uit:''}, + {label:'今日抽排量',name:'todayDisplacement',num:'',uit:'万方'}, + {label:'昨日抽排量',name:'yestodayDisplacement',num:'',uit:'万方'}, + {label:'指令响应',name:'commandedResponse',num:'',uit:''}, + {label:'语音提醒',name:'voiceReminder',num:'',uit:''}, +]) const tabActive=ref(1) const listData=ref([]) function gitDataFun() { + pumpStationStatistics().then(res => { + debugger + if (res && res.code == 200) { + classData.forEach(i=>{ + i.num=res.data[i.name] + }) + } + }); let params={ monitorType:'bzgq' } diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue new file mode 100644 index 0000000..90de5a0 --- /dev/null +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file