diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index f8978e7..25081b6 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -228,7 +228,7 @@ export function getSectionByWellCodeDetail(params) { return request({ - url: `/business/pipelineInfo/getSectionByWellCode/wellCode`, + url: `/business/drainageMap/getSectionByWellCode/wellCode`, method: 'get', params }); diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index f8978e7..25081b6 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -228,7 +228,7 @@ export function getSectionByWellCodeDetail(params) { return request({ - url: `/business/pipelineInfo/getSectionByWellCode/wellCode`, + url: `/business/drainageMap/getSectionByWellCode/wellCode`, method: 'get', params }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index 95bc1e3..69002b7 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -282,7 +282,7 @@ weather: e, time: proxy.moment(hoursList.value.date[i]).format("H"), rain: hoursList.value.history[i], - chuse: false, + chuse: true, }; array.push(obj); }); diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index f8978e7..25081b6 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -228,7 +228,7 @@ export function getSectionByWellCodeDetail(params) { return request({ - url: `/business/pipelineInfo/getSectionByWellCode/wellCode`, + url: `/business/drainageMap/getSectionByWellCode/wellCode`, method: 'get', params }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index 95bc1e3..69002b7 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -282,7 +282,7 @@ weather: e, time: proxy.moment(hoursList.value.date[i]).format("H"), rain: hoursList.value.history[i], - chuse: false, + chuse: true, }; array.push(obj); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 9e4d878..127f9d1 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -66,6 +66,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "dxssrfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index f8978e7..25081b6 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -228,7 +228,7 @@ export function getSectionByWellCodeDetail(params) { return request({ - url: `/business/pipelineInfo/getSectionByWellCode/wellCode`, + url: `/business/drainageMap/getSectionByWellCode/wellCode`, method: 'get', params }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index 95bc1e3..69002b7 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -282,7 +282,7 @@ weather: e, time: proxy.moment(hoursList.value.date[i]).format("H"), rain: hoursList.value.history[i], - chuse: false, + chuse: true, }; array.push(obj); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 9e4d878..127f9d1 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -66,6 +66,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "dxssrfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue index 99df605..3306c40 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue @@ -68,6 +68,10 @@ JKSZ: 0, PFBZ: 0, }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -321,8 +325,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "szycfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -406,6 +410,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index f8978e7..25081b6 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -228,7 +228,7 @@ export function getSectionByWellCodeDetail(params) { return request({ - url: `/business/pipelineInfo/getSectionByWellCode/wellCode`, + url: `/business/drainageMap/getSectionByWellCode/wellCode`, method: 'get', params }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index 95bc1e3..69002b7 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -282,7 +282,7 @@ weather: e, time: proxy.moment(hoursList.value.date[i]).format("H"), rain: hoursList.value.history[i], - chuse: false, + chuse: true, }; array.push(obj); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 9e4d878..127f9d1 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -66,6 +66,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "dxssrfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue index 99df605..3306c40 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue @@ -68,6 +68,10 @@ JKSZ: 0, PFBZ: 0, }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -321,8 +325,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "szycfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -406,6 +410,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue index 19be6d7..1c52b08 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue @@ -67,6 +67,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -355,8 +359,8 @@ console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "wszrfxJCFX", @@ -390,7 +394,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index f8978e7..25081b6 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -228,7 +228,7 @@ export function getSectionByWellCodeDetail(params) { return request({ - url: `/business/pipelineInfo/getSectionByWellCode/wellCode`, + url: `/business/drainageMap/getSectionByWellCode/wellCode`, method: 'get', params }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index 95bc1e3..69002b7 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -282,7 +282,7 @@ weather: e, time: proxy.moment(hoursList.value.date[i]).format("H"), rain: hoursList.value.history[i], - chuse: false, + chuse: true, }; array.push(obj); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 9e4d878..127f9d1 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -66,6 +66,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "dxssrfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue index 99df605..3306c40 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue @@ -68,6 +68,10 @@ JKSZ: 0, PFBZ: 0, }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -321,8 +325,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "szycfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -406,6 +410,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue index 19be6d7..1c52b08 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue @@ -67,6 +67,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -355,8 +359,8 @@ console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "wszrfxJCFX", @@ -390,7 +394,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue index af8ca24..9b4b37d 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue @@ -65,6 +65,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -279,8 +283,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -304,8 +308,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, @@ -340,7 +344,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -357,6 +361,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index f8978e7..25081b6 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -228,7 +228,7 @@ export function getSectionByWellCodeDetail(params) { return request({ - url: `/business/pipelineInfo/getSectionByWellCode/wellCode`, + url: `/business/drainageMap/getSectionByWellCode/wellCode`, method: 'get', params }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index 95bc1e3..69002b7 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -282,7 +282,7 @@ weather: e, time: proxy.moment(hoursList.value.date[i]).format("H"), rain: hoursList.value.history[i], - chuse: false, + chuse: true, }; array.push(obj); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 9e4d878..127f9d1 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -66,6 +66,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "dxssrfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue index 99df605..3306c40 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue @@ -68,6 +68,10 @@ JKSZ: 0, PFBZ: 0, }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -321,8 +325,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "szycfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -406,6 +410,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue index 19be6d7..1c52b08 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue @@ -67,6 +67,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -355,8 +359,8 @@ console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "wszrfxJCFX", @@ -390,7 +394,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue index af8ca24..9b4b37d 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue @@ -65,6 +65,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -279,8 +283,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -304,8 +308,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, @@ -340,7 +344,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -357,6 +361,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue index c585137..812f1c4 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue @@ -78,6 +78,10 @@ MGSW: 0, GSW: 0, }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -253,7 +257,7 @@ label: { show: true, // formatter: "满管水位" + props.data.yAxis6_YJ, - formatter: "满管水位:" + AllData.MGSW, + formatter: "溢流风险:" + AllData.MGSW, color: "red", fontSize: 12, position: "middle", @@ -291,8 +295,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -302,7 +306,7 @@ // debugger; AllData.yAxis3 = element.datas; element.cordonLineList.forEach((element) => { - if (element.lineName == "满管水位") { + if (element.lineName == "满管水位" || "溢流风险") { AllData.MGSW = Number(element.lineValue); } if (element.lineName == "高水位") { @@ -366,6 +370,9 @@ } onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); gitDataFun(); window.addEventListener("resize", resizeTheChart); diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js index f8978e7..25081b6 100644 --- a/src/api/MonitorAssetsOnMap.js +++ b/src/api/MonitorAssetsOnMap.js @@ -228,7 +228,7 @@ export function getSectionByWellCodeDetail(params) { return request({ - url: `/business/pipelineInfo/getSectionByWellCode/wellCode`, + url: `/business/drainageMap/getSectionByWellCode/wellCode`, method: 'get', params }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue index 95bc1e3..69002b7 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaohuigu/index.vue @@ -282,7 +282,7 @@ weather: e, time: proxy.moment(hoursList.value.date[i]).format("H"), rain: hoursList.value.history[i], - chuse: false, + chuse: true, }; array.push(obj); }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue index 9e4d878..127f9d1 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/dxssrfxJCFX.vue @@ -66,6 +66,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "dxssrfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue index 99df605..3306c40 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/szycfxJCFX.vue @@ -68,6 +68,10 @@ JKSZ: 0, PFBZ: 0, }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -321,8 +325,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +358,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "szycfxJCFX", @@ -389,7 +393,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -406,6 +410,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue index 19be6d7..1c52b08 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/wszrfxJCFX.vue @@ -67,6 +67,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +330,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -355,8 +359,8 @@ console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, menuType: "wszrfxJCFX", @@ -390,7 +394,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -407,6 +411,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue index af8ca24..9b4b37d 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ydfxfxJCFX.vue @@ -65,6 +65,10 @@ WTRQ: "", TQ: "", }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -279,8 +283,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -304,8 +308,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers.value[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, @@ -340,7 +344,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -357,6 +361,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); getFenXiData(); getWatherData(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue index c585137..812f1c4 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/ylfxJCFX.vue @@ -78,6 +78,10 @@ MGSW: 0, GSW: 0, }); +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -253,7 +257,7 @@ label: { show: true, // formatter: "满管水位" + props.data.yAxis6_YJ, - formatter: "满管水位:" + AllData.MGSW, + formatter: "溢流风险:" + AllData.MGSW, color: "red", fontSize: 12, position: "middle", @@ -291,8 +295,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -302,7 +306,7 @@ // debugger; AllData.yAxis3 = element.datas; element.cordonLineList.forEach((element) => { - if (element.lineName == "满管水位") { + if (element.lineName == "满管水位" || "溢流风险") { AllData.MGSW = Number(element.lineValue); } if (element.lineName == "高水位") { @@ -366,6 +370,9 @@ } onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getChartsData(); gitDataFun(); window.addEventListener("resize", resizeTheChart); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue index 03f8d6a..c9aae19 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/yszrfxJCFX.vue @@ -67,6 +67,11 @@ WTRQ: "", TQ: "", }); + +const Timers = ref([ + moment().subtract(3, "day").format("YYYY-MM-DD HH:mm:ss"), + moment().format("YYYY-MM-DD HH:mm:ss"), +]); const init = () => { //先获取Dom上的实例 let chartDom = echarts.getInstanceByDom(document.getElementById("HeaderEcharts")); @@ -326,8 +331,8 @@ stType: props.Getproperties.stType, stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, - start: props.Getproperties.daterange[0], - end: props.Getproperties.daterange[1], + start: Timers.value[0], + end: Timers.value[1], }).then((res) => { if (res && res.code == 200) { AllData.xAxis = res.data.times; @@ -354,8 +359,8 @@ const getFenXiData = () => { console.log(props); riskAnalysisReason({ - startTime: props.Getproperties.daterange[0], - endTime: props.Getproperties.daterange[1], + startTime: Timers.value[0], + endTime: Timers[1], stCode: props.Getproperties.stCode, dataCode: props.Getproperties.dataCode, @@ -390,7 +395,7 @@ }); }; const getWatherData = () => { - AllData.WTRQ = moment(props.Getproperties.daterange[0]).format("YYYY-MM-DD"); + AllData.WTRQ = moment(Timers.value[0]).format("YYYY-MM-DD"); rainCalendar({ queryTime: AllData.WTRQ, }).then((res) => { @@ -407,6 +412,9 @@ }; onMounted(() => { nextTick(() => { + if (props.Getproperties.daterange) { + Timers.value = props.Getproperties.daterange; + } getFenXiData(); getChartsData(); getWatherData();