diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..690f489 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -470,4 +470,27 @@ params }); } -// ``````````EDN````````````````````` \ No newline at end of file +// 辅助决策 防汛检查 街道数据 +export function dutyCheckInfoGetCheckCount(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckCount', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选列表 +export function dutyCheckInfoGetCheckResultList(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckResultList', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选新增 +export function dutyCheckResultBatchSave(params){ + return request({ + url:'/business/dutyCheckResult/batchSave', + method: 'post', + params + }) +} \ No newline at end of file diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..690f489 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -470,4 +470,27 @@ params }); } -// ``````````EDN````````````````````` \ No newline at end of file +// 辅助决策 防汛检查 街道数据 +export function dutyCheckInfoGetCheckCount(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckCount', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选列表 +export function dutyCheckInfoGetCheckResultList(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckResultList', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选新增 +export function dutyCheckResultBatchSave(params){ + return request({ + url:'/business/dutyCheckResult/batchSave', + method: 'post', + params + }) +} \ No newline at end of file diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue index db6533a..41dc9dd 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue @@ -2,8 +2,7 @@
-
- +
- 警情建议 + 预警建议
{{yjtj?.recommendGrade}}
diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..690f489 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -470,4 +470,27 @@ params }); } -// ``````````EDN````````````````````` \ No newline at end of file +// 辅助决策 防汛检查 街道数据 +export function dutyCheckInfoGetCheckCount(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckCount', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选列表 +export function dutyCheckInfoGetCheckResultList(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckResultList', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选新增 +export function dutyCheckResultBatchSave(params){ + return request({ + url:'/business/dutyCheckResult/batchSave', + method: 'post', + params + }) +} \ No newline at end of file diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue index db6533a..41dc9dd 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue @@ -2,8 +2,7 @@
-
- +
- 警情建议 + 预警建议
{{yjtj?.recommendGrade}}
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue index e15387e..a900600 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue @@ -1,23 +1,48 @@ @@ -25,26 +50,80 @@ import { ref, reactive, onMounted } from 'vue'; import { drainageDispatchGetCheckCount, + dutyCheckInfoGetCheckCount, + dutyCheckInfoGetCheckResultList, + dutyCheckResultBatchSave, } from '@/api/FloodControlAndDrainage.js'; const { proxy } = getCurrentInstance(); -const loading=ref(false) -const listData=ref({ - -}) +const loading = ref(false); +const jiedaoData = ref({}); +const visible = ref(false); +const listData = ref({}); +const checkedCities = ref([]); +const cities = ref([]); function gitDataFun() { - loading.value=true - drainageDispatchGetCheckCount().then(res => { - console.log('获取防汛检查', res); - loading.value=false - if (res && res.code == 200) { - listData.value=res.data + loading.value = true; + drainageDispatchGetCheckCount().then( + res => { + console.log('获取防汛检查', res); + loading.value = false; + if (res && res.code == 200) { + listData.value = res.data; + } + }, + error => { + loading.value = false; } - },(error)=>{ - loading.value=false - }); + ); +} +// 街道应到操作 +const loadingjiedao = ref(false); +function jiedaoFun() { + loadingjiedao.value = true; + dutyCheckInfoGetCheckResultList().then( + res => { + console.log('获取街道数据', res); + loadingjiedao.value = false; + if (res && res.code == 200) { + cities.value = res.data.regionCheckList; + res.data.regionHasCheckList.map((e)=>{ + checkedCities.value.push(e.id) + }) + console.log('cities.value', cities.value); + visible.value = true; + } + }, + error => { + loadingjiedao.value = false; + } + ); +} +// 获取街道数据 +async function dutyCheckInfoGetCheckCountFun() { + let res = await dutyCheckInfoGetCheckCount(); + if (res && res.code == 200) { + jiedaoData.value = res.data; + } +} +async function confirmClick() { + console.log('checkedCities', checkedCities.value); + + if(checkedCities.value.length>0){ + let paams={ + checkIds:checkedCities.value.join(',') + } + let res = await dutyCheckResultBatchSave(paams); + if (res && res.code == 200) { + proxy.$modal.msgSuccess('操作成功'); + dutyCheckInfoGetCheckCountFun(); + visible.value = false; + } + } + } onMounted(() => { - gitDataFun() + gitDataFun(); + dutyCheckInfoGetCheckCountFun(); }); diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..690f489 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -470,4 +470,27 @@ params }); } -// ``````````EDN````````````````````` \ No newline at end of file +// 辅助决策 防汛检查 街道数据 +export function dutyCheckInfoGetCheckCount(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckCount', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选列表 +export function dutyCheckInfoGetCheckResultList(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckResultList', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选新增 +export function dutyCheckResultBatchSave(params){ + return request({ + url:'/business/dutyCheckResult/batchSave', + method: 'post', + params + }) +} \ No newline at end of file diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue index db6533a..41dc9dd 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue @@ -2,8 +2,7 @@
-
- +
- 警情建议 + 预警建议
{{yjtj?.recommendGrade}}
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue index e15387e..a900600 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue @@ -1,23 +1,48 @@ @@ -25,26 +50,80 @@ import { ref, reactive, onMounted } from 'vue'; import { drainageDispatchGetCheckCount, + dutyCheckInfoGetCheckCount, + dutyCheckInfoGetCheckResultList, + dutyCheckResultBatchSave, } from '@/api/FloodControlAndDrainage.js'; const { proxy } = getCurrentInstance(); -const loading=ref(false) -const listData=ref({ - -}) +const loading = ref(false); +const jiedaoData = ref({}); +const visible = ref(false); +const listData = ref({}); +const checkedCities = ref([]); +const cities = ref([]); function gitDataFun() { - loading.value=true - drainageDispatchGetCheckCount().then(res => { - console.log('获取防汛检查', res); - loading.value=false - if (res && res.code == 200) { - listData.value=res.data + loading.value = true; + drainageDispatchGetCheckCount().then( + res => { + console.log('获取防汛检查', res); + loading.value = false; + if (res && res.code == 200) { + listData.value = res.data; + } + }, + error => { + loading.value = false; } - },(error)=>{ - loading.value=false - }); + ); +} +// 街道应到操作 +const loadingjiedao = ref(false); +function jiedaoFun() { + loadingjiedao.value = true; + dutyCheckInfoGetCheckResultList().then( + res => { + console.log('获取街道数据', res); + loadingjiedao.value = false; + if (res && res.code == 200) { + cities.value = res.data.regionCheckList; + res.data.regionHasCheckList.map((e)=>{ + checkedCities.value.push(e.id) + }) + console.log('cities.value', cities.value); + visible.value = true; + } + }, + error => { + loadingjiedao.value = false; + } + ); +} +// 获取街道数据 +async function dutyCheckInfoGetCheckCountFun() { + let res = await dutyCheckInfoGetCheckCount(); + if (res && res.code == 200) { + jiedaoData.value = res.data; + } +} +async function confirmClick() { + console.log('checkedCities', checkedCities.value); + + if(checkedCities.value.length>0){ + let paams={ + checkIds:checkedCities.value.join(',') + } + let res = await dutyCheckResultBatchSave(paams); + if (res && res.code == 200) { + proxy.$modal.msgSuccess('操作成功'); + dutyCheckInfoGetCheckCountFun(); + visible.value = false; + } + } + } onMounted(() => { - gitDataFun() + gitDataFun(); + dutyCheckInfoGetCheckCountFun(); }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue index 140f6d4..3345c0f 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue @@ -15,8 +15,8 @@
污水泵站
-
{{sumObj.rainPumpNum}}
-
{{sumObj.sewagePumpNum}}
+
{{sumObj.rainPumpOpenNum}}/{{sumObj.rainPumpNum}}
+
{{sumObj.sewagePumpOpenNum}}/{{sumObj.sewagePumpNum}}
{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}
diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..690f489 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -470,4 +470,27 @@ params }); } -// ``````````EDN````````````````````` \ No newline at end of file +// 辅助决策 防汛检查 街道数据 +export function dutyCheckInfoGetCheckCount(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckCount', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选列表 +export function dutyCheckInfoGetCheckResultList(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckResultList', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选新增 +export function dutyCheckResultBatchSave(params){ + return request({ + url:'/business/dutyCheckResult/batchSave', + method: 'post', + params + }) +} \ No newline at end of file diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue index db6533a..41dc9dd 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue @@ -2,8 +2,7 @@
-
- +
- 警情建议 + 预警建议
{{yjtj?.recommendGrade}}
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue index e15387e..a900600 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue @@ -1,23 +1,48 @@ @@ -25,26 +50,80 @@ import { ref, reactive, onMounted } from 'vue'; import { drainageDispatchGetCheckCount, + dutyCheckInfoGetCheckCount, + dutyCheckInfoGetCheckResultList, + dutyCheckResultBatchSave, } from '@/api/FloodControlAndDrainage.js'; const { proxy } = getCurrentInstance(); -const loading=ref(false) -const listData=ref({ - -}) +const loading = ref(false); +const jiedaoData = ref({}); +const visible = ref(false); +const listData = ref({}); +const checkedCities = ref([]); +const cities = ref([]); function gitDataFun() { - loading.value=true - drainageDispatchGetCheckCount().then(res => { - console.log('获取防汛检查', res); - loading.value=false - if (res && res.code == 200) { - listData.value=res.data + loading.value = true; + drainageDispatchGetCheckCount().then( + res => { + console.log('获取防汛检查', res); + loading.value = false; + if (res && res.code == 200) { + listData.value = res.data; + } + }, + error => { + loading.value = false; } - },(error)=>{ - loading.value=false - }); + ); +} +// 街道应到操作 +const loadingjiedao = ref(false); +function jiedaoFun() { + loadingjiedao.value = true; + dutyCheckInfoGetCheckResultList().then( + res => { + console.log('获取街道数据', res); + loadingjiedao.value = false; + if (res && res.code == 200) { + cities.value = res.data.regionCheckList; + res.data.regionHasCheckList.map((e)=>{ + checkedCities.value.push(e.id) + }) + console.log('cities.value', cities.value); + visible.value = true; + } + }, + error => { + loadingjiedao.value = false; + } + ); +} +// 获取街道数据 +async function dutyCheckInfoGetCheckCountFun() { + let res = await dutyCheckInfoGetCheckCount(); + if (res && res.code == 200) { + jiedaoData.value = res.data; + } +} +async function confirmClick() { + console.log('checkedCities', checkedCities.value); + + if(checkedCities.value.length>0){ + let paams={ + checkIds:checkedCities.value.join(',') + } + let res = await dutyCheckResultBatchSave(paams); + if (res && res.code == 200) { + proxy.$modal.msgSuccess('操作成功'); + dutyCheckInfoGetCheckCountFun(); + visible.value = false; + } + } + } onMounted(() => { - gitDataFun() + gitDataFun(); + dutyCheckInfoGetCheckCountFun(); }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue index 140f6d4..3345c0f 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue @@ -15,8 +15,8 @@
污水泵站
-
{{sumObj.rainPumpNum}}
-
{{sumObj.sewagePumpNum}}
+
{{sumObj.rainPumpOpenNum}}/{{sumObj.rainPumpNum}}
+
{{sumObj.sewagePumpOpenNum}}/{{sumObj.sewagePumpNum}}
{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue index 836256c..c3dd54c 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue @@ -40,13 +40,13 @@ const activeTab = ref(''); const rightTabArr = ref([ { - label: '开始', + label: '气象云图', value: '0', }, - { - label: '暂停', - value: '1', - }, + // { + // label: '暂停', + // value: '1', + // }, ]); // 获取数据 const loading=ref(false) @@ -95,12 +95,24 @@ function rightTabClick(item){ ({ "0":()=>{ + console.log('00000'); newfiberMap.rainsLayer.show(); newfiberMap.rainsInterval = setInterval(()=> newfiberMap.rainsLayer.next(1),1000) + rightTabArr.value[0].value='1' + activeTab.value='1' }, "1":()=>{ + console.log('11111'); + // 暂停 + // newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval); + // newfiberMap.rainsInterval = null; + // 停止 newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval); - newfiberMap.rainsInterval = null; + newfiberMap.rainsLayer.hide(); + rightTabArr.value[0].value='0' + activeTab.value='3' + + }, }[item.value])(); } diff --git a/src/api/FloodControlAndDrainage.js b/src/api/FloodControlAndDrainage.js index 86078ff..690f489 100644 --- a/src/api/FloodControlAndDrainage.js +++ b/src/api/FloodControlAndDrainage.js @@ -470,4 +470,27 @@ params }); } -// ``````````EDN````````````````````` \ No newline at end of file +// 辅助决策 防汛检查 街道数据 +export function dutyCheckInfoGetCheckCount(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckCount', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选列表 +export function dutyCheckInfoGetCheckResultList(params) { + return request({ + url: '/business/dutyCheckInfo/getCheckResultList', + method: 'get', + params + }); +} +// 辅助决策 防汛检查 街道勾选新增 +export function dutyCheckResultBatchSave(params){ + return request({ + url:'/business/dutyCheckResult/batchSave', + method: 'post', + params + }) +} \ No newline at end of file diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue index db6533a..41dc9dd 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue @@ -2,8 +2,7 @@
-
- +
- 警情建议 + 预警建议
{{yjtj?.recommendGrade}}
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue index e15387e..a900600 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Fangxunjiancha.vue @@ -1,23 +1,48 @@ @@ -25,26 +50,80 @@ import { ref, reactive, onMounted } from 'vue'; import { drainageDispatchGetCheckCount, + dutyCheckInfoGetCheckCount, + dutyCheckInfoGetCheckResultList, + dutyCheckResultBatchSave, } from '@/api/FloodControlAndDrainage.js'; const { proxy } = getCurrentInstance(); -const loading=ref(false) -const listData=ref({ - -}) +const loading = ref(false); +const jiedaoData = ref({}); +const visible = ref(false); +const listData = ref({}); +const checkedCities = ref([]); +const cities = ref([]); function gitDataFun() { - loading.value=true - drainageDispatchGetCheckCount().then(res => { - console.log('获取防汛检查', res); - loading.value=false - if (res && res.code == 200) { - listData.value=res.data + loading.value = true; + drainageDispatchGetCheckCount().then( + res => { + console.log('获取防汛检查', res); + loading.value = false; + if (res && res.code == 200) { + listData.value = res.data; + } + }, + error => { + loading.value = false; } - },(error)=>{ - loading.value=false - }); + ); +} +// 街道应到操作 +const loadingjiedao = ref(false); +function jiedaoFun() { + loadingjiedao.value = true; + dutyCheckInfoGetCheckResultList().then( + res => { + console.log('获取街道数据', res); + loadingjiedao.value = false; + if (res && res.code == 200) { + cities.value = res.data.regionCheckList; + res.data.regionHasCheckList.map((e)=>{ + checkedCities.value.push(e.id) + }) + console.log('cities.value', cities.value); + visible.value = true; + } + }, + error => { + loadingjiedao.value = false; + } + ); +} +// 获取街道数据 +async function dutyCheckInfoGetCheckCountFun() { + let res = await dutyCheckInfoGetCheckCount(); + if (res && res.code == 200) { + jiedaoData.value = res.data; + } +} +async function confirmClick() { + console.log('checkedCities', checkedCities.value); + + if(checkedCities.value.length>0){ + let paams={ + checkIds:checkedCities.value.join(',') + } + let res = await dutyCheckResultBatchSave(paams); + if (res && res.code == 200) { + proxy.$modal.msgSuccess('操作成功'); + dutyCheckInfoGetCheckCountFun(); + visible.value = false; + } + } + } onMounted(() => { - gitDataFun() + gitDataFun(); + dutyCheckInfoGetCheckCountFun(); }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue index 140f6d4..3345c0f 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningLeft/component/Bzgq.vue @@ -15,8 +15,8 @@
污水泵站
-
{{sumObj.rainPumpNum}}
-
{{sumObj.sewagePumpNum}}
+
{{sumObj.rainPumpOpenNum}}/{{sumObj.rainPumpNum}}
+
{{sumObj.sewagePumpOpenNum}}/{{sumObj.sewagePumpNum}}
{{sumObj.openPumpMachineNum}}/{{sumObj.pumpMachineNum}}
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue index 836256c..c3dd54c 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Jianceyujin/MonitoringWarningRigh/component/RainfallForecast.vue @@ -40,13 +40,13 @@ const activeTab = ref(''); const rightTabArr = ref([ { - label: '开始', + label: '气象云图', value: '0', }, - { - label: '暂停', - value: '1', - }, + // { + // label: '暂停', + // value: '1', + // }, ]); // 获取数据 const loading=ref(false) @@ -95,12 +95,24 @@ function rightTabClick(item){ ({ "0":()=>{ + console.log('00000'); newfiberMap.rainsLayer.show(); newfiberMap.rainsInterval = setInterval(()=> newfiberMap.rainsLayer.next(1),1000) + rightTabArr.value[0].value='1' + activeTab.value='1' }, "1":()=>{ + console.log('11111'); + // 暂停 + // newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval); + // newfiberMap.rainsInterval = null; + // 停止 newfiberMap.rainsInterval && clearInterval(newfiberMap.rainsInterval); - newfiberMap.rainsInterval = null; + newfiberMap.rainsLayer.hide(); + rightTabArr.value[0].value='0' + activeTab.value='3' + + }, }[item.value])(); } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue index 58cddc8..86e9e0a 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/index.vue @@ -78,7 +78,7 @@ const activeSublevel = ref("Jianceyujin"); const tabArr = ref([ { - label: "监测预警", + label: "预报预警", value: "Jianceyujin", keys: [ { key: "waterlogging", visible: true },