diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js index f8ebcec..4f07c98 100644 --- a/src/api/MonitoringAnalysis.js +++ b/src/api/MonitoringAnalysis.js @@ -59,14 +59,42 @@ // 获取列表数据 export function pipelineProblemStatistic(params) { return request({ - url: `business/drainageSystem/pipelineProblemStatistic`, + url: `business/drainageSystemv1/pipelineProblemStatistic`, method: 'get', params, }); } export function pipelineRunRiskStatistic(params) { return request({ - url: `business/drainageSystem/pipelineRunRiskStatistic`, + url: `business/drainageSystemv1/pipelineRunRiskStatistic`, + method: 'get', + params, + }); +} +export function outletList(params) { + return request({ + url: `business/drainageSystem/outletList`, + method: 'get', + params, + }); +} +export function pointList(params) { + return request({ + url: `business/drainageSystem/pointList`, + method: 'get', + params, + }); +} +export function siteWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/siteWaterYieldAnalysis`, + method: 'get', + params, + }); +} +export function waterRegionWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/waterRegionWaterYieldAnalysis`, method: 'get', params, }); diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js index f8ebcec..4f07c98 100644 --- a/src/api/MonitoringAnalysis.js +++ b/src/api/MonitoringAnalysis.js @@ -59,14 +59,42 @@ // 获取列表数据 export function pipelineProblemStatistic(params) { return request({ - url: `business/drainageSystem/pipelineProblemStatistic`, + url: `business/drainageSystemv1/pipelineProblemStatistic`, method: 'get', params, }); } export function pipelineRunRiskStatistic(params) { return request({ - url: `business/drainageSystem/pipelineRunRiskStatistic`, + url: `business/drainageSystemv1/pipelineRunRiskStatistic`, + method: 'get', + params, + }); +} +export function outletList(params) { + return request({ + url: `business/drainageSystem/outletList`, + method: 'get', + params, + }); +} +export function pointList(params) { + return request({ + url: `business/drainageSystem/pointList`, + method: 'get', + params, + }); +} +export function siteWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/siteWaterYieldAnalysis`, + method: 'get', + params, + }); +} +export function waterRegionWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/waterRegionWaterYieldAnalysis`, method: 'get', params, }); diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue new file mode 100644 index 0000000..45e5aee --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -0,0 +1,832 @@ + + + + + diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js index f8ebcec..4f07c98 100644 --- a/src/api/MonitoringAnalysis.js +++ b/src/api/MonitoringAnalysis.js @@ -59,14 +59,42 @@ // 获取列表数据 export function pipelineProblemStatistic(params) { return request({ - url: `business/drainageSystem/pipelineProblemStatistic`, + url: `business/drainageSystemv1/pipelineProblemStatistic`, method: 'get', params, }); } export function pipelineRunRiskStatistic(params) { return request({ - url: `business/drainageSystem/pipelineRunRiskStatistic`, + url: `business/drainageSystemv1/pipelineRunRiskStatistic`, + method: 'get', + params, + }); +} +export function outletList(params) { + return request({ + url: `business/drainageSystem/outletList`, + method: 'get', + params, + }); +} +export function pointList(params) { + return request({ + url: `business/drainageSystem/pointList`, + method: 'get', + params, + }); +} +export function siteWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/siteWaterYieldAnalysis`, + method: 'get', + params, + }); +} +export function waterRegionWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/waterRegionWaterYieldAnalysis`, method: 'get', params, }); diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue new file mode 100644 index 0000000..45e5aee --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -0,0 +1,832 @@ + + + + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue new file mode 100644 index 0000000..ee4ce2c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue @@ -0,0 +1,395 @@ + + diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js index f8ebcec..4f07c98 100644 --- a/src/api/MonitoringAnalysis.js +++ b/src/api/MonitoringAnalysis.js @@ -59,14 +59,42 @@ // 获取列表数据 export function pipelineProblemStatistic(params) { return request({ - url: `business/drainageSystem/pipelineProblemStatistic`, + url: `business/drainageSystemv1/pipelineProblemStatistic`, method: 'get', params, }); } export function pipelineRunRiskStatistic(params) { return request({ - url: `business/drainageSystem/pipelineRunRiskStatistic`, + url: `business/drainageSystemv1/pipelineRunRiskStatistic`, + method: 'get', + params, + }); +} +export function outletList(params) { + return request({ + url: `business/drainageSystem/outletList`, + method: 'get', + params, + }); +} +export function pointList(params) { + return request({ + url: `business/drainageSystem/pointList`, + method: 'get', + params, + }); +} +export function siteWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/siteWaterYieldAnalysis`, + method: 'get', + params, + }); +} +export function waterRegionWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/waterRegionWaterYieldAnalysis`, method: 'get', params, }); diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue new file mode 100644 index 0000000..45e5aee --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -0,0 +1,832 @@ + + + + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue new file mode 100644 index 0000000..ee4ce2c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue @@ -0,0 +1,395 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue new file mode 100644 index 0000000..9c5906c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue @@ -0,0 +1,211 @@ + + diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js index f8ebcec..4f07c98 100644 --- a/src/api/MonitoringAnalysis.js +++ b/src/api/MonitoringAnalysis.js @@ -59,14 +59,42 @@ // 获取列表数据 export function pipelineProblemStatistic(params) { return request({ - url: `business/drainageSystem/pipelineProblemStatistic`, + url: `business/drainageSystemv1/pipelineProblemStatistic`, method: 'get', params, }); } export function pipelineRunRiskStatistic(params) { return request({ - url: `business/drainageSystem/pipelineRunRiskStatistic`, + url: `business/drainageSystemv1/pipelineRunRiskStatistic`, + method: 'get', + params, + }); +} +export function outletList(params) { + return request({ + url: `business/drainageSystem/outletList`, + method: 'get', + params, + }); +} +export function pointList(params) { + return request({ + url: `business/drainageSystem/pointList`, + method: 'get', + params, + }); +} +export function siteWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/siteWaterYieldAnalysis`, + method: 'get', + params, + }); +} +export function waterRegionWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/waterRegionWaterYieldAnalysis`, method: 'get', params, }); diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue new file mode 100644 index 0000000..45e5aee --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -0,0 +1,832 @@ + + + + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue new file mode 100644 index 0000000..ee4ce2c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue @@ -0,0 +1,395 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue new file mode 100644 index 0000000..9c5906c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue @@ -0,0 +1,211 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue new file mode 100644 index 0000000..a721a90 --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue @@ -0,0 +1,230 @@ + + diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js index f8ebcec..4f07c98 100644 --- a/src/api/MonitoringAnalysis.js +++ b/src/api/MonitoringAnalysis.js @@ -59,14 +59,42 @@ // 获取列表数据 export function pipelineProblemStatistic(params) { return request({ - url: `business/drainageSystem/pipelineProblemStatistic`, + url: `business/drainageSystemv1/pipelineProblemStatistic`, method: 'get', params, }); } export function pipelineRunRiskStatistic(params) { return request({ - url: `business/drainageSystem/pipelineRunRiskStatistic`, + url: `business/drainageSystemv1/pipelineRunRiskStatistic`, + method: 'get', + params, + }); +} +export function outletList(params) { + return request({ + url: `business/drainageSystem/outletList`, + method: 'get', + params, + }); +} +export function pointList(params) { + return request({ + url: `business/drainageSystem/pointList`, + method: 'get', + params, + }); +} +export function siteWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/siteWaterYieldAnalysis`, + method: 'get', + params, + }); +} +export function waterRegionWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/waterRegionWaterYieldAnalysis`, method: 'get', params, }); diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue new file mode 100644 index 0000000..45e5aee --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -0,0 +1,832 @@ + + + + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue new file mode 100644 index 0000000..ee4ce2c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue @@ -0,0 +1,395 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue new file mode 100644 index 0000000..9c5906c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue @@ -0,0 +1,211 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue new file mode 100644 index 0000000..a721a90 --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue @@ -0,0 +1,230 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue index c6cddf6..a6c024c 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/index.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue @@ -12,92 +12,7 @@ {{ item.name }} - - -
- -
- - - {{ item.grade != "one" ? "/" : "" }} - {{ item.abbreviation ? item.abbreviation : "" }} - -
-
-
河湖水情
-
- -
-
-
-
流域管网
-
- -
-
-
-
河湖排口
-
- -
-
- -
- -
- - - {{ item.grade != "one" ? "/" : "" }} - {{ item.abbreviation ? item.abbreviation : "" }} - -
-
- -
-
-
水量分析
-
-
-
-
管网本底
-
-
+ @@ -120,10 +35,11 @@ showPanel.value = val; }; +======= +import { ref, reactive, toRefs, onMounted } from "vue"; +import YSIndex from "./YSIndex.vue"; +>>>>>>> e667c948d24ce7ebd6d93760b5f869c8372212a5 const AllData = reactive({ - regionGrade: "one", //分区级别（one：一级 || two：二级 || three：三级 || four：四级） - regionName: "", //分区名称 - RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 yw_type: [ { name: "污水体系", key: "sewage", values: [ @@ -142,371 +58,11 @@ ] }, ], - TitleName: [ - { - abbreviation: "一级分区", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "one", //分区层级-静态(查询数据用) - sort: 0, //面包屑的顺序 - Name: "", //全称 - }, - { - abbreviation: "", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "two", //分区层级-静态 - sort: 1, //面包屑的顺序 - Name: "", //全称 - }, - { - abbreviation: "", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "three", //分区层级-静态 - sort: 2, //面包屑的顺序 - Name: "", //全称 - }, - { - abbreviation: "", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "four", //分区层级-静态 - sort: 3, //面包屑的顺序 - Name: "", //全称 - }, - { - abbreviation: "", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "five", //分区层级-静态 - sort: 4, //面包屑的顺序 - Name: "", //全称 - }, - ], - // Ecahrts数据 - // 河湖水情 - chartData1: { - // xAxis: [], - // yAxis: [], - // yAxis_Name: "", - // yAxis2: [], - // yAxis2_Name: "", - // yAxis3_line: [], - // yAxis3_line_Name: "", - // yAxis4_line: null, - // yAxis4_line_Name: "", - xAxis: ["王家店", "花山", "龙王咀", "左岭", "豹澥", "汤逊湖"], - yAxis: ["870", "568", "700", "600", "276", "280"], - yAxis_Name: "复勘数", - yAxis2: ["1870", "1568", "1700", "1600", "1276", "1276"], - yAxis2_Name: "片区管网", - yAxis3_line: ["1000", "600", "680", "520", "160", "180"], - yAxis3_line_Name: "报告数", - yAxis4_line: null, - yAxis4_line_Name: "", - }, - refresh1: 0, - ClickData1: "dgtxg", - // 流域管网 - chartData2: { - xAxis: [], - yAxis: [], - yAxis2: [], - yAxis_Name: "", - yAxis2_Name: "", - }, - refresh2: 0, - ClickData2: "dgtxg", - // 河湖排口 - chartData3: { - xAxis: [], - yAxis: [], - yAxis_Name: "", - yAxis2: [], - yAxis2_Name: "", - yAxis3_line: [], - yAxis3_line_Name: "", - yAxis4_line: null, - yAxis4_line_Name: "", - }, - refresh3: 0, - ClickData3: "dgtxg", }); -// 面包屑点击事件 -const MBClick = (item) => { - console.log(item); - // 赋值需要进行echarts数据请求的数据 - AllData.regionGrade = item.grade; - AllData.regionName = item.Name; - // 视角切换 - if (item.sort == 0) { - // 回到默认图层 - newfiberMap.map.easeTo(newfiberMap.config_.params.init); - AllData.regionGrade = "one"; - AllData.regionName = ""; - AllData.TitleName[1] = { - abbreviation: "", - Name: "", - id: "", - grade: "two", - sort: 1, - }; - AllData.TitleName[2] = { - abbreviation: "", - Name: "", - id: "", - grade: "three", - sort: 2, - }; - AllData.TitleName[3] = { - abbreviation: "", - Name: "", - id: "", - grade: "four", - sort: 3, - }; - AllData.TitleName[4] = { - abbreviation: "", - Name: "", - id: "", - grade: "five", - sort: 4, - }; - } - if (item.sort == 1) { - bus.emit("panelDataToMap", { - name: item.abbreviation, - id: item.id, - }); - AllData.TitleName[2] = { - abbreviation: "", - Name: "", - id: "", - grade: "three", - sort: 2, - }; - AllData.TitleName[3] = { - abbreviation: "", - Name: "", - id: "", - grade: "four", - sort: 3, - }; - AllData.TitleName[4] = { - abbreviation: "", - Name: "", - id: "", - grade: "five", - sort: 4, - }; - } - if (item.sort == 2) { - bus.emit("panelDataToMap", { - name: item.abbreviation, - id: item.id, - }); - AllData.TitleName[3] = { - abbreviation: "", - Name: "", - id: "", - grade: "four", - sort: 3, - }; - AllData.TitleName[4] = { - abbreviation: "", - Name: "", - id: "", - grade: "five", - sort: 4, - }; - } - if (item.sort == 3) { - bus.emit("panelDataToMap", { - name: item.abbreviation, - id: item.id, - }); - AllData.TitleName[4] = { - abbreviation: "", - Name: "", - id: "", - grade: "five", - sort: 4, - }; - } - // 切换时进行数据请求,默认视角请求 - - getData1(); -}; -// 分区点击切换 -const FenQuClick = (properties) => { - console.log("FenQuClick", properties); - if (!!!properties.pid) return; - // 请求面包屑的数据 - let params = { - regionType: AllData.TypeID, - id: Number(properties.pid), - }; - MonitorAPI.lineGrade(params).then((res) => { - if (res && res.code == 200) { - // 默认设置基础的分区 - if (AllData.TypeID == "sewage") { - // 污水 - AllData.TitleName[0].abbreviation = "一级分区"; - AllData.TitleName[0].id = ""; //分区信息-动态 - AllData.TitleName[0].grade = "one"; //分区层级-静态 - AllData.TitleName[0].sort = 0; //面包屑的顺序 - AllData.TitleName[0].Name = ""; //全称 - } else { - // 雨水 - AllData.TitleName[0].abbreviation = "一级流域"; - AllData.TitleName[0].id = ""; //分区信息-动态 - AllData.TitleName[0].grade = "one"; //分区层级-静态 - AllData.TitleName[0].sort = 0; //面包屑的顺序 - AllData.TitleName[0].Name = ""; //全称 - } - // 设置1 2 3 4 级分区 - - clearMianBaoData(); - // if (res.data.length == 1) { - // // 只有总分区/一级分区 - // res.data.forEach((element) => { - // if (element.grade == "one") { - // AllData.TitleName[1] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "two", - // sort: 1, - // Name: element.name, - // }; - // } - // }); - // } else if (res.data.length == 2) { - // // 只有总分区/一级分区/二级分区 - - // res.data.forEach((element) => { - // if (element.grade == "one") { - // AllData.TitleName[1] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "two", - // sort: 1, - // Name: element.name, - // }; - // } - // if (element.grade == "two") { - // AllData.TitleName[2] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "three", - // sort: 2, - // Name: element.name, - // }; - // } - // }); - // } else if (res.data.length == 3) { - // // 只有总分区/一级分区/二级分区/三级分区 - - // res.data.forEach((element) => { - // if (element.grade == "one") { - // AllData.TitleName[1] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "two", - // sort: 1, - // Name: element.name, - // }; - // } - // if (element.grade == "two") { - // AllData.TitleName[2] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "three", - // sort: 2, - // Name: element.name, - // }; - // } - // if (element.grade == "three") { - // AllData.TitleName[3] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "four", - // sort: 3, - // Name: element.name, - // }; - // } - // }); - // } else if (res.data.length == 4) { - // // 只有总分区/一级分区/二级分区/三级分区/四级分区 - res.data.forEach((element) => { - if (element.grade == "one") { - AllData.TitleName[1] = { - abbreviation: element.shortName, - id: element.id, - grade: "two", - sort: 1, - Name: element.name, - }; - } - if (element.grade == "two") { - AllData.TitleName[2] = { - abbreviation: element.shortName, - id: element.id, - grade: "three", - sort: 2, - Name: element.name, - }; - } - if (element.grade == "three") { - AllData.TitleName[3] = { - abbreviation: element.shortName, - id: element.id, - grade: "four", - sort: 3, - Name: element.name, - }; - } - if (element.grade == "four") { - AllData.TitleName[4] = { - abbreviation: element.shortName, - id: element.id, - grade: "five", - sort: 4, - Name: element.name, - }; - } - }); - // } - // 赋值需要进行echarts数据请求的数据 - AllData.regionGrade = - res.data.length == 1 - ? "two" - : res.data.length == 2 - ? "three" - : res.data.length == 3 - ? "four" - : "five"; //分区级别（one：一级 || two：二级 || three：三级 || four：四级） - AllData.regionName = AllData.TitleName[res.data.length].Name; - if (AllData.regionGrade == "two") { - // 二级 - console.log("二级"); - getData1(); - getData2(); - } else if (AllData.regionGrade == "three") { - // 三级 - console.log("三级"); - getData1(); - } else if (AllData.regionGrade == "four") { - // 四级 - console.log("四级"); - getData2(); - } else { - // 五级 五级为排水单元,由上可知,因为没有pid 所以此方法无效 - console.log("五级"); - } - } - }); -}; const TypeClick = (item) => { let type = item.key; TypeClick_(); - item.value.split(",").forEach((o) => operationLayer(o, true)); AllData.regionGrade = "one"; AllData.regionName = ""; newfiberMap.map.easeTo(newfiberMap.config_.params.init); @@ -638,6 +194,14 @@ bus.off(mapInitBusName); closeAllLayer(); }); +======= + AllData.TypeID = item.key; +}; + +onMounted(() => {}); + +onBeforeUnmount(() => {}); +>>>>>>> e667c948d24ce7ebd6d93760b5f869c8372212a5 diff --git a/src/api/MonitoringAnalysis.js b/src/api/MonitoringAnalysis.js index f8ebcec..4f07c98 100644 --- a/src/api/MonitoringAnalysis.js +++ b/src/api/MonitoringAnalysis.js @@ -59,14 +59,42 @@ // 获取列表数据 export function pipelineProblemStatistic(params) { return request({ - url: `business/drainageSystem/pipelineProblemStatistic`, + url: `business/drainageSystemv1/pipelineProblemStatistic`, method: 'get', params, }); } export function pipelineRunRiskStatistic(params) { return request({ - url: `business/drainageSystem/pipelineRunRiskStatistic`, + url: `business/drainageSystemv1/pipelineRunRiskStatistic`, + method: 'get', + params, + }); +} +export function outletList(params) { + return request({ + url: `business/drainageSystem/outletList`, + method: 'get', + params, + }); +} +export function pointList(params) { + return request({ + url: `business/drainageSystem/pointList`, + method: 'get', + params, + }); +} +export function siteWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/siteWaterYieldAnalysis`, + method: 'get', + params, + }); +} +export function waterRegionWaterYieldAnalysis(params) { + return request({ + url: `business/monitorData/waterRegionWaterYieldAnalysis`, method: 'get', params, }); diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue new file mode 100644 index 0000000..45e5aee --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -0,0 +1,832 @@ + + + + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue new file mode 100644 index 0000000..ee4ce2c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarCharts2Y.vue @@ -0,0 +1,395 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue new file mode 100644 index 0000000..9c5906c --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraBarChartsLeft.vue @@ -0,0 +1,211 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue b/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue new file mode 100644 index 0000000..a721a90 --- /dev/null +++ b/src/views/pictureOnMap/page/DrainageSystem/components/DraLineChartsLeft.vue @@ -0,0 +1,230 @@ + + diff --git a/src/views/pictureOnMap/page/DrainageSystem/index.vue b/src/views/pictureOnMap/page/DrainageSystem/index.vue index c6cddf6..a6c024c 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/index.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/index.vue @@ -12,92 +12,7 @@ {{ item.name }} - - -
- -
- - - {{ item.grade != "one" ? "/" : "" }} - {{ item.abbreviation ? item.abbreviation : "" }} - -
-
-
河湖水情
-
- -
-
-
-
流域管网
-
- -
-
-
-
河湖排口
-
- -
-
- -
- -
- - - {{ item.grade != "one" ? "/" : "" }} - {{ item.abbreviation ? item.abbreviation : "" }} - -
-
- -
-
-
水量分析
-
-
-
-
管网本底
-
-
+ @@ -120,10 +35,11 @@ showPanel.value = val; }; +======= +import { ref, reactive, toRefs, onMounted } from "vue"; +import YSIndex from "./YSIndex.vue"; +>>>>>>> e667c948d24ce7ebd6d93760b5f869c8372212a5 const AllData = reactive({ - regionGrade: "one", //分区级别（one：一级 || two：二级 || three：三级 || four：四级） - regionName: "", //分区名称 - RightShow: false, //右侧面板是否显示--基于是否选择站点进行判断 yw_type: [ { name: "污水体系", key: "sewage", values: [ @@ -142,371 +58,11 @@ ] }, ], - TitleName: [ - { - abbreviation: "一级分区", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "one", //分区层级-静态(查询数据用) - sort: 0, //面包屑的顺序 - Name: "", //全称 - }, - { - abbreviation: "", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "two", //分区层级-静态 - sort: 1, //面包屑的顺序 - Name: "", //全称 - }, - { - abbreviation: "", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "three", //分区层级-静态 - sort: 2, //面包屑的顺序 - Name: "", //全称 - }, - { - abbreviation: "", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "four", //分区层级-静态 - sort: 3, //面包屑的顺序 - Name: "", //全称 - }, - { - abbreviation: "", //分区缩写-动态 - id: "", //分区信息-动态 - grade: "five", //分区层级-静态 - sort: 4, //面包屑的顺序 - Name: "", //全称 - }, - ], - // Ecahrts数据 - // 河湖水情 - chartData1: { - // xAxis: [], - // yAxis: [], - // yAxis_Name: "", - // yAxis2: [], - // yAxis2_Name: "", - // yAxis3_line: [], - // yAxis3_line_Name: "", - // yAxis4_line: null, - // yAxis4_line_Name: "", - xAxis: ["王家店", "花山", "龙王咀", "左岭", "豹澥", "汤逊湖"], - yAxis: ["870", "568", "700", "600", "276", "280"], - yAxis_Name: "复勘数", - yAxis2: ["1870", "1568", "1700", "1600", "1276", "1276"], - yAxis2_Name: "片区管网", - yAxis3_line: ["1000", "600", "680", "520", "160", "180"], - yAxis3_line_Name: "报告数", - yAxis4_line: null, - yAxis4_line_Name: "", - }, - refresh1: 0, - ClickData1: "dgtxg", - // 流域管网 - chartData2: { - xAxis: [], - yAxis: [], - yAxis2: [], - yAxis_Name: "", - yAxis2_Name: "", - }, - refresh2: 0, - ClickData2: "dgtxg", - // 河湖排口 - chartData3: { - xAxis: [], - yAxis: [], - yAxis_Name: "", - yAxis2: [], - yAxis2_Name: "", - yAxis3_line: [], - yAxis3_line_Name: "", - yAxis4_line: null, - yAxis4_line_Name: "", - }, - refresh3: 0, - ClickData3: "dgtxg", }); -// 面包屑点击事件 -const MBClick = (item) => { - console.log(item); - // 赋值需要进行echarts数据请求的数据 - AllData.regionGrade = item.grade; - AllData.regionName = item.Name; - // 视角切换 - if (item.sort == 0) { - // 回到默认图层 - newfiberMap.map.easeTo(newfiberMap.config_.params.init); - AllData.regionGrade = "one"; - AllData.regionName = ""; - AllData.TitleName[1] = { - abbreviation: "", - Name: "", - id: "", - grade: "two", - sort: 1, - }; - AllData.TitleName[2] = { - abbreviation: "", - Name: "", - id: "", - grade: "three", - sort: 2, - }; - AllData.TitleName[3] = { - abbreviation: "", - Name: "", - id: "", - grade: "four", - sort: 3, - }; - AllData.TitleName[4] = { - abbreviation: "", - Name: "", - id: "", - grade: "five", - sort: 4, - }; - } - if (item.sort == 1) { - bus.emit("panelDataToMap", { - name: item.abbreviation, - id: item.id, - }); - AllData.TitleName[2] = { - abbreviation: "", - Name: "", - id: "", - grade: "three", - sort: 2, - }; - AllData.TitleName[3] = { - abbreviation: "", - Name: "", - id: "", - grade: "four", - sort: 3, - }; - AllData.TitleName[4] = { - abbreviation: "", - Name: "", - id: "", - grade: "five", - sort: 4, - }; - } - if (item.sort == 2) { - bus.emit("panelDataToMap", { - name: item.abbreviation, - id: item.id, - }); - AllData.TitleName[3] = { - abbreviation: "", - Name: "", - id: "", - grade: "four", - sort: 3, - }; - AllData.TitleName[4] = { - abbreviation: "", - Name: "", - id: "", - grade: "five", - sort: 4, - }; - } - if (item.sort == 3) { - bus.emit("panelDataToMap", { - name: item.abbreviation, - id: item.id, - }); - AllData.TitleName[4] = { - abbreviation: "", - Name: "", - id: "", - grade: "five", - sort: 4, - }; - } - // 切换时进行数据请求,默认视角请求 - - getData1(); -}; -// 分区点击切换 -const FenQuClick = (properties) => { - console.log("FenQuClick", properties); - if (!!!properties.pid) return; - // 请求面包屑的数据 - let params = { - regionType: AllData.TypeID, - id: Number(properties.pid), - }; - MonitorAPI.lineGrade(params).then((res) => { - if (res && res.code == 200) { - // 默认设置基础的分区 - if (AllData.TypeID == "sewage") { - // 污水 - AllData.TitleName[0].abbreviation = "一级分区"; - AllData.TitleName[0].id = ""; //分区信息-动态 - AllData.TitleName[0].grade = "one"; //分区层级-静态 - AllData.TitleName[0].sort = 0; //面包屑的顺序 - AllData.TitleName[0].Name = ""; //全称 - } else { - // 雨水 - AllData.TitleName[0].abbreviation = "一级流域"; - AllData.TitleName[0].id = ""; //分区信息-动态 - AllData.TitleName[0].grade = "one"; //分区层级-静态 - AllData.TitleName[0].sort = 0; //面包屑的顺序 - AllData.TitleName[0].Name = ""; //全称 - } - // 设置1 2 3 4 级分区 - - clearMianBaoData(); - // if (res.data.length == 1) { - // // 只有总分区/一级分区 - // res.data.forEach((element) => { - // if (element.grade == "one") { - // AllData.TitleName[1] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "two", - // sort: 1, - // Name: element.name, - // }; - // } - // }); - // } else if (res.data.length == 2) { - // // 只有总分区/一级分区/二级分区 - - // res.data.forEach((element) => { - // if (element.grade == "one") { - // AllData.TitleName[1] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "two", - // sort: 1, - // Name: element.name, - // }; - // } - // if (element.grade == "two") { - // AllData.TitleName[2] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "three", - // sort: 2, - // Name: element.name, - // }; - // } - // }); - // } else if (res.data.length == 3) { - // // 只有总分区/一级分区/二级分区/三级分区 - - // res.data.forEach((element) => { - // if (element.grade == "one") { - // AllData.TitleName[1] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "two", - // sort: 1, - // Name: element.name, - // }; - // } - // if (element.grade == "two") { - // AllData.TitleName[2] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "three", - // sort: 2, - // Name: element.name, - // }; - // } - // if (element.grade == "three") { - // AllData.TitleName[3] = { - // abbreviation: element.shortName, - // id: element.id, - // grade: "four", - // sort: 3, - // Name: element.name, - // }; - // } - // }); - // } else if (res.data.length == 4) { - // // 只有总分区/一级分区/二级分区/三级分区/四级分区 - res.data.forEach((element) => { - if (element.grade == "one") { - AllData.TitleName[1] = { - abbreviation: element.shortName, - id: element.id, - grade: "two", - sort: 1, - Name: element.name, - }; - } - if (element.grade == "two") { - AllData.TitleName[2] = { - abbreviation: element.shortName, - id: element.id, - grade: "three", - sort: 2, - Name: element.name, - }; - } - if (element.grade == "three") { - AllData.TitleName[3] = { - abbreviation: element.shortName, - id: element.id, - grade: "four", - sort: 3, - Name: element.name, - }; - } - if (element.grade == "four") { - AllData.TitleName[4] = { - abbreviation: element.shortName, - id: element.id, - grade: "five", - sort: 4, - Name: element.name, - }; - } - }); - // } - // 赋值需要进行echarts数据请求的数据 - AllData.regionGrade = - res.data.length == 1 - ? "two" - : res.data.length == 2 - ? "three" - : res.data.length == 3 - ? "four" - : "five"; //分区级别（one：一级 || two：二级 || three：三级 || four：四级） - AllData.regionName = AllData.TitleName[res.data.length].Name; - if (AllData.regionGrade == "two") { - // 二级 - console.log("二级"); - getData1(); - getData2(); - } else if (AllData.regionGrade == "three") { - // 三级 - console.log("三级"); - getData1(); - } else if (AllData.regionGrade == "four") { - // 四级 - console.log("四级"); - getData2(); - } else { - // 五级 五级为排水单元,由上可知,因为没有pid 所以此方法无效 - console.log("五级"); - } - } - }); -}; const TypeClick = (item) => { let type = item.key; TypeClick_(); - item.value.split(",").forEach((o) => operationLayer(o, true)); AllData.regionGrade = "one"; AllData.regionName = ""; newfiberMap.map.easeTo(newfiberMap.config_.params.init); @@ -638,6 +194,14 @@ bus.off(mapInitBusName); closeAllLayer(); }); +======= + AllData.TypeID = item.key; +}; + +onMounted(() => {}); + +onBeforeUnmount(() => {}); +>>>>>>> e667c948d24ce7ebd6d93760b5f869c8372212a5 diff --git a/vite.config.js b/vite.config.js index 02ad574..3a8c0be 100644 --- a/vite.config.js +++ b/vite.config.js @@ -8,7 +8,7 @@ let ipLink = 'https://server1.wh-nf.cn:8201/prod-api'; // let ipLink = 'http://192.168.16.135:9100'; // let ipLink = 'http://192.168.16.124:9100'; -// let ipLink = 'http://192.168.20.43:9100'; +// let ipLink = 'http://192.168.16.43:9100'; // 谢杨 /* */ // https://vitejs.dev/config/ export default defineConfig(({ mode, command }) => {