@ued_fpi/data-visual 1.2.2 → 1.2.4

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

@@ -4,17 +4,18 @@ export declare const DvWgmsSurroundingPollution: {
         $: import("vue").ComponentInternalInstance;
         $data: {};
         $props: {
+            factor?: number | undefined;
             endTime?: number | undefined;
             startTime?: number | undefined;
-            factorCode?: string | undefined;
-            siteCode?: string | undefined;
             timeType?: string | undefined;
+            latitude?: number | undefined;
+            longitude?: number | undefined;
             distance?: number | undefined;
             overflowPortNum?: string | number | undefined;
             accessCodeList?: unknown[] | undefined;
             timeStamp?: number | undefined;
-            latitude?: string | number | undefined;
-            longitude?: string | number | undefined;
+            limit?: number | undefined;
+            minWave?: number | undefined;
             key?: string | number | symbol | undefined;
             style?: unknown;
             ref?: import("vue").VNodeRef | undefined;
@@ -82,13 +83,9 @@ export declare const DvWgmsSurroundingPollution: {
                 type: NumberConstructor;
                 default: number;
             };
-            factorCode: {
-                type: StringConstructor;
-                default: string;
-            };
-            siteCode: {
-                type: StringConstructor;
-                default: string;
+            factor: {
+                type: NumberConstructor;
+                default: number;
             };
             timeType: {
                 type: StringConstructor;
@@ -111,25 +108,34 @@ export declare const DvWgmsSurroundingPollution: {
                 default: number;
             };
             latitude: {
-                type: (StringConstructor | NumberConstructor)[];
+                type: NumberConstructor;
                 default: number;
             };
             longitude: {
-                type: (StringConstructor | NumberConstructor)[];
+                type: NumberConstructor;
+                default: number;
+            };
+            limit: {
+                type: NumberConstructor;
+                default: number;
+            };
+            minWave: {
+                type: NumberConstructor;
                 default: number;
             };
         }>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+            factor: number;
             endTime: number;
             startTime: number;
-            factorCode: string;
-            siteCode: string;
             timeType: string;
+            latitude: number;
+            longitude: number;
             distance: number;
             overflowPortNum: string | number;
             accessCodeList: unknown[];
             timeStamp: number;
-            latitude: string | number;
-            longitude: string | number;
+            limit: number;
+            minWave: number;
         }, {}, string, {}> & {
             beforeCreate?: ((() => void) | (() => void)[]) | undefined;
             created?: ((() => void) | (() => void)[]) | undefined;
@@ -159,13 +165,9 @@ export declare const DvWgmsSurroundingPollution: {
             type: NumberConstructor;
             default: number;
         };
-        factorCode: {
-            type: StringConstructor;
-            default: string;
-        };
-        siteCode: {
-            type: StringConstructor;
-            default: string;
+        factor: {
+            type: NumberConstructor;
+            default: number;
         };
         timeType: {
             type: StringConstructor;
@@ -188,11 +190,19 @@ export declare const DvWgmsSurroundingPollution: {
             default: number;
         };
         latitude: {
-            type: (StringConstructor | NumberConstructor)[];
+            type: NumberConstructor;
             default: number;
         };
         longitude: {
-            type: (StringConstructor | NumberConstructor)[];
+            type: NumberConstructor;
+            default: number;
+        };
+        limit: {
+            type: NumberConstructor;
+            default: number;
+        };
+        minWave: {
+            type: NumberConstructor;
             default: number;
         };
     }>> & import("vue").ShallowUnwrapRef<{}> & {} & import("vue").ComponentCustomProperties & {};
@@ -208,13 +218,9 @@ export declare const DvWgmsSurroundingPollution: {
         type: NumberConstructor;
         default: number;
     };
-    factorCode: {
-        type: StringConstructor;
-        default: string;
-    };
-    siteCode: {
-        type: StringConstructor;
-        default: string;
+    factor: {
+        type: NumberConstructor;
+        default: number;
     };
     timeType: {
         type: StringConstructor;
@@ -237,24 +243,33 @@ export declare const DvWgmsSurroundingPollution: {
         default: number;
     };
     latitude: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: NumberConstructor;
         default: number;
     };
     longitude: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: NumberConstructor;
+        default: number;
+    };
+    limit: {
+        type: NumberConstructor;
+        default: number;
+    };
+    minWave: {
+        type: NumberConstructor;
         default: number;
     };
 }>>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, {
+    factor: number;
     endTime: number;
     startTime: number;
-    factorCode: string;
-    siteCode: string;
     timeType: string;
+    latitude: number;
+    longitude: number;
     distance: number;
     overflowPortNum: string | number;
     accessCodeList: unknown[];
     timeStamp: number;
-    latitude: string | number;
-    longitude: string | number;
+    limit: number;
+    minWave: number;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & import("vue").Plugin<any[]>;
 export default _SurroundingPollution;

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

@@ -7,13 +7,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    factorCode: {
-        type: StringConstructor;
-        default: string;
-    };
-    siteCode: {
-        type: StringConstructor;
-        default: string;
+    factor: {
+        type: NumberConstructor;
+        default: number;
     };
     timeType: {
         type: StringConstructor;
@@ -36,11 +32,19 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     latitude: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: NumberConstructor;
         default: number;
     };
     longitude: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: NumberConstructor;
+        default: number;
+    };
+    limit: {
+        type: NumberConstructor;
+        default: number;
+    };
+    minWave: {
+        type: NumberConstructor;
         default: number;
     };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -52,13 +56,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: number;
     };
-    factorCode: {
-        type: StringConstructor;
-        default: string;
-    };
-    siteCode: {
-        type: StringConstructor;
-        default: string;
+    factor: {
+        type: NumberConstructor;
+        default: number;
     };
     timeType: {
         type: StringConstructor;
@@ -81,24 +81,33 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     latitude: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: NumberConstructor;
         default: number;
     };
     longitude: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: NumberConstructor;
+        default: number;
+    };
+    limit: {
+        type: NumberConstructor;
+        default: number;
+    };
+    minWave: {
+        type: NumberConstructor;
         default: number;
     };
 }>>, {
+    factor: number;
     endTime: number;
     startTime: number;
-    factorCode: string;
-    siteCode: string;
     timeType: string;
+    latitude: number;
+    longitude: number;
     distance: number;
     overflowPortNum: string | number;
     accessCodeList: unknown[];
     timeStamp: number;
-    latitude: string | number;
-    longitude: string | number;
+    limit: number;
+    minWave: number;
 }, {}>;
 export default _default;

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

@@ -2,7 +2,7 @@ import { defineComponent, reactive, watch, onMounted, toRefs, openBlock, createE
 import dayjs from 'dayjs';
 import _sfc_main$1 from '../common/select-panel.vue.mjs';
 import '../common/select-panel.vue2.mjs';
-import { queryFactorGroup, pomsAlarm, pomsAnalysis, countEventStatusByTimePoint } from './api/index.mjs';
+import { queryFactorGroup, pomsAlarm, countEventStatusByTimePoint } from './api/index.mjs';
 
 const _hoisted_1 = { class: "dv-wgms-surrounding-pollution" };
 const _hoisted_2 = { class: "surrounding-two-flex" };
@@ -59,13 +59,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Number,
       default: dayjs().endOf("year").valueOf()
     },
-    factorCode: {
-      type: String,
-      default: ""
-    },
-    siteCode: {
-      type: String,
-      default: ""
+    factor: {
+      type: Number,
+      default: 27
     },
     timeType: {
       type: String,
@@ -94,12 +90,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     },
     // 经纬度
     latitude: {
-      type: [Number, String],
+      type: Number,
       default: 30.3992
     },
     longitude: {
-      type: [Number, String],
+      type: Number,
       default: 119.9681
+    },
+    limit: {
+      type: Number,
+      default: 3
+    },
+    minWave: {
+      type: Number,
+      default: 2
     }
   },
   setup(__props) {
@@ -112,40 +116,41 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       boundaryData: {
         disposal: 0,
         total: 0
-      }
+      },
       // 周边未处置事件
+      factorsObj: {}
     });
     const getFactorLists = async () => {
       const res = await queryFactorGroup({
         code: "companyPollutionSource"
       });
       const factorsObj = res && res.length ? res[0] : null;
+      data.factorsObj = factorsObj;
       const factors = factorsObj?.factors ?? [];
       const factorList2 = factors.map((item) => {
-        return { ...item, label: item.factorIndexName, value: item.factorIndexCode };
+        return { ...item, label: item.factorIndexName, value: item.id };
       });
       const codes = [];
       factorList2.forEach((item) => {
         codes.push(item.factorIndexCode);
       });
-      const defaultFactor = { value: codes.join(","), label: "所有因子" };
+      const defaultFactor = { value: data.factorsObj?.id, label: "所有因子" };
       factorList2.unshift(defaultFactor);
       data.factorList = factorList2;
       data.curFactor = data.factorList[0].value;
     };
     const getPomsAlarm = async () => {
+      const selectedFactor = data.factorList.find((item) => item.value === data?.curFactor)?.label;
       const params = {
-        startTime: props.startTime,
-        // 开始时间
+        queryTimeType: props?.timeType,
+        beginTime: props.startTime,
         endTime: props.endTime,
-        // 结束时间
-        distance: props.distance,
-        // 距离
-        siteCode: props.siteCode,
-        // 所选站点编码
-        factorCodes: data.curFactor,
-        timeType: props.timeType
-        // 报警类型映射
+        factorFlag: selectedFactor === "所有因子" || !selectedFactor,
+        factor: data?.curFactor,
+        longitude: props.longitude,
+        latitude: props.latitude,
+        distance: props.distance / 1e3,
+        limit: props?.limit
       };
       const res = await pomsAlarm(params);
       data.pomsAlarmData = [];
@@ -162,20 +167,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const getPomsAnalysis = async () => {
       const params = {
-        startTime: props.startTime,
-        // 开始时间
+        queryTimeType: props?.timeType,
+        beginTime: props.startTime,
         endTime: props.endTime,
-        // 结束时间
-        factorCode: props.factorCode,
-        // 因子编码
-        siteCode: props.siteCode,
-        // 所选站点编码
-        distance: props.distance,
-        // 距离
-        timeType: props.timeType
-        // 报警类型映射
+        factorFlag: false,
+        factor: props?.factor,
+        longitude: props.longitude,
+        latitude: props.latitude,
+        distance: props.distance / 1e3,
+        limit: props?.limit,
+        minWave: props?.minWave
       };
-      const res = await pomsAnalysis(params);
+      const res = await pomsAlarm(params);
       const resData = res?.data || [];
       data.pomsAnalysisData = resData.slice(0, 3);
     };
@@ -197,14 +200,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         data.boundaryData.total = res.data.totalCount;
       }
     };
-    watch(() => [props.startTime, props.endTime, props.siteCode, props.timeType, props.distance], () => {
+    watch(() => [props.startTime, props.endTime, props.factor, props.timeType, props.distance, props.limit, props.minWave], () => {
       getPomsAlarm();
       getPomsAnalysis();
     });
-    watch(() => [props.factorCode], () => {
+    watch(() => [props.latitude, props.longitude], () => {
+      getBoundaryAnalysis();
+      getPomsAlarm();
       getPomsAnalysis();
     });
-    watch(() => [props.accessCodeList, props.timeStamp, props.latitude, props.longitude], () => {
+    watch(() => [props.accessCodeList, props.timeStamp], () => {
       getBoundaryAnalysis();
     });
     onMounted(() => {

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

@@ -2,8 +2,8 @@ import requestControl from '../../../service/request.mjs';
 
 const pathAnalysis = (params) => {
   return requestControl({
-    url: "/water/alarm/analyse/path-analysis-new",
-    server: "wgmsPHZ",
+    url: "/api/v3.0/surfaceWater/analyse/path-analyse",
+    server: "wgmsMonitorDataServer",
     params
   });
 };
@@ -16,7 +16,7 @@ const waterSurfaceListAll = (params) => {
 };
 const surfaceWaterStandard = (params) => {
   return requestControl({
-    url: "/api/v1.0/factor/surfaceWaterStandard",
+    url: "/api/v3.0/quality/limit/surfaceWater",
     server: "wgmsMonitorDataServer",
     params
   });

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

@@ -1,15 +1,18 @@
 export declare namespace UPSTREAM_IMPACT_API_REQUEST {
     interface pathAnalysis {
-        time: number;
-        factorCode: string;
-        siteCode: string;
-        sourceIds: string;
-        timeType: string;
+        accessCode: string;
+        factor: number | string;
+        beginTime: number;
+        endTime: number;
+        queryTimeType: string;
+        limit: number;
     }
     interface surfaceWaterStandard {
+        accessCodeList?: string;
         baseLevel: string | number;
-        factorGroup: string;
-        sectionType: string;
+        factor: number | string;
+        factorFlag?: boolean;
+        configTime: number;
     }
 }
 export declare namespace UPSTREAM_IMPACT_API_RESPONSE {