diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index b0eaa08..4b84aaf 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -92,7 +92,9 @@ "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之） "rain", // 雨量站 "rainwater_pipeline_quality", // 雨水管网水质 + "rainwater_pipeline_quality_city", // 雨水管网水质 "sewage_pipeline_quality", // 污水管网水质 + "sewage_pipeline_quality_city", // 污水管网水质 "rainwater_pipeline_quality_area", // 接驳口 "rainwater_pipeline_water_level", // 雨水管网液位 "reservoir_water_level", //水库水位 @@ -101,6 +103,7 @@ "sewageStation", //污水厂 "gateStation", //闸门 "pump_water_level", //泵站液位 + "outlet_water_level_city", //排口流量 ]); // 基本数据 const arrid = ref([ @@ -279,9 +282,16 @@ type = "rainwater_pipeline_quality"; dialogConfig.RefName = "jiancefenxiGWFX"; } - - if (Name == "排口水质") { + if (type == "outlet_water_level_city") { + type = "outlet_water_level"; } + if (type == "rainwater_pipeline_quality_city") { + type = "rainwater_pipeline_quality"; + } + if (type == "sewage_pipeline_quality_city") { + type = "sewage_pipeline_quality"; + } + let params = { dataCode: type, scene: specificFun(type) || "basis_monitor", diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index b0eaa08..4b84aaf 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -92,7 +92,9 @@ "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之） "rain", // 雨量站 "rainwater_pipeline_quality", // 雨水管网水质 + "rainwater_pipeline_quality_city", // 雨水管网水质 "sewage_pipeline_quality", // 污水管网水质 + "sewage_pipeline_quality_city", // 污水管网水质 "rainwater_pipeline_quality_area", // 接驳口 "rainwater_pipeline_water_level", // 雨水管网液位 "reservoir_water_level", //水库水位 @@ -101,6 +103,7 @@ "sewageStation", //污水厂 "gateStation", //闸门 "pump_water_level", //泵站液位 + "outlet_water_level_city", //排口流量 ]); // 基本数据 const arrid = ref([ @@ -279,9 +282,16 @@ type = "rainwater_pipeline_quality"; dialogConfig.RefName = "jiancefenxiGWFX"; } - - if (Name == "排口水质") { + if (type == "outlet_water_level_city") { + type = "outlet_water_level"; } + if (type == "rainwater_pipeline_quality_city") { + type = "rainwater_pipeline_quality"; + } + if (type == "sewage_pipeline_quality_city") { + type = "sewage_pipeline_quality"; + } + let params = { dataCode: type, scene: specificFun(type) || "basis_monitor", diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue index c48ca1e..7185eb7 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue @@ -8,8 +8,8 @@ const id = guid(); const myChart = shallowRef(""); import * as echarts from "echarts"; -import { nowSize } from '@/utils/util.js'; -import moment from 'moment'; +import { nowSize } from "@/utils/util.js"; +import moment from "moment"; const props = defineProps({ //刷新标志 @@ -45,7 +45,7 @@ watch( () => props.refresh, (value) => { - console.log("???????"); + // console.log("???????"); //先销毁实例 myChart.value && myChart.value.dispose(); init(); @@ -80,7 +80,6 @@ axisLabel: { show: true, color: "#409eff", - }, axisLine: { lineStyle: { @@ -134,7 +133,7 @@ // }, ]; - console.log("获取的Y轴的数据", props.yAxisarr); + // console.log("获取的Y轴的数据", props.yAxisarr); // 处理多个y轴遍历展示 if (props.yAxisarr) { @@ -152,7 +151,7 @@ }, name: p.lineName, yAxis: Number(p.lineValue), - + label: { formatter: `${p.lineValue}-${p.lineName}`, color: p.lineColor, @@ -166,7 +165,7 @@ marklinedata.push(arr); }); - console.log("marklinedata", marklinedata); + // console.log("marklinedata", marklinedata); props.yAxisarr.map((item, index) => { let obj = { name: item.dataName, @@ -174,7 +173,7 @@ axisLabel: { show: true, color: colorarr[index], - formatter: function (value) { + formatter: function (value) { return value.toFixed(2); // 保留两位小数 }, }, @@ -249,8 +248,8 @@ }, tooltip: { trigger: "axis", - backgroundColor: '#004284', - borderColor: '#0B9BFF', + backgroundColor: "#004284", + borderColor: "#0B9BFF", borderRadius: 6, // 设置圆角大小 feature: { mark: { show: true }, @@ -259,24 +258,23 @@ restore: { show: true }, saveAsImage: { show: true }, }, - formatter: function (params) { - let res = params[0].name + '
'; - params.forEach(function (item) { - // 对每个数据项的数值进行格式化，保留两位小数 - let text= `
+ formatter: function (params) { + let res = params[0].name + "
"; + params.forEach(function (item) { + // 对每个数据项的数值进行格式化，保留两位小数 + let text = `
${item.marker}${item.seriesName} - ${(item.value == null ? '-' : Number(item.value).toFixed(2))} -
` - res +=text ; - }); - return res; - }, - textStyle: { + ${item.value == null ? "-" : Number(item.value).toFixed(2)} +
`; + res += text; + }); + return res; + }, + textStyle: { // 字体颜色 - color: 'white', + color: "white", // 字体大小 fontSize: nowSize(14, 1920), - }, axisPointer: { type: "cross", @@ -298,13 +296,13 @@ type: "category", data: props.XAxis, axisLabel: { - color: 'rgba(255,255,255,1)', - fontSize: nowSize(12, 1920), - fontFamily: 'AlibabaPuHuiTi', - formatter: function (value) { - return moment(value).format('HH:MM'); + color: "rgba(255,255,255,1)", + fontSize: nowSize(12, 1920), + fontFamily: "AlibabaPuHuiTi", + formatter: function (value) { + return moment(value).format("HH:MM"); + }, }, - }, axisPointer: { type: "shadow", }, diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index b0eaa08..4b84aaf 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -92,7 +92,9 @@ "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之） "rain", // 雨量站 "rainwater_pipeline_quality", // 雨水管网水质 + "rainwater_pipeline_quality_city", // 雨水管网水质 "sewage_pipeline_quality", // 污水管网水质 + "sewage_pipeline_quality_city", // 污水管网水质 "rainwater_pipeline_quality_area", // 接驳口 "rainwater_pipeline_water_level", // 雨水管网液位 "reservoir_water_level", //水库水位 @@ -101,6 +103,7 @@ "sewageStation", //污水厂 "gateStation", //闸门 "pump_water_level", //泵站液位 + "outlet_water_level_city", //排口流量 ]); // 基本数据 const arrid = ref([ @@ -279,9 +282,16 @@ type = "rainwater_pipeline_quality"; dialogConfig.RefName = "jiancefenxiGWFX"; } - - if (Name == "排口水质") { + if (type == "outlet_water_level_city") { + type = "outlet_water_level"; } + if (type == "rainwater_pipeline_quality_city") { + type = "rainwater_pipeline_quality"; + } + if (type == "sewage_pipeline_quality_city") { + type = "sewage_pipeline_quality"; + } + let params = { dataCode: type, scene: specificFun(type) || "basis_monitor", diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue index c48ca1e..7185eb7 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue @@ -8,8 +8,8 @@ const id = guid(); const myChart = shallowRef(""); import * as echarts from "echarts"; -import { nowSize } from '@/utils/util.js'; -import moment from 'moment'; +import { nowSize } from "@/utils/util.js"; +import moment from "moment"; const props = defineProps({ //刷新标志 @@ -45,7 +45,7 @@ watch( () => props.refresh, (value) => { - console.log("???????"); + // console.log("???????"); //先销毁实例 myChart.value && myChart.value.dispose(); init(); @@ -80,7 +80,6 @@ axisLabel: { show: true, color: "#409eff", - }, axisLine: { lineStyle: { @@ -134,7 +133,7 @@ // }, ]; - console.log("获取的Y轴的数据", props.yAxisarr); + // console.log("获取的Y轴的数据", props.yAxisarr); // 处理多个y轴遍历展示 if (props.yAxisarr) { @@ -152,7 +151,7 @@ }, name: p.lineName, yAxis: Number(p.lineValue), - + label: { formatter: `${p.lineValue}-${p.lineName}`, color: p.lineColor, @@ -166,7 +165,7 @@ marklinedata.push(arr); }); - console.log("marklinedata", marklinedata); + // console.log("marklinedata", marklinedata); props.yAxisarr.map((item, index) => { let obj = { name: item.dataName, @@ -174,7 +173,7 @@ axisLabel: { show: true, color: colorarr[index], - formatter: function (value) { + formatter: function (value) { return value.toFixed(2); // 保留两位小数 }, }, @@ -249,8 +248,8 @@ }, tooltip: { trigger: "axis", - backgroundColor: '#004284', - borderColor: '#0B9BFF', + backgroundColor: "#004284", + borderColor: "#0B9BFF", borderRadius: 6, // 设置圆角大小 feature: { mark: { show: true }, @@ -259,24 +258,23 @@ restore: { show: true }, saveAsImage: { show: true }, }, - formatter: function (params) { - let res = params[0].name + '
'; - params.forEach(function (item) { - // 对每个数据项的数值进行格式化，保留两位小数 - let text= `
+ formatter: function (params) { + let res = params[0].name + "
"; + params.forEach(function (item) { + // 对每个数据项的数值进行格式化，保留两位小数 + let text = `
${item.marker}${item.seriesName} - ${(item.value == null ? '-' : Number(item.value).toFixed(2))} -
` - res +=text ; - }); - return res; - }, - textStyle: { + ${item.value == null ? "-" : Number(item.value).toFixed(2)} +
`; + res += text; + }); + return res; + }, + textStyle: { // 字体颜色 - color: 'white', + color: "white", // 字体大小 fontSize: nowSize(14, 1920), - }, axisPointer: { type: "cross", @@ -298,13 +296,13 @@ type: "category", data: props.XAxis, axisLabel: { - color: 'rgba(255,255,255,1)', - fontSize: nowSize(12, 1920), - fontFamily: 'AlibabaPuHuiTi', - formatter: function (value) { - return moment(value).format('HH:MM'); + color: "rgba(255,255,255,1)", + fontSize: nowSize(12, 1920), + fontFamily: "AlibabaPuHuiTi", + formatter: function (value) { + return moment(value).format("HH:MM"); + }, }, - }, axisPointer: { type: "shadow", }, diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue index 4adccc8..497c620 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue @@ -60,7 +60,7 @@ watch( () => props.refresh, (value) => { - console.log("???????"); + // console.log("???????"); //先销毁实例 myChart.value && myChart.value.dispose(); init(); diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index b0eaa08..4b84aaf 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -92,7 +92,9 @@ "waterlogging", // 渍水监测点（注意：这里编码没有后缀，可能是特例或故意为之） "rain", // 雨量站 "rainwater_pipeline_quality", // 雨水管网水质 + "rainwater_pipeline_quality_city", // 雨水管网水质 "sewage_pipeline_quality", // 污水管网水质 + "sewage_pipeline_quality_city", // 污水管网水质 "rainwater_pipeline_quality_area", // 接驳口 "rainwater_pipeline_water_level", // 雨水管网液位 "reservoir_water_level", //水库水位 @@ -101,6 +103,7 @@ "sewageStation", //污水厂 "gateStation", //闸门 "pump_water_level", //泵站液位 + "outlet_water_level_city", //排口流量 ]); // 基本数据 const arrid = ref([ @@ -279,9 +282,16 @@ type = "rainwater_pipeline_quality"; dialogConfig.RefName = "jiancefenxiGWFX"; } - - if (Name == "排口水质") { + if (type == "outlet_water_level_city") { + type = "outlet_water_level"; } + if (type == "rainwater_pipeline_quality_city") { + type = "rainwater_pipeline_quality"; + } + if (type == "sewage_pipeline_quality_city") { + type = "sewage_pipeline_quality"; + } + let params = { dataCode: type, scene: specificFun(type) || "basis_monitor", diff --git a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue index c48ca1e..7185eb7 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/components/Paikoucharts.vue @@ -8,8 +8,8 @@ const id = guid(); const myChart = shallowRef(""); import * as echarts from "echarts"; -import { nowSize } from '@/utils/util.js'; -import moment from 'moment'; +import { nowSize } from "@/utils/util.js"; +import moment from "moment"; const props = defineProps({ //刷新标志 @@ -45,7 +45,7 @@ watch( () => props.refresh, (value) => { - console.log("???????"); + // console.log("???????"); //先销毁实例 myChart.value && myChart.value.dispose(); init(); @@ -80,7 +80,6 @@ axisLabel: { show: true, color: "#409eff", - }, axisLine: { lineStyle: { @@ -134,7 +133,7 @@ // }, ]; - console.log("获取的Y轴的数据", props.yAxisarr); + // console.log("获取的Y轴的数据", props.yAxisarr); // 处理多个y轴遍历展示 if (props.yAxisarr) { @@ -152,7 +151,7 @@ }, name: p.lineName, yAxis: Number(p.lineValue), - + label: { formatter: `${p.lineValue}-${p.lineName}`, color: p.lineColor, @@ -166,7 +165,7 @@ marklinedata.push(arr); }); - console.log("marklinedata", marklinedata); + // console.log("marklinedata", marklinedata); props.yAxisarr.map((item, index) => { let obj = { name: item.dataName, @@ -174,7 +173,7 @@ axisLabel: { show: true, color: colorarr[index], - formatter: function (value) { + formatter: function (value) { return value.toFixed(2); // 保留两位小数 }, }, @@ -249,8 +248,8 @@ }, tooltip: { trigger: "axis", - backgroundColor: '#004284', - borderColor: '#0B9BFF', + backgroundColor: "#004284", + borderColor: "#0B9BFF", borderRadius: 6, // 设置圆角大小 feature: { mark: { show: true }, @@ -259,24 +258,23 @@ restore: { show: true }, saveAsImage: { show: true }, }, - formatter: function (params) { - let res = params[0].name + '
'; - params.forEach(function (item) { - // 对每个数据项的数值进行格式化，保留两位小数 - let text= `
+ formatter: function (params) { + let res = params[0].name + "
"; + params.forEach(function (item) { + // 对每个数据项的数值进行格式化，保留两位小数 + let text = `
${item.marker}${item.seriesName} - ${(item.value == null ? '-' : Number(item.value).toFixed(2))} -
` - res +=text ; - }); - return res; - }, - textStyle: { + ${item.value == null ? "-" : Number(item.value).toFixed(2)} +
`; + res += text; + }); + return res; + }, + textStyle: { // 字体颜色 - color: 'white', + color: "white", // 字体大小 fontSize: nowSize(14, 1920), - }, axisPointer: { type: "cross", @@ -298,13 +296,13 @@ type: "category", data: props.XAxis, axisLabel: { - color: 'rgba(255,255,255,1)', - fontSize: nowSize(12, 1920), - fontFamily: 'AlibabaPuHuiTi', - formatter: function (value) { - return moment(value).format('HH:MM'); + color: "rgba(255,255,255,1)", + fontSize: nowSize(12, 1920), + fontFamily: "AlibabaPuHuiTi", + formatter: function (value) { + return moment(value).format("HH:MM"); + }, }, - }, axisPointer: { type: "shadow", }, diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue index 4adccc8..497c620 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/MonitoringAnalysisChart.vue @@ -60,7 +60,7 @@ watch( () => props.refresh, (value) => { - console.log("???????"); + // console.log("???????"); //先销毁实例 myChart.value && myChart.value.dispose(); init(); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue index 5fcff38..a61fcdc 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/shuikujianceEcharts.vue @@ -43,7 +43,7 @@ watch( () => props.refresh, (value) => { - console.log("???????"); + // console.log("???????"); //先销毁实例 myChart.value && myChart.value.dispose(); init(); @@ -131,7 +131,7 @@ // }, ]; - console.log("获取的Y轴的数据", props.yAxisarr); + // console.log("获取的Y轴的数据", props.yAxisarr); // 处理多个y轴遍历展示 if (props.yAxisarr) { @@ -162,7 +162,7 @@ marklinedata.push(arr); }); - console.log("marklinedata", marklinedata); + // console.log("marklinedata", marklinedata); props.yAxisarr.map((item, index) => { let obj = { name: item.dataName + item.unit,