@ued_fpi/data-visual 1.2.2 → 1.2.4

package/dist/es/wgms/src/FactorTrendComparison/index.vue.mjs

@@ -1,36 +1,46 @@
 import { defineComponent, toRefs, watch, nextTick, openBlock, createElementBlock, createElementVNode } from 'vue';
 import echarts from '../../utils/echarts/index.mjs';
-import { getFactorGroupList, getManualFactorTrendComparisonData } from '../../api/FactorTrendComparison/index.mjs';
+import { getTrendComparisonData } from './api/index.mjs';
 
 const _hoisted_1 = { class: "dv-wgms-factor-trend-comparison" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
-    isHandle: {
-      default: true,
-      type: Boolean
+    type: {
+      default: "automatic",
+      // 默认自动数据 manual（手工数据）
+      type: String
     },
-    // 是否是手工数据
-    siteId: {
-      default: "",
-      // 23239
-      type: [Number, String]
+    // 时间类型
+    timeType: {
+      type: String,
+      required: false
+      // day
+    },
+    siteCode: {
+      type: String,
+      required: false
+      // zaoleishougong
     },
-    beginTime: {
+    stationCode: {
       type: String,
-      required: true
-      // 1660752000000
+      required: false
+      // w01016
+    },
+    startTime: {
+      type: String,
+      required: false
+      // 1663257600000
     },
     endTime: {
       type: String,
-      required: true
-      // 1663344000000
+      required: false
+      // 1663257600000
     },
     data: {
-      type: Array,
-      default: () => []
+      type: Object,
+      required: false
     }
-    // 传入数据
   },
   setup(__props) {
     const props = __props;
@@ -41,58 +51,58 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       // 图表实例
     };
     const { chartRef } = toRefs(state);
-    watch([() => props.isHandle, () => props.siteId, () => props.beginTime, () => props.endTime, () => props.data], async () => {
-      if (props.data.length) {
-        await nextTick(() => {
-          initChart();
-        });
-        return;
-      }
-      const groupCode = props.isHandle ? "algae" : "algaeAutomatic";
-      const list = await getFactorGroupList({ code: groupCode });
-      state.factorMap = list[0]?.factors || [];
-      state.factorMap.forEach((item) => {
-        const obj = {
-          name: item.factorIndexName,
-          type: "line",
-          symbolSize: 0,
-          yAxisIndex: item.id === "75" ? 1 : item.id === "23" ? 2 : 0,
-          data: []
-        };
-        state.seriesData.push(obj);
-      });
+    watch([
+      () => props.type,
+      () => props.timeType,
+      () => props.siteCode,
+      () => props.stationCode,
+      () => props.startTime,
+      () => props.endTime,
+      () => props.data
+    ], async () => {
       await nextTick(() => {
-        initChart();
+        initChart(!!props.data);
       });
     }, { immediate: true });
-    const getChartData = async (factorId) => {
+    const getChartData = async () => {
       const params = {
-        beginTime: props.beginTime,
+        timeType: props.timeType,
+        siteCode: props.siteCode,
+        stationCode: props.stationCode,
         endTime: props.endTime,
-        factorFlag: false,
-        siteId: props.siteId,
-        dataTimeType: props.isHandle ? 1440 : 60,
-        queryTimeType: props.isHandle ? "day" : "hour",
-        factor: factorId
+        startTime: props.startTime,
+        dataType: props.type === "automatic" ? 0 : 1
+        // 数据类型 自动/手工(0/1)
       };
-      return await getManualFactorTrendComparisonData(params);
+      return await getTrendComparisonData(params);
     };
-    const initChart = () => {
+    const initChart = async (flag) => {
       let xData = [];
-      state.factorMap.forEach(async (item, index) => {
-        const res = await getChartData(item.id);
-        const timesList = res?.times ?? [];
-        const valueList = res?.dates ?? [];
+      let data = [];
+      if (!flag) {
+        const res = await getChartData();
+        data = res?.data || [];
+      } else {
+        data = props.data || [];
+      }
+      data.forEach((item) => {
+        const timesList = item.factorTimeDataList.map((item2) => item2.time);
+        const valueList = item.factorTimeDataList.map((item2) => item2.value);
         xData = timesList.map((item2) => item2 && item2.substring(5, 11));
-        state.seriesData[index].data = valueList.map((item2) => {
-          return item2?.value ?? null;
-        });
+        const obj = {
+          name: item.factorName,
+          type: "line",
+          symbolSize: 0,
+          yAxisIndex: item.factorCode === "w01016" ? 1 : item.factorCode === "w01010" ? 2 : 0,
+          data: valueList.map((item2) => item2 ?? null)
+        };
+        state.seriesData.push(obj);
       });
       const chart = echarts.init(chartRef.value);
-      setTimeout(async () => {
+      await nextTick(async () => {
         const lineOptions = getChartOptions(xData, state.seriesData);
         chart.setOption(lineOptions);
-      }, 1500);
+      });
     };
     const getChartOptions = (xData, seriesData) => {
       return {
@@ -118,8 +128,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         },
         grid: {
           top: 60,
-          left: "9%",
-          right: 10,
+          left: "15%",
+          right: 35,
           bottom: 40,
           containLabel: true
         },
@@ -152,7 +162,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               fontFamily: "TRENDS",
               color: "rgba(255, 255, 255, 0.6)",
               fontSize: "14px",
-              align: "center"
+              align: "center",
+              padding: [0, 0, 0, 0]
             },
             type: "value",
             offset: 60,
@@ -163,7 +174,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 color: "rgba(255, 255, 255, 0.6)",
                 fontSize: "16px",
                 align: "center",
-                padding: [0, 0, 0, 10]
+                padding: [0, 0, 0, 5]
               }
             },
             splitArea: {
@@ -184,7 +195,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               align: "center",
               fontFamily: "TRENDS",
               color: "rgba(255, 255, 255, 0.6)",
-              fontSize: "14px"
+              fontSize: "14px",
+              padding: [0, 0, 0, 0]
             },
             type: "value",
             position: "left",
@@ -196,7 +208,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 color: "rgba(255, 255, 255, 0.6)",
                 fontSize: "16px",
                 align: "center"
-              }
+              },
+              padding: [0, 0, 0, 0]
             },
             splitLine: { show: false },
             axisTick: { show: false },
@@ -211,7 +224,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               fontFamily: "TRENDS",
               color: "rgba(255, 255, 255, 0.6)",
               fontSize: "14px",
-              padding: [0, 0, 0, 10]
+              padding: [0, 0, 0, 20]
             },
             type: "value",
             position: "right",
@@ -223,7 +236,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 color: "rgba(255, 255, 255, 0.6)",
                 fontSize: "16px",
                 align: "center"
-              }
+              },
+              padding: [0, 0, 0, 20]
             },
             splitLine: { show: false },
             axisTick: { show: false },

package/dist/es/wgms/{api/NPTrendChange → src/NPTrendChange/api}/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * 获取氮磷比趋势变化数据
+ * 获取数据
  * @param params
  */
 export declare const getNPTrendChange: (params: any) => Promise<any>;

package/dist/es/wgms/src/NPTrendChange/api/index.mjs

@@ -0,0 +1,12 @@
+import requestControl from '../../../service/request.mjs';
+
+const getNPTrendChange = (params) => {
+  return requestControl({
+    url: "/api/v1/screen/algae-analyse-np-compare",
+    server: "wgmsScreenServer",
+    method: "get",
+    params
+  });
+};
+
+export { getNPTrendChange };

package/dist/es/wgms/src/NPTrendChange/index.d.ts

@@ -4,10 +4,9 @@ export declare const DvWgmsNPTrendChange: {
         $: import("vue").ComponentInternalInstance;
         $data: {};
         $props: {
-            data?: unknown[] | undefined;
-            siteCode?: string | undefined;
-            isHandle?: boolean | undefined;
+            type?: string | undefined;
             key?: string | number | symbol | undefined;
+            readonly data?: Record<string, any> | undefined;
             style?: unknown;
             ref?: import("vue").VNodeRef | undefined;
             ref_for?: boolean | undefined;
@@ -51,8 +50,11 @@ export declare const DvWgmsNPTrendChange: {
                 [key: string]: any;
             }>) => void)[] | undefined;
             class?: unknown;
-            readonly beginTime: string;
-            readonly endTime: string;
+            readonly endTime?: string | number | undefined;
+            readonly startTime?: string | number | undefined;
+            readonly timeType?: string | undefined;
+            readonly siteCode?: string | undefined;
+            readonly stationCode?: string | undefined;
         };
         $attrs: {
             [x: string]: unknown;
@@ -68,30 +70,36 @@ export declare const DvWgmsNPTrendChange: {
         $emit: (event: string, ...args: any[]) => void;
         $el: any;
         $options: import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
-            isHandle: {
-                default: boolean;
-                type: BooleanConstructor;
+            type: {
+                default: string;
+                type: StringConstructor;
+            };
+            timeType: {
+                type: StringConstructor;
+                required: false;
             };
             siteCode: {
-                default: string;
                 type: StringConstructor;
+                required: false;
             };
-            beginTime: {
+            stationCode: {
                 type: StringConstructor;
-                required: true;
+                required: false;
+            };
+            startTime: {
+                type: (StringConstructor | NumberConstructor)[];
+                required: false;
             };
             endTime: {
-                type: StringConstructor;
-                required: true;
+                type: (StringConstructor | NumberConstructor)[];
+                required: false;
             };
             data: {
-                type: ArrayConstructor;
-                default: () => never[];
+                type: ObjectConstructor;
+                required: false;
             };
         }>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
-            data: unknown[];
-            siteCode: string;
-            isHandle: boolean;
+            type: string;
         }, {}, string, {}> & {
             beforeCreate?: ((() => void) | (() => void)[]) | undefined;
             created?: ((() => void) | (() => void)[]) | undefined;
@@ -113,54 +121,68 @@ export declare const DvWgmsNPTrendChange: {
         $nextTick: typeof import("vue").nextTick;
         $watch<T extends string | ((...args: any) => any)>(source: T, cb: T extends (...args: any) => infer R ? (args_0: R, args_1: R) => any : (...args: any) => any, options?: import("vue").WatchOptions<boolean> | undefined): import("vue").WatchStopHandle;
     } & Readonly<import("vue").ExtractPropTypes<{
-        isHandle: {
-            default: boolean;
-            type: BooleanConstructor;
+        type: {
+            default: string;
+            type: StringConstructor;
+        };
+        timeType: {
+            type: StringConstructor;
+            required: false;
         };
         siteCode: {
-            default: string;
             type: StringConstructor;
+            required: false;
         };
-        beginTime: {
+        stationCode: {
             type: StringConstructor;
-            required: true;
+            required: false;
+        };
+        startTime: {
+            type: (StringConstructor | NumberConstructor)[];
+            required: false;
         };
         endTime: {
-            type: StringConstructor;
-            required: true;
+            type: (StringConstructor | NumberConstructor)[];
+            required: false;
         };
         data: {
-            type: ArrayConstructor;
-            default: () => never[];
+            type: ObjectConstructor;
+            required: false;
         };
     }>> & import("vue").ShallowUnwrapRef<{}> & {} & import("vue").ComponentCustomProperties & {};
     __isFragment?: undefined;
     __isTeleport?: undefined;
     __isSuspense?: undefined;
 } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
-    isHandle: {
-        default: boolean;
-        type: BooleanConstructor;
+    type: {
+        default: string;
+        type: StringConstructor;
+    };
+    timeType: {
+        type: StringConstructor;
+        required: false;
     };
     siteCode: {
-        default: string;
         type: StringConstructor;
+        required: false;
     };
-    beginTime: {
+    stationCode: {
         type: StringConstructor;
-        required: true;
+        required: false;
+    };
+    startTime: {
+        type: (StringConstructor | NumberConstructor)[];
+        required: false;
     };
     endTime: {
-        type: StringConstructor;
-        required: true;
+        type: (StringConstructor | NumberConstructor)[];
+        required: false;
     };
     data: {
-        type: ArrayConstructor;
-        default: () => never[];
+        type: ObjectConstructor;
+        required: false;
     };
 }>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
-    data: unknown[];
-    siteCode: string;
-    isHandle: boolean;
+    type: string;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]>;
 export default _NPTrendChange;

package/dist/es/wgms/src/NPTrendChange/index.vue.d.ts

@@ -1,48 +1,62 @@
 declare const _default: import("vue").DefineComponent<{
-    isHandle: {
-        default: boolean;
-        type: BooleanConstructor;
+    type: {
+        default: string;
+        type: StringConstructor;
+    };
+    timeType: {
+        type: StringConstructor;
+        required: false;
     };
     siteCode: {
-        default: string;
         type: StringConstructor;
+        required: false;
     };
-    beginTime: {
+    stationCode: {
         type: StringConstructor;
-        required: true;
+        required: false;
+    };
+    startTime: {
+        type: (StringConstructor | NumberConstructor)[];
+        required: false;
     };
     endTime: {
-        type: StringConstructor;
-        required: true;
+        type: (StringConstructor | NumberConstructor)[];
+        required: false;
     };
     data: {
-        type: ArrayConstructor;
-        default: () => never[];
+        type: ObjectConstructor;
+        required: false;
     };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    isHandle: {
-        default: boolean;
-        type: BooleanConstructor;
+    type: {
+        default: string;
+        type: StringConstructor;
+    };
+    timeType: {
+        type: StringConstructor;
+        required: false;
     };
     siteCode: {
-        default: string;
         type: StringConstructor;
+        required: false;
     };
-    beginTime: {
+    stationCode: {
         type: StringConstructor;
-        required: true;
+        required: false;
+    };
+    startTime: {
+        type: (StringConstructor | NumberConstructor)[];
+        required: false;
     };
     endTime: {
-        type: StringConstructor;
-        required: true;
+        type: (StringConstructor | NumberConstructor)[];
+        required: false;
     };
     data: {
-        type: ArrayConstructor;
-        default: () => never[];
+        type: ObjectConstructor;
+        required: false;
     };
 }>>, {
-    data: unknown[];
-    siteCode: string;
-    isHandle: boolean;
+    type: string;
 }, {}>;
 export default _default;

package/dist/es/wgms/src/NPTrendChange/index.vue.mjs

@@ -1,83 +1,91 @@
 import { defineComponent, toRefs, watch, nextTick, openBlock, createElementBlock, createElementVNode } from 'vue';
 import echarts from '../../utils/echarts/index.mjs';
-import { getFactorGroupList } from '../../api/FactorTrendComparison/index.mjs';
-import { getNPTrendChange } from '../../api/NPTrendChange/index.mjs';
+import { getNPTrendChange } from './api/index.mjs';
 
 const _hoisted_1 = { class: "dv-wgms-n-p-trend-change" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
-    isHandle: {
-      default: true,
-      type: Boolean
+    type: {
+      default: "automatic",
+      // 默认自动数据 manual（手工数据）
+      type: String
+    },
+    // 时间类型
+    timeType: {
+      type: String,
+      required: false
+      // day
     },
-    // 是否是手工数据
     siteCode: {
-      default: "",
-      // 23239
-      type: String
+      type: String,
+      required: false
+      // zaoleishougong
     },
-    beginTime: {
+    stationCode: {
       type: String,
-      required: true
-      // 1660752000000
+      required: false
+      // w01016
+    },
+    startTime: {
+      type: [String, Number],
+      required: false
+      // 1663257600000
     },
     endTime: {
-      type: String,
-      required: true
-      // 1663344000000
+      type: [String, Number],
+      required: false
+      // 1663257600000
     },
     data: {
-      type: Array,
-      default: () => []
+      type: Object,
+      required: false
     }
-    // 传入数据
   },
   setup(__props) {
     const props = __props;
     const state = {
-      factorMap: [],
-      seriesData: [],
       chartRef: null
       // 图表实例
     };
     const { chartRef } = toRefs(state);
-    watch([() => props.isHandle, () => props.siteCode, () => props.beginTime, () => props.endTime, () => props.data], async () => {
-      if (props.data.length) {
-        await nextTick(() => {
-          initChart();
-        });
-        return;
-      }
-      const groupCode = props.isHandle ? "algae" : "algaeAutomatic";
-      const list = await getFactorGroupList({ code: groupCode });
-      state.factorMap = list[0]?.factors || [];
-      state.factorMap.forEach((item) => {
-        const obj = {
-          name: item.factorIndexName,
-          type: "line",
-          symbolSize: 0,
-          yAxisIndex: item.id === "75" ? 1 : item.id === "23" ? 2 : 0,
-          data: []
-        };
-        state.seriesData.push(obj);
-      });
+    watch([
+      () => props.type,
+      () => props.timeType,
+      () => props.siteCode,
+      () => props.stationCode,
+      () => props.startTime,
+      () => props.endTime,
+      () => props.data
+    ], async () => {
       await nextTick(() => {
-        initChart();
+        initChart(!props.data);
       });
     }, { immediate: true });
-    async function initChart() {
+    async function initChart(flag = true) {
       const params = {
-        startTime: props.beginTime,
-        endTime: props.endTime,
+        // startTime: props.startTime,
+        // endTime: props.endTime,
+        // siteCode: props.siteCode,
+        // timeType: props.type === 'manual' ? 'day' : '',
+        timeType: props.timeType,
         siteCode: props.siteCode,
-        timeType: props.isHandle ? "day" : ""
+        stationCode: props.stationCode,
+        endTime: props.endTime,
+        startTime: props.startTime,
+        dataType: props.type === "automatic" ? 0 : 1
+        // 数据类型 自动/手工(0/1)
       };
-      const res = await getNPTrendChange(params);
-      console.log(res, "res");
-      const timeList = res?.data?.timeList ?? [];
-      const preList = res?.data?.preList ?? [];
-      const xData = timeList.map((item) => item && item.substr(5));
+      let data;
+      if (flag) {
+        const res = await getNPTrendChange(params);
+        data = res?.data;
+      } else {
+        data = props.data;
+      }
+      const timeList = data.map((item) => item.time) ?? [];
+      const preList = data.map((item) => item.percent) ?? [];
+      const xData = timeList.map((item) => item && item);
       const NPList = preList.map((item) => item && item * 100);
       const chart = echarts.init(chartRef.value);
       const options = getChartOptions(xData, NPList, echarts);