gisviewer-vue3-arcgis 1.0.247 → 1.0.249

package/es/src/gis-map/utils/edpass-device-controller.mjs

@@ -1,24 +1,28 @@
 import * as h from "@arcgis/core/core/reactiveUtils.js";
-import d from "@arcgis/core/Graphic";
-import o from "@arcgis/core/layers/GraphicsLayer";
-import { toRaw as u } from "vue";
-import v from "../stores/index.mjs";
-class x {
+import u from "@arcgis/core/Graphic";
+import l from "@arcgis/core/layers/GraphicsLayer";
+import { toRaw as v } from "vue";
+import b from "../stores/index.mjs";
+class I {
   constructor(e) {
-    this.watchHandle = null, this.view = e;
-    const t = v.useAppDataStore;
-    this.mapInitializer = u(t.mapInitializer), this.cameraNormalLayer = new o({
-      id: "cameraNormalLayer"
-    }), this.kkNormalLayer = new o({
-      id: "kkNormalLayer"
-    }), this.cameraAbnormalLayer = new o({
-      id: "cameraAbnormalLayer"
-    }), this.kkAbnormalLayer = new o({
-      id: "kkAbnormalLayer"
+    this.watchHandle = null, this.currentZdCode = "", this.currentDdCode = "", this.view = e;
+    const t = b.useAppDataStore;
+    this.mapInitializer = v(t.mapInitializer), this.cameraNormalLayer = new l({
+      id: "cameraNormalLayer",
+      visible: !1
+    }), this.cameraAbnormalLayer = new l({
+      id: "cameraAbnormalLayer",
+      visible: !1
+    }), this.kkNormalLayer = new l({
+      id: "kkNormalLayer",
+      visible: !1
+    }), this.kkAbnormalLayer = new l({
+      id: "kkAbnormalLayer",
+      visible: !1
     }), this.view.map.addMany([
       this.cameraNormalLayer,
-      this.kkNormalLayer,
       this.cameraAbnormalLayer,
+      this.kkNormalLayer,
       this.kkAbnormalLayer
     ]);
   }
@@ -34,7 +38,7 @@ class x {
         });
       case "cluster": {
         const { deviceLayer: i } = this.getLayerConfig(e);
-        i.visible = e.visible, e.visible ? (await this.showClusterInExtent(e, this.view.extent), this.watchHandle || (this.watchHandle = h.when(
+        i.visible = e.visible, this.currentDdCode = e.ddCode || "", this.currentZdCode = e.zdCode || "", e.visible ? (await this.showClusterInExtent(e, this.view.extent), this.watchHandle || (this.watchHandle = h.when(
           () => this.view.stationary,
           async () => {
             this.cameraNormalLayer.visible && await this.showClusterInExtent(
@@ -42,6 +46,8 @@ class x {
                 deviceType: "camera",
                 deviceState: "normal",
                 mode: "cluster",
+                ddCode: this.currentDdCode,
+                zdCode: this.currentZdCode,
                 visible: !0
               },
               this.view.extent
@@ -50,6 +56,8 @@ class x {
                 deviceType: "camera",
                 deviceState: "abnormal",
                 mode: "cluster",
+                ddCode: this.currentDdCode,
+                zdCode: this.currentZdCode,
                 visible: !0
               },
               this.view.extent
@@ -58,6 +66,8 @@ class x {
                 deviceType: "kk",
                 deviceState: "normal",
                 mode: "cluster",
+                ddCode: this.currentDdCode,
+                zdCode: this.currentZdCode,
                 visible: !0
               },
               this.view.extent
@@ -66,6 +76,8 @@ class x {
                 deviceType: "kk",
                 deviceState: "abnormal",
                 mode: "cluster",
+                ddCode: this.currentDdCode,
+                zdCode: this.currentZdCode,
                 visible: !0
               },
               this.view.extent
@@ -81,15 +93,14 @@ class x {
     };
   }
   getLayerConfig(e) {
-    let t, i, r;
-    return e.deviceType === "camera" ? e.deviceState === "normal" ? (t = "/GisViewerAssets/Images/gis/gis_sxj_map.png", i = [45, 108, 196], r = this.cameraNormalLayer) : (t = "/GisViewerAssets/Images/gis/gis_sxj_yc.png", i = [189, 49, 50], r = this.cameraAbnormalLayer) : e.deviceState === "normal" ? (t = "/GisViewerAssets/Images/gis/gis_kk_map.png", i = [45, 108, 196], r = this.kkNormalLayer) : (t = "/GisViewerAssets/Images/gis/gis_kk_yc.png", i = [189, 49, 50], r = this.kkAbnormalLayer), {
+    let t, i, a;
+    return e.deviceType === "camera" ? e.deviceState === "normal" ? (t = "/GisViewerAssets/Images/gis/gis_sxj_map.png", i = [45, 108, 196], a = this.cameraNormalLayer) : (t = "/GisViewerAssets/Images/gis/gis_sxj_yc.png", i = [189, 49, 50], a = this.cameraAbnormalLayer) : e.deviceState === "normal" ? (t = "/GisViewerAssets/Images/gis/gis_kk_map.png", i = [45, 108, 196], a = this.kkNormalLayer) : (t = "/GisViewerAssets/Images/gis/gis_kk_yc.png", i = [189, 49, 50], a = this.kkAbnormalLayer), {
       icon: t,
       color: i,
-      deviceLayer: r
+      deviceLayer: a
     };
   }
   async showClusterInExtent(e, t) {
-    console.time("request");
     const i = await fetch("/es/queryGeoAggregation", {
       method: "POST",
       headers: {
@@ -102,7 +113,8 @@ class x {
         bottomRightLat: t.ymin,
         bottomRightLon: t.xmax,
         devStateSet: [e.deviceState === "normal" ? "1" : "2"],
-        // meter: Math.round(this.view.scale / 6)
+        zdCode: e.zdCode || "",
+        ddCode: e.ddCode || "",
         mapLevel: this.view.zoom + 9
       })
     });
@@ -110,128 +122,156 @@ class x {
       console.error(i.statusText);
       return;
     }
-    const r = await i.json();
-    if (r.code !== 200)
+    const a = await i.json();
+    if (a.code !== 200)
       return;
-    console.timeEnd("request"), console.time("render");
-    const { icon: l, color: n, deviceLayer: c } = this.getLayerConfig(e);
-    c.removeAll();
-    const m = r.data.map((a, y) => {
-      const s = (a.count.toString().length * 6 + 6) / 2;
-      return new d({
+    const { icon: n, color: c, deviceLayer: d } = this.getLayerConfig(e);
+    d.removeAll();
+    const m = a.data.map((r) => {
+      var y;
+      const o = (r.count.toString().length * 6 + 6) / 2, s = new u({
         geometry: {
           type: "point",
-          x: a.lon,
-          y: a.lat
+          x: r.lon,
+          y: r.lat
         },
         attributes: {
-          gid: y,
-          count: a.count
-        },
-        symbol: a.count > 1 ? {
-          type: "cim",
-          data: {
-            type: "CIMSymbolReference",
-            symbol: {
-              type: "CIMPointSymbol",
-              symbolLayers: [
-                // 聚合数量
-                {
-                  type: "CIMVectorMarker",
-                  size: 32,
-                  colorLocked: !0,
-                  anchorPointUnits: "Relative",
-                  frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
-                  markerGraphics: [
-                    // 数量文本框
-                    {
-                      type: "CIMMarkerGraphic",
-                      geometry: {
-                        rings: [
-                          [
-                            [-s, 30],
-                            [s, 30],
-                            [s, 15],
-                            [-s, 15],
-                            [-s, 30]
-                          ]
+          id: ((y = r.devInfo) == null ? void 0 : y.deviceId) || r.key,
+          type: e.deviceType,
+          count: r.count,
+          typeName: e.deviceType === "camera" ? "视频" : "卡口",
+          stateName: e.deviceState === "normal" ? "正常" : "异常",
+          ...r.devInfo
+        }
+      });
+      return r.count > 1 ? s.symbol = {
+        type: "cim",
+        data: {
+          type: "CIMSymbolReference",
+          symbol: {
+            type: "CIMPointSymbol",
+            symbolLayers: [
+              // 聚合数量
+              {
+                type: "CIMVectorMarker",
+                size: 32,
+                colorLocked: !0,
+                anchorPointUnits: "Relative",
+                frame: { xmin: -16, ymin: -16, xmax: 16, ymax: 16 },
+                markerGraphics: [
+                  // 数量文本框
+                  {
+                    type: "CIMMarkerGraphic",
+                    geometry: {
+                      rings: [
+                        [
+                          [-o, 30],
+                          [o, 30],
+                          [o, 15],
+                          [-o, 15],
+                          [-o, 30]
                         ]
-                      },
+                      ]
+                    },
+                    symbol: {
+                      type: "CIMPolygonSymbol",
+                      symbolLayers: [
+                        {
+                          type: "CIMSolidFill",
+                          enable: !0,
+                          color: c.concat([255])
+                        },
+                        {
+                          type: "CIMSolidStroke",
+                          enable: !0,
+                          width: 3,
+                          color: c.concat([128])
+                        }
+                      ]
+                    }
+                  },
+                  // 数量文字
+                  {
+                    type: "CIMMarkerGraphic",
+                    primitiveName: "textGraphic",
+                    geometry: { x: 0, y: 0 },
+                    symbol: {
+                      type: "CIMTextSymbol",
+                      fontFamilyName: "msyh",
+                      height: 12,
+                      horizontalAlignment: "Center",
+                      offsetX: 0,
+                      offsetY: 22,
                       symbol: {
                         type: "CIMPolygonSymbol",
                         symbolLayers: [
                           {
                             type: "CIMSolidFill",
                             enable: !0,
-                            color: n.concat([255])
-                          },
-                          {
-                            type: "CIMSolidStroke",
-                            enable: !0,
-                            width: 3,
-                            color: n.concat([128])
+                            color: [255, 255, 255, 255]
                           }
                         ]
-                      }
-                    },
-                    // 数量文字
-                    {
-                      type: "CIMMarkerGraphic",
-                      primitiveName: "textGraphic",
-                      geometry: { x: 0, y: 0 },
-                      symbol: {
-                        type: "CIMTextSymbol",
-                        fontFamilyName: "msyh",
-                        height: 12,
-                        horizontalAlignment: "Center",
-                        offsetX: 0,
-                        offsetY: 22,
-                        symbol: {
-                          type: "CIMPolygonSymbol",
-                          symbolLayers: [
-                            {
-                              type: "CIMSolidFill",
-                              enable: !0,
-                              color: [255, 255, 255, 255]
-                            }
-                          ]
-                        },
-                        verticalAlignment: "Center"
                       },
-                      textString: a.count.toString()
-                    }
-                  ],
-                  scaleSymbolsProportionally: !0,
-                  respectFrame: !0
+                      verticalAlignment: "Center"
+                    },
+                    textString: r.count.toString()
+                  }
+                ],
+                scaleSymbolsProportionally: !0,
+                respectFrame: !0
+              },
+              // 聚合图标
+              {
+                type: "CIMPictureMarker",
+                enable: !0,
+                anchorPoint: {
+                  x: 0,
+                  y: 0
                 },
-                // 聚合图标
-                {
-                  type: "CIMPictureMarker",
-                  enable: !0,
-                  anchorPoint: {
-                    x: 0,
-                    y: 0
-                  },
-                  anchorPointUnits: "Relative",
-                  size: 24,
-                  rotateClockwise: !0,
-                  textureFilter: "Picture",
-                  url: l
-                }
-              ]
-            }
+                anchorPointUnits: "Relative",
+                size: 24,
+                rotateClockwise: !0,
+                textureFilter: "Picture",
+                url: n
+              }
+            ]
           }
-        } : {
-          type: "picture-marker",
-          url: l,
-          width: 24,
-          height: 24
         }
-      });
+      } : (s.symbol = {
+        type: "picture-marker",
+        url: n,
+        width: 18,
+        height: 18
+      }, s.popupTemplate = {
+        title: "视频信息",
+        content: [
+          {
+            type: "fields",
+            fieldInfos: [
+              {
+                fieldName: "deviceId",
+                label: "设备编号"
+              },
+              {
+                fieldName: "deviceName",
+                label: "设备名称"
+              },
+              {
+                fieldName: "typeName",
+                label: "设备类型"
+              },
+              {
+                fieldName: "stateName",
+                label: "设备状态"
+              }
+            ]
+          }
+        ]
+      }), s;
     });
-    c.addMany(m), console.timeEnd("render");
+    d.addMany(m);
   }
 }
 export {
-  x as default
+  I as default
 };

package/es/src/gis-map/utils/green-wave-band-controller/index.mjs

@@ -42,7 +42,11 @@ class w {
     }), a = new c({
       geometry: o,
       symbol: this.getLineSymbol(!0),
-      attributes: { bandId: e.bandId }
+      attributes: {
+        bandId: e.bandId,
+        type: "greenWaveBand",
+        id: e.bandId
+      }
     });
     this.roadsectLayer.add(a), await this.view.goTo(a), e.nodeList.forEach((s) => {
       const i = new c({

package/es/src/gis-map/utils/map-initializer.d.ts

@@ -23,6 +23,7 @@ export default class MapInitializer {
      * @returns
      */
     setMapCenter(params: ISetMapCenterParams): Promise<IResult>;
+    setMapZoom(zoom: number): IResult;
     /**
      * 在一定的高度，以一定的角度去观察某个坐标
      * */