@ued_fpi/data-visual 1.2.28 → 1.2.29

package/dist/lib/wgms/src/ChangeAlongRiver/index.vue.js

@@ -6,6 +6,7 @@ const vue = require('vue');
 const dayjs = require('dayjs');
 require('echarts/lib/component/markLine');
 const BaseECharts_vue_vue_type_script_setup_true_lang = require('../../utils/echarts/BaseECharts.vue.js');
+const tools = require('../../utils/tools.js');
 const index = require('./api/index.js');
 
 const _hoisted_1 = { class: "dv-wgms-change-along-river" };
@@ -236,11 +237,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       };
       if (props.params?.factorCode === "w01001") {
         if (state.factorLimitValue && state.factorLimitValue.upValue) {
+          const num = tools.countDecimalPlaces(state.factorLimitValue.upValue);
           option2.series[0].markLine = {
             symbol: "none",
             data: [
               {
-                yAxis: state.factorLimitValue.upValue,
+                yAxis: Number(state.factorLimitValue.upValue).toFixed(num),
                 show: true,
                 name: "水质超标上限",
                 label: {
@@ -261,7 +263,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 }
               },
               {
-                yAxis: state.factorLimitValue.downValue == null ? "" : state.factorLimitValue.downValue,
+                yAxis: state.factorLimitValue.downValue == null ? "" : Number(state.factorLimitValue.downValue).toFixed(num),
                 show: true,
                 name: "水质超标下限",
                 label: {
@@ -290,11 +292,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       } else {
         if (state.factorLimitValue.value != null) {
+          const num = tools.countDecimalPlaces(state.factorLimitValue.value);
           option2.series[0].markLine = {
             symbol: "none",
             data: [
               {
-                yAxis: state.factorLimitValue.value,
+                yAxis: Number(state.factorLimitValue.value).toFixed(num),
                 show: true,
                 name: "水质超标线",
                 label: {

package/dist/lib/wgms/src/DistributionOfWaterQualityLevels/index.vue.js

@@ -3,7 +3,6 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: 'Module' } });
 
 const vue = require('vue');
-const dayjs = require('dayjs');
 const commonArrow_vue_vue_type_script_setup_true_lang = require('../common/common-arrow.vue.js');
 require('../common/common-arrow.vue2.js');
 const utils = require('../../../utils.js');
@@ -26,8 +25,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       default: () => {
         return {
           treeId: 3301,
-          treeType: 1,
-          year: dayjs().format("YYYY")
+          timeType: "year",
+          startTime: 16725024e5,
+          endTime: 17040384e5
         };
       }
     },

package/dist/lib/wgms/src/DrinkingWaterComplianceRate/index.vue.js

@@ -9,7 +9,6 @@ const iconLight1 = require('./images/icon-light-1.svg.js');
 const iconLight2 = require('./images/icon-light-2.svg.js');
 const iconLight3 = require('./images/icon-light-3.svg.js');
 const vue = require('vue');
-const dayjs = require('dayjs');
 const utils = require('../../../utils.js');
 const index = require('./api/index.js');
 
@@ -24,8 +23,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   props: {
     params: { default: () => {
       return {
-        startTime: dayjs().startOf("year").valueOf(),
-        endTime: dayjs().endOf("year").valueOf(),
+        // startTime: dayjs().startOf('year').valueOf(),
+        // endTime: dayjs().endOf('year').valueOf(),
+        timeStr: "2023",
         timeType: "hour",
         factor: "8",
         factorFlag: false,
@@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     } },
     titleStyle: { default: () => {
       return {
-        color: "#909399"
+        color: "var(--dv-color-text-primary)"
       };
     } },
     isLazy: { type: Boolean, default: false }
@@ -92,8 +92,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                   ]),
                   vue.createElementVNode("div", _hoisted_5, vue.toDisplayString(i.label), 1),
                   vue.createElementVNode("div", _hoisted_6, [
-                    vue.createElementVNode("span", null, vue.toDisplayString(item[i.props]), 1),
-                    vue.createElementVNode("span", null, vue.toDisplayString(i.unit), 1)
+                    vue.createElementVNode("span", null, vue.toDisplayString(item[i.props] === null ? "--" : item[i.props] + i.unit), 1)
                   ])
                 ]);
               }), 64))

package/dist/lib/wgms/src/RegionalQualityAnalysis/index.vue.js

@@ -29,11 +29,20 @@ const _hoisted_4 = {
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   props: {
-    treeId: { default: "3301" },
-    treeType: { default: 1 },
-    year: { default: "2023" },
-    data: {},
-    isLazy: { type: Boolean }
+    treeId: {},
+    timeType: {},
+    startTime: {},
+    endTime: {},
+    data: { default: null },
+    isLazy: { type: Boolean, default: false },
+    params: { default: () => {
+      return {
+        treeId: "3301",
+        timeType: "year",
+        startTime: 16725024e5,
+        endTime: 17040384e5
+      };
+    } }
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
@@ -52,7 +61,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const tableData = vue.ref([]);
     const getData = async () => {
       const params = {
-        ...props
+        ...props.params
       };
       const { data } = await index.synthesisIndex(params);
       tableData.value = (data || []).map((item, index) => {
@@ -64,7 +73,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         };
       });
     };
-    vue.watch([() => props.data, () => props.treeId, () => props.treeType, () => props.year, () => props.isLazy], () => {
+    vue.watch([() => props.data, () => props.params, () => props.isLazy], () => {
       if (props.isLazy)
         return;
       if (props.data) {
@@ -87,11 +96,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           changePercent: vue.withCtx((scope) => [
             vue.createElementVNode("span", {
               style: { "margin-right": "4px" },
-              class: vue.normalizeClass(classObj[scope.row.type])
-            }, vue.toDisplayString(scope.row.changePercent), 3),
-            scope.row.type === "-1" ? (vue.openBlock(), vue.createElementBlock("img", _hoisted_2)) : vue.createCommentVNode("", true),
-            scope.row.type === "1" ? (vue.openBlock(), vue.createElementBlock("img", _hoisted_3)) : vue.createCommentVNode("", true),
-            scope.row.type === "0" ? (vue.openBlock(), vue.createElementBlock("img", _hoisted_4)) : vue.createCommentVNode("", true)
+              class: vue.normalizeClass(scope.row.changePercent !== null ? classObj[scope.row.type] : "")
+            }, vue.toDisplayString(scope.row.changePercent === null ? "--" : scope.row.changePercent), 3),
+            scope.row.changePercent !== null ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+              scope.row.type === "-1" ? (vue.openBlock(), vue.createElementBlock("img", _hoisted_2)) : vue.createCommentVNode("", true),
+              scope.row.type === "1" ? (vue.openBlock(), vue.createElementBlock("img", _hoisted_3)) : vue.createCommentVNode("", true),
+              scope.row.type === "0" ? (vue.openBlock(), vue.createElementBlock("img", _hoisted_4)) : vue.createCommentVNode("", true)
+            ], 64)) : vue.createCommentVNode("", true)
           ]),
           _: 1
         }, 8, ["data"])

package/dist/lib/wgms/src/UpstreamImpact/index.vue.js

@@ -6,6 +6,7 @@ const vue = require('vue');
 const dayjs = require('dayjs');
 require('echarts/lib/component/markLine');
 const BaseECharts_vue_vue_type_script_setup_true_lang = require('../../utils/echarts/BaseECharts.vue.js');
+const tools = require('../../utils/tools.js');
 const index = require('./api/index.js');
 
 const _hoisted_1 = { class: "dv-wgms-upstream-impact" };
@@ -98,7 +99,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         rain: [],
         factorValue: resData.map((item) => item.value)
       };
-      const dass = waterQualityData.quality.map((item, index) => {
+      const dass = waterQualityData.factorValue.map((item, index) => {
         return {
           value: item || item === 0 ? item : null
         };
@@ -220,11 +221,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       };
       if (props.params?.factorCode === "w01001") {
         if (state.factorLimitValue && state.factorLimitValue.upValue) {
+          const num = tools.countDecimalPlaces(state.factorLimitValue.upValue);
           option2.series[0].markLine = {
             symbol: "none",
             data: [
               {
-                yAxis: state.factorLimitValue.upValue,
+                yAxis: Number(state.factorLimitValue.upValue).toFixed(num),
                 show: true,
                 lineStyle: {
                   type: "solid",
@@ -232,7 +234,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 }
               },
               {
-                yAxis: state.factorLimitValue.downValue == null ? "" : state.factorLimitValue.downValue,
+                yAxis: state.factorLimitValue.downValue == null ? "" : Number(state.factorLimitValue.downValue).toFixed(num),
                 show: true,
                 lineStyle: {
                   type: "solid",
@@ -248,11 +250,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       } else {
         if (state.factorLimitValue.value != null) {
+          const num = tools.countDecimalPlaces(state.factorLimitValue.value);
           option2.series[0].markLine = {
             symbol: "none",
             data: [
               {
-                yAxis: state.factorLimitValue.value,
+                yAxis: Number(state.factorLimitValue.value).toFixed(num),
                 show: true,
                 lineStyle: {
                   type: "solid",

package/dist/lib/wgms/src/WaterQualityRainfall/index.vue.js

@@ -148,12 +148,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             let str = `<div>${params[0].axisValue}</div>`;
             params.forEach((item, index) => {
               let unit2 = "";
-              if (index === 0)
+              if (item.seriesName === "降雨量")
                 unit2 = "mm/h";
-              else if (index === 1)
-                unit2 = props?.params?.factorUnit || "";
-              else
+              else if (item.seriesName === "水位")
                 unit2 = "m";
+              else
+                unit2 = props?.params?.factorUnit || "";
               str += `<div>${item.marker}${item.seriesName}：${item.value ? item.value : "--"}${unit2}</div>`;
             });
             return str;
@@ -401,11 +401,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       };
       if (props.params?.factorCode === "w01001") {
         if (state.factorLimitValue && state.factorLimitValue.upValue) {
+          const num = tools.countDecimalPlaces(state.factorLimitValue.upValue);
           option2.series[1].markLine = {
             symbol: "none",
             data: [
               {
-                yAxis: state.factorLimitValue.upValue,
+                yAxis: Number(state.factorLimitValue.upValue).toFixed(num),
                 show: true,
                 lineStyle: {
                   type: "solid",
@@ -413,7 +414,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 }
               },
               {
-                yAxis: state.factorLimitValue.downValue == null ? "" : state.factorLimitValue.downValue,
+                yAxis: state.factorLimitValue.downValue == null ? "" : Number(state.factorLimitValue.downValue).toFixed(num),
                 show: true,
                 lineStyle: {
                   type: "solid",
@@ -429,11 +430,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       } else {
         if (state.factorLimitValue.value != null) {
+          const num = tools.countDecimalPlaces(state.factorLimitValue.value);
           option2.series[1].markLine = {
             symbol: "none",
             data: [
               {
-                yAxis: state.factorLimitValue.value,
+                yAxis: Number(state.factorLimitValue.value).toFixed(num),
                 show: true,
                 lineStyle: {
                   type: "solid",

package/dist/lib/wgms/src/WaterQualitySituation/index.vue.js

@@ -36,11 +36,16 @@ const _hoisted_20 = ["src"];
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   props: {
-    treeId: { default: "3301" },
-    treeType: { default: 1 },
-    year: { default: "2023" },
-    data: {},
-    isLazy: { type: Boolean, default: false }
+    data: { default: null },
+    isLazy: { type: Boolean, default: false },
+    params: { default: () => {
+      return {
+        treeId: "3301",
+        timeType: "day",
+        startTime: 16725024e5,
+        endTime: 17040384e5
+      };
+    } }
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
@@ -67,12 +72,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     });
     const getData = async () => {
       const params = {
-        ...props
+        ...props.params
       };
       const { data } = await index.waterQualityStatus(params);
       list.value = data || [];
     };
-    vue.watch([() => props.data, () => props.treeId, () => props.treeType, () => props.year, () => props.isLazy], () => {
+    vue.watch([() => props.data, () => props.params, () => props.isLazy], () => {
       if (props.isLazy)
         return;
       if (props.data) {
@@ -80,7 +85,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return;
       }
       getData();
-    }, { immediate: true });
+    }, { immediate: true, deep: true });
     __expose({
       reload: getData
     });
@@ -98,33 +103,34 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
               vue.createElementVNode("div", _hoisted_6, [
                 vue.createElementVNode("div", _hoisted_7, [
                   _hoisted_8,
-                  vue.createElementVNode("span", _hoisted_9, vue.toDisplayString(item.excellentPercent) + "%", 1)
+                  vue.createElementVNode("span", _hoisted_9, vue.toDisplayString(item.excellentPercent === null ? "--" : `${item.excellentPercent}%`), 1)
                 ]),
                 vue.createElementVNode("div", _hoisted_10, [
                   vue.createVNode(ProgressBar_vue_vue_type_script_setup_true_lang.default, {
-                    percentage: item.excellentPercent
+                    percentage: item.excellentPercent || 0
                   }, null, 8, ["percentage"])
                 ]),
                 vue.createElementVNode("div", _hoisted_11, [
                   vue.createElementVNode("div", null, [
                     _hoisted_12,
-                    vue.createElementVNode("span", _hoisted_13, vue.toDisplayString(item.targetPercent) + "%", 1)
+                    vue.createElementVNode("span", _hoisted_13, vue.toDisplayString(item.targetPercent === null ? "--" : `${item.targetPercent}%`), 1)
                   ]),
                   vue.createElementVNode("div", null, [
                     _hoisted_14,
                     vue.createElementVNode("span", {
                       class: "dv-mr-4 dv-number1 up-num",
-                      style: vue.normalizeStyle({ color: vue.unref(getCompare)(item.yoyPercent).color })
-                    }, vue.toDisplayString(item.yoyPercent) + "%", 5),
+                      style: vue.normalizeStyle({ color: item.yoyPercent === null ? "" : vue.unref(getCompare)(item.yoyPercent).color })
+                    }, vue.toDisplayString(item.yoyPercent === null ? "--" : `${item.yoyPercent}%`), 5),
                     vue.createElementVNode("span", {
                       class: "dv-mr-6 up-num",
-                      style: vue.normalizeStyle({ color: vue.unref(getCompare)(item.yoyPercent).color })
-                    }, vue.toDisplayString(vue.unref(getCompare)(item.yoyPercent).label), 5),
-                    vue.createElementVNode("img", {
+                      style: vue.normalizeStyle({ color: item.yoyPercent === null ? "" : vue.unref(getCompare)(item.yoyPercent).color })
+                    }, vue.toDisplayString(item.yoyPercent === null ? "" : vue.unref(getCompare)(item.yoyPercent).label), 5),
+                    item.yoyPercent !== null ? (vue.openBlock(), vue.createElementBlock("img", {
+                      key: 0,
                       style: { "height": "12px" },
                       src: vue.unref(getCompare)(item.yoyPercent).img,
                       alt: ""
-                    }, null, 8, _hoisted_15)
+                    }, null, 8, _hoisted_15)) : vue.createCommentVNode("", true)
                   ])
                 ])
               ])
@@ -137,16 +143,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 }, [
                   vue.createElementVNode("div", _hoisted_17, vue.toDisplayString(child.stationTypeName), 1),
                   vue.createElementVNode("div", _hoisted_18, [
-                    vue.createElementVNode("span", _hoisted_19, vue.toDisplayString(item.excellentPercent) + "%", 1),
+                    vue.createElementVNode("span", _hoisted_19, vue.toDisplayString(item.excellentPercent === null ? "--" : `${item.excellentPercent}%`), 1),
                     vue.createElementVNode("span", {
                       class: "dv-mr-2 dv-number1 dv-danger",
-                      style: vue.normalizeStyle({ color: vue.unref(getCompare)(item.yoyPercent).color })
-                    }, vue.toDisplayString(item.yoyPercent) + "%", 5),
-                    vue.createElementVNode("img", {
+                      style: vue.normalizeStyle({ color: item.yoyPercent === null ? "" : vue.unref(getCompare)(item.yoyPercent).color })
+                    }, vue.toDisplayString(item.yoyPercent === null ? "--" : `${item.yoyPercent}%`), 5),
+                    item.yoyPercent !== null ? (vue.openBlock(), vue.createElementBlock("img", {
+                      key: 0,
                       style: { "height": "12px" },
                       src: vue.unref(getCompare)(item.yoyPercent).img,
                       alt: ""
-                    }, null, 8, _hoisted_20)
+                    }, null, 8, _hoisted_20)) : vue.createCommentVNode("", true)
                   ])
                 ]);
               }), 128))

package/dist/lib/wgms/src/WaterQualityStatesAnalysis/index.vue.js

@@ -14,16 +14,21 @@ const _hoisted_1 = {
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   props: {
-    treeId: { default: "3301" },
-    treeType: { default: 1 },
-    year: { default: "2023" },
-    isLazy: { type: Boolean }
+    isLazy: { type: Boolean, default: false },
+    params: { default: () => {
+      return {
+        treeId: "3301",
+        timeType: "year",
+        startTime: 16725024e5,
+        endTime: 17040384e5
+      };
+    } }
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
     const options = vue.shallowRef();
     const getData = async () => {
-      const { data } = await index.waterQualityAnalyze({ ...props });
+      const { data } = await index.waterQualityAnalyze({ ...props.params });
       const xData = [];
       const goodList = [];
       const badList = [];
@@ -34,7 +39,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       });
       options.value = echartsOptions.getDizhouQualityAnalysisOption(xData, goodList, badList);
     };
-    vue.watch([() => props.treeId, () => props.treeType, () => props.year, () => props.isLazy], () => {
+    vue.watch([() => props.params, () => props.isLazy], () => {
       if (props.isLazy)
         return;
       getData();

package/dist/lib/wgms/src/common/popup-table.vue.js

@@ -77,7 +77,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const getData = (optionItem, item) => {
       if (optionItem.render)
         return optionItem.render(item, optionItem);
-      return optionItem.key ? item[optionItem.key] : "/";
+      return optionItem.key ? item[optionItem.key] === null ? "--" : item[optionItem.key] : "/";
     };
     const checkLine = (item, index) => {
       if (currIndex.value === index) {

package/dist/lib/wgms/utils/echarts/echartsOptions.js

@@ -167,7 +167,7 @@ const getDizhouQualityAnalysisOption = (xData, goodList, badList) => {
       {
         name: "优良比例",
         type: "bar",
-        barWidth: 15,
+        // barWidth: 15,
         data: goodList,
         itemStyle: {
           color: "var(--dv-color-success)"
@@ -176,7 +176,7 @@ const getDizhouQualityAnalysisOption = (xData, goodList, badList) => {
       {
         name: "劣V比例",
         type: "bar",
-        barWidth: 15,
+        // barWidth: 15,
         itemStyle: {
           color: "var(--dv-color-danger)"
         },

package/dist/lib/wgms/utils/tools.js

@@ -65,7 +65,14 @@ const getAlgaeTime = (val) => {
     // 预警当天日数据 没选择历史就显示今日
   };
 };
+const countDecimalPlaces = (number) => {
+  const numberAsString = number.toString();
+  if (numberAsString.includes("."))
+    return numberAsString.split(".")[1].length;
+  return 0;
+};
 
+exports.countDecimalPlaces = countDecimalPlaces;
 exports.getAlgaeTime = getAlgaeTime;
 exports.getDateEndTime = getDateEndTime;
 exports.install = install;