@ued_fpi/data-visual 1.2.2 → 1.2.4

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

@@ -7,17 +7,17 @@ export declare const DvWgmsPollutionSourceControl: {
             data?: unknown[] | undefined;
             beginTime?: number | undefined;
             endTime?: number | undefined;
-            siteCode?: string | number | undefined;
             timeType?: string | undefined;
             distance?: number | undefined;
             factorList?: {
                 label: string;
                 value: string;
             }[] | undefined;
-            isLazy?: boolean | undefined;
+            siteCode?: string | number | undefined;
             stationCode?: string | number | undefined;
-            isHandle?: boolean | undefined;
+            isLazy?: boolean | undefined;
             defaultSelectFactor?: string | undefined;
+            isHandle?: boolean | undefined;
             key?: string | number | symbol | undefined;
             style?: unknown;
             ref?: import("vue").VNodeRef | undefined;
@@ -135,17 +135,17 @@ export declare const DvWgmsPollutionSourceControl: {
             data: unknown[];
             beginTime: number;
             endTime: number;
-            siteCode: string | number;
             timeType: string;
             distance: number;
             factorList: {
                 label: string;
                 value: string;
             }[];
-            isLazy: boolean;
+            siteCode: string | number;
             stationCode: string | number;
-            isHandle: boolean;
+            isLazy: boolean;
             defaultSelectFactor: string;
+            isHandle: boolean;
         }, {}, string, {}> & {
             beforeCreate?: ((() => void) | (() => void)[]) | undefined;
             created?: ((() => void) | (() => void)[]) | undefined;
@@ -282,16 +282,16 @@ export declare const DvWgmsPollutionSourceControl: {
     data: unknown[];
     beginTime: number;
     endTime: number;
-    siteCode: string | number;
     timeType: string;
     distance: number;
     factorList: {
         label: string;
         value: string;
     }[];
-    isLazy: boolean;
+    siteCode: string | number;
     stationCode: string | number;
-    isHandle: boolean;
+    isLazy: boolean;
     defaultSelectFactor: string;
+    isHandle: boolean;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]>;
 export default _PollutionSourceControl;

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

@@ -105,16 +105,16 @@ declare const _default: import("vue").DefineComponent<{
     data: unknown[];
     beginTime: number;
     endTime: number;
-    siteCode: string | number;
     timeType: string;
     distance: number;
     factorList: {
         label: string;
         value: string;
     }[];
-    isLazy: boolean;
+    siteCode: string | number;
     stationCode: string | number;
-    isHandle: boolean;
+    isLazy: boolean;
     defaultSelectFactor: string;
+    isHandle: boolean;
 }, {}>;
 export default _default;

package/dist/es/wgms/src/SevenDayKline/api/index.d.ts

@@ -11,3 +11,11 @@ export declare const getKLine: (params: SEVEN_DAY_KLINE_API_REQUEST.getKLine) =>
     data: SEVEN_DAY_KLINE_API_RESPONSE.getKLineTs[] | null;
     message: string;
 }>;
+/**
+ * @name: waterSurfaceListAll
+ * @test: test font
+ * @msg: 地表水断面水质等级
+ * @param {UPSTREAM_IMPACT_API_REQUEST} params
+ * @return {*}
+ */
+export declare const waterSurfaceListAll: (params: {}) => Promise<any>;

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

@@ -0,0 +1,19 @@
+import requestControl from '../../../service/request.mjs';
+
+const getKLine = (params) => {
+  return requestControl({
+    url: "/api/v1.0/analyse/kLineAnalyse",
+    server: "wgmsMonitorDataServer",
+    method: "get",
+    params
+  });
+};
+const waterSurfaceListAll = (params) => {
+  return requestControl({
+    url: "/api/v1.0/water/qualityGrade/listAll",
+    server: "envStandardManagerServer",
+    params
+  });
+};
+
+export { getKLine, waterSurfaceListAll };

package/dist/es/wgms/src/SevenDayKline/api/types.d.ts

@@ -1,10 +1,11 @@
 export declare namespace SEVEN_DAY_KLINE_API_REQUEST {
     interface getKLine {
-        startTime: number;
+        accessCode: string;
+        factor: number | string;
+        factorFlag: boolean;
+        beginTime: number;
         endTime: number;
-        factorCode: string;
-        siteCode: string;
-        timeType: string;
+        queryTimeType: string;
     }
 }
 export declare namespace SEVEN_DAY_KLINE_API_RESPONSE {

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

@@ -4,14 +4,14 @@ export declare const DvWgmsSevenDayKline: {
         $: import("vue").ComponentInternalInstance;
         $data: {};
         $props: {
+            factor?: number | undefined;
+            beginTime?: number | undefined;
             endTime?: number | undefined;
-            startTime?: number | undefined;
-            factorCode?: string | undefined;
-            siteCode?: string | undefined;
             timeType?: string | undefined;
             factorName?: string | undefined;
             factorUnit?: string | undefined;
-            siteName?: string | undefined;
+            accessCode?: string | undefined;
+            factorFlag?: boolean | undefined;
             key?: string | number | symbol | undefined;
             style?: unknown;
             ref?: import("vue").VNodeRef | undefined;
@@ -71,7 +71,7 @@ export declare const DvWgmsSevenDayKline: {
         $emit: (event: string, ...args: any[]) => void;
         $el: any;
         $options: import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
-            startTime: {
+            beginTime: {
                 type: NumberConstructor;
                 default: number;
             };
@@ -79,11 +79,11 @@ export declare const DvWgmsSevenDayKline: {
                 type: NumberConstructor;
                 default: number;
             };
-            factorCode: {
-                type: StringConstructor;
-                default: string;
+            factor: {
+                type: NumberConstructor;
+                default: number;
             };
-            siteCode: {
+            accessCode: {
                 type: StringConstructor;
                 default: string;
             };
@@ -91,6 +91,10 @@ export declare const DvWgmsSevenDayKline: {
                 type: StringConstructor;
                 default: string;
             };
+            factorFlag: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
             factorName: {
                 type: StringConstructor;
                 default: string;
@@ -99,19 +103,15 @@ export declare const DvWgmsSevenDayKline: {
                 type: StringConstructor;
                 default: string;
             };
-            siteName: {
-                type: StringConstructor;
-                default: string;
-            };
         }>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+            factor: number;
+            beginTime: number;
             endTime: number;
-            startTime: number;
-            factorCode: string;
-            siteCode: string;
             timeType: string;
             factorName: string;
             factorUnit: string;
-            siteName: string;
+            accessCode: string;
+            factorFlag: boolean;
         }, {}, string, {}> & {
             beforeCreate?: ((() => void) | (() => void)[]) | undefined;
             created?: ((() => void) | (() => void)[]) | undefined;
@@ -133,7 +133,7 @@ export declare const DvWgmsSevenDayKline: {
         $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<{
-        startTime: {
+        beginTime: {
             type: NumberConstructor;
             default: number;
         };
@@ -141,11 +141,11 @@ export declare const DvWgmsSevenDayKline: {
             type: NumberConstructor;
             default: number;
         };
-        factorCode: {
-            type: StringConstructor;
-            default: string;
+        factor: {
+            type: NumberConstructor;
+            default: number;
         };
-        siteCode: {
+        accessCode: {
             type: StringConstructor;
             default: string;
         };
@@ -153,6 +153,10 @@ export declare const DvWgmsSevenDayKline: {
             type: StringConstructor;
             default: string;
         };
+        factorFlag: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         factorName: {
             type: StringConstructor;
             default: string;
@@ -161,16 +165,12 @@ export declare const DvWgmsSevenDayKline: {
             type: StringConstructor;
             default: string;
         };
-        siteName: {
-            type: StringConstructor;
-            default: string;
-        };
     }>> & import("vue").ShallowUnwrapRef<{}> & {} & import("vue").ComponentCustomProperties & {};
     __isFragment?: undefined;
     __isTeleport?: undefined;
     __isSuspense?: undefined;
 } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
-    startTime: {
+    beginTime: {
         type: NumberConstructor;
         default: number;
     };
@@ -178,11 +178,11 @@ export declare const DvWgmsSevenDayKline: {
         type: NumberConstructor;
         default: number;
     };
-    factorCode: {
-        type: StringConstructor;
-        default: string;
+    factor: {
+        type: NumberConstructor;
+        default: number;
     };
-    siteCode: {
+    accessCode: {
         type: StringConstructor;
         default: string;
     };
@@ -190,6 +190,10 @@ export declare const DvWgmsSevenDayKline: {
         type: StringConstructor;
         default: string;
     };
+    factorFlag: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     factorName: {
         type: StringConstructor;
         default: string;
@@ -198,18 +202,14 @@ export declare const DvWgmsSevenDayKline: {
         type: StringConstructor;
         default: string;
     };
-    siteName: {
-        type: StringConstructor;
-        default: string;
-    };
 }>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+    factor: number;
+    beginTime: number;
     endTime: number;
-    startTime: number;
-    factorCode: string;
-    siteCode: string;
     timeType: string;
     factorName: string;
     factorUnit: string;
-    siteName: string;
+    accessCode: string;
+    factorFlag: boolean;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]>;
 export default _SevenDayKline;

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

@@ -1,5 +1,5 @@
 declare const _default: import("vue").DefineComponent<{
-    startTime: {
+    beginTime: {
         type: NumberConstructor;
         default: number;
     };
@@ -7,11 +7,11 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    factorCode: {
-        type: StringConstructor;
-        default: string;
+    factor: {
+        type: NumberConstructor;
+        default: number;
     };
-    siteCode: {
+    accessCode: {
         type: StringConstructor;
         default: string;
     };
@@ -19,6 +19,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    factorFlag: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     factorName: {
         type: StringConstructor;
         default: string;
@@ -27,12 +31,8 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    siteName: {
-        type: StringConstructor;
-        default: string;
-    };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    startTime: {
+    beginTime: {
         type: NumberConstructor;
         default: number;
     };
@@ -40,11 +40,11 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    factorCode: {
-        type: StringConstructor;
-        default: string;
+    factor: {
+        type: NumberConstructor;
+        default: number;
     };
-    siteCode: {
+    accessCode: {
         type: StringConstructor;
         default: string;
     };
@@ -52,6 +52,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    factorFlag: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     factorName: {
         type: StringConstructor;
         default: string;
@@ -60,18 +64,14 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    siteName: {
-        type: StringConstructor;
-        default: string;
-    };
 }>>, {
+    factor: number;
+    beginTime: number;
     endTime: number;
-    startTime: number;
-    factorCode: string;
-    siteCode: string;
     timeType: string;
     factorName: string;
     factorUnit: string;
-    siteName: string;
+    accessCode: string;
+    factorFlag: boolean;
 }, {}>;
 export default _default;

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

@@ -2,12 +2,13 @@ import { defineComponent, ref, reactive, watch, onMounted, nextTick, toRefs, ope
 import dayjs from 'dayjs';
 import { maxBy, minBy } from 'lodash-es';
 import echarts from '../../utils/echarts/index.mjs';
+import { getKLine, waterSurfaceListAll } from './api/index.mjs';
 
 const _hoisted_1 = { class: "dv-wgms-seven-day-kline" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
-    startTime: {
+    beginTime: {
       type: Number,
       default: dayjs().startOf("year").valueOf()
     },
@@ -15,17 +16,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Number,
       default: dayjs().endOf("year").valueOf()
     },
-    factorCode: {
-      type: String,
-      default: ""
+    factor: {
+      type: Number,
+      default: 27
     },
-    siteCode: {
+    accessCode: {
       type: String,
-      default: ""
+      default: "GKA330100_2009"
     },
     timeType: {
       type: String,
-      default: "hour"
+      default: "day"
+    },
+    factorFlag: {
+      type: Boolean,
+      default: false
     },
     // 因子名称
     factorName: {
@@ -36,11 +41,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     factorUnit: {
       type: String,
       default: "mg/L"
-    },
-    // 站点名称
-    siteName: {
-      type: String,
-      default: ""
     }
   },
   setup(__props) {
@@ -57,16 +57,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       title: "",
       unit: "mg/L",
       factorName: "总磷(以 P 计）",
-      siteName: "",
       params: {
-        startTime: 16706016e5,
+        accessCode: "JMSZSY0007",
+        factor: 27,
+        factorFlag: false,
+        beginTime: 16706016e5,
         endTime: 1671206399999,
-        factorCode: "w21011",
-        siteCode: "JMSZSY0007",
-        timeType: "day"
+        queryTimeType: "hour"
       }
     });
-    watch(() => [props.startTime, props.endTime, props.factorCode, props.siteCode, props.timeType], () => {
+    watch(() => [props.beginTime, props.endTime, props.factor, props.accessCode, props.timeType, props.factorFlag], () => {
       initData();
     });
     onMounted(async () => {
@@ -75,16 +75,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const initData = () => {
       data.params = {
-        startTime: props?.startTime,
+        accessCode: props?.accessCode,
+        factor: props?.factor,
+        factorFlag: props?.factorFlag,
+        beginTime: props?.beginTime,
         endTime: props?.endTime,
-        factorCode: props?.factorCode,
-        siteCode: props?.siteCode,
-        timeType: props?.timeType
+        queryTimeType: props?.timeType
       };
       data.factorName = props?.factorName;
       data.unit = props?.factorUnit;
-      data.siteName = props?.siteName || "";
-      data.title = `最近7天${data.siteName}${data.factorName}K线与日变化趋势图`;
       getData();
     };
     const getYearWeek = async (date) => {
@@ -97,7 +96,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return week;
     };
     const getData = async () => {
-      const resData = [
+      const res = await getKLine(data.params);
+      const isHasData = res && res.data && res.data.length > 0;
+      const mockData = [
         {
           time: "1671120000000",
           value: "0.21",
@@ -162,6 +163,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           lastValue: "0.02"
         }
       ];
+      const resData = isHasData ? res?.data : mockData;
       const klineData = {
         xAxis: [],
         kData: [],
@@ -171,7 +173,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       resData.forEach((item) => {
         item.maxValue = Number(item.maxValue);
         item.minValue = Number(item.minValue);
-        if (data.params.timeType === "week")
+        if (props.timeType === "week")
           klineData.xAxis.push(`${getYearWeek(+item.time)}周`);
         else
           klineData.xAxis.push(dayjs.unix(Number(item.time) / 1e3).format("MM-DD"));
@@ -182,12 +184,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const maxObj = maxBy(resData, "maxValue");
       const minObj = minBy(resData, "minValue");
       nextTick();
-      const lineOptions = await dayKLine(klineData, maxObj.maxValue, minObj.minValue, data.factorName, data.unit, timeStrList[data.params.timeType]);
+      const lineOptions = await dayKLine(klineData, maxObj?.maxValue, minObj?.minValue, data.factorName, data.unit, timeStrList[props.timeType]);
       echarts.draw(chartSevenDayLine.value, lineOptions);
     };
     const dayKLine = async (data2, min, max, factorName, unit, timeStr) => {
       const { xAxis, kData, values, quality } = data2;
-      const gradeList = [];
+      const res = await waterSurfaceListAll({});
+      const gradeList = res?.entries ?? [];
       const option = {
         grid: [
           {
@@ -235,7 +238,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             axisLabel: {
               show: true,
               textStyle: {
-                fontFamily: "Oswald",
+                fontFamily: "var(--dv-font-family-number)",
                 fontSize: "12",
                 color: "rgba(255,255,255,1)"
               }

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

@@ -9,15 +9,8 @@ const queryFactorGroup = (params) => {
 };
 const pomsAlarm = (params) => {
   return requestControl({
-    url: "/water/alarm/analyse/poms-alarm",
-    server: "wgmsPHZ",
-    params
-  });
-};
-const pomsAnalysis = (params) => {
-  return requestControl({
-    url: "/water/alarm/analyse/poms-analysis",
-    server: "wgmsPHZ",
+    url: "/api/v3.0/analyse/poms-analyse",
+    server: "wgmsSewageDataServer",
     params
   });
 };
@@ -31,4 +24,4 @@ const countEventStatusByTimePoint = (data, option = {}) => {
   });
 };
 
-export { countEventStatusByTimePoint, pomsAlarm, pomsAnalysis, queryFactorGroup };
+export { countEventStatusByTimePoint, pomsAlarm, queryFactorGroup };

package/dist/es/wgms/src/SurroundingPollution/api/types.d.ts

@@ -3,12 +3,16 @@ export declare namespace SURROUND_POLLUTION_API_REQUEST {
         code: string;
     }
     interface pomsAlarm {
-        startTime: number;
+        queryTimeType: string;
+        beginTime: number;
         endTime: number;
+        factorFlag: boolean;
+        factor: number;
+        longitude: number;
+        latitude: number;
         distance: number;
-        siteCode: string;
-        factorCodes: string;
-        timeType: string;
+        limit: number;
+        minWave?: number;
     }
     interface pomsAnalysis {
         startTime: number;