diff --git a/src/api/bigScreenApi/index.js b/src/api/bigScreenApi/index.js
index 0d2caf7..fb66f25 100644
--- a/src/api/bigScreenApi/index.js
+++ b/src/api/bigScreenApi/index.js
@@ -84,6 +84,15 @@ export function fence(params){
   })
 }
 
+// 网格
+export function bgridsetting(params){
+  return request({
+    url:'/jn/bgridsetting/list',
+    method:'get',
+    params
+  })
+}
+
 
 /**
  * 车辆管理
diff --git a/src/api/bigScreenApi/robot.js b/src/api/bigScreenApi/robot.js
index c8b5b49..812ef7e 100644
--- a/src/api/bigScreenApi/robot.js
+++ b/src/api/bigScreenApi/robot.js
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-11 23:19:29
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-12 12:39:16
+ * @LastEditTime: 2024-01-12 23:59:57
  */
 import request from "@/utils/request1"
 
@@ -38,7 +38,7 @@ export function ViewListPage(params,data){
  * 
  * 任务派发流程
  */
-// 任务派发流程
+// 任务派发流程----3调用自动提交
 export function autoSubmit(data){
   return request({
     url: "/api/bpm/bpm-front/operateRest/autoSubmit/v1",
@@ -46,7 +46,7 @@ export function autoSubmit(data){
     data
   })
 }
-// 任务派至城管队长----获取流程权限
+// 任务派至城管队长----1获取流程权限
 export function getBpmOperateVo(params){
   return request({
     url: "/api/bpm/bpm-front/displayRest/getBpmOperateVo/v1",
@@ -54,7 +54,7 @@ export function getBpmOperateVo(params){
     params
   })
 }
-// 任务派至城管队长----保存业务数据
+// 任务派至城管队长----2保存业务数据
 export function distributeSaveData(params,data){
   return request({
     url: "/api/eform/engine/formEngine/saveData",
diff --git a/src/permission.js b/src/permission.js
index db35df0..f00fe49 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-09 23:08:15
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-12 10:52:53
+ * @LastEditTime: 2024-01-17 11:08:57
  */
 import router from './router'
 import store from './store'
@@ -42,9 +42,11 @@ router.beforeEach((to, from, next) => {
       //   localStorage.setItem('AuserInfo', JSON.stringify(el.data))
         
       // })
+    } else {
+      location.href = "https://t-jn-bjh-admin.jsszkd.com/"
     }
   }
-  next()
+  // next()
 
   // if (getToken()) {
   //   to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
diff --git a/src/utils/mapJson/开发区空港开发区GJ02.json b/src/utils/mapJson/开发区空港开发区GJ02.json
index 6ac38c1..c944046 100644
--- a/src/utils/mapJson/开发区空港开发区GJ02.json
+++ b/src/utils/mapJson/开发区空港开发区GJ02.json
@@ -15,7 +15,7 @@
         "CENTERX": 118.80091257948892,
         "CENTERY": 31.890183680582105,
         "CODE": "320115402",
-        "NAME": "开发区空港开发区",
+        "NAME": "空港开发区",
         "NOTE": null,
         "SHAPE_AREA": 73241240.470899999,
         "SHAPE_LENG": 50271.742558899998,
diff --git a/src/utils/mapJson/开发区软件园GJ02.json b/src/utils/mapJson/开发区软件园GJ02.json
index 87cdb28..f49bd2e 100644
--- a/src/utils/mapJson/开发区软件园GJ02.json
+++ b/src/utils/mapJson/开发区软件园GJ02.json
@@ -3,6 +3,6 @@
 "name": "开发区软件园GJ02",
 "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
 "features": [
-{ "type": "Feature", "properties": { "fid": 1.0, "CENTERX": 118.762835877664, "CENTERY": 31.890183680582105, "CODE": "320115402", "NAME": "开发区软件园", "NOTE": null, "SHAPE_AREA": 73241240.470899999, "SHAPE_LENG": 50271.742558899998, "SUMCASE": null, "USERID01": null, "USERID012": null, "USERID0123": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.795924761210415, 31.822844740193673 ], [ 118.791994007008626, 31.821915813271012 ], [ 118.789036842569587, 31.821275807449588 ], [ 118.782049907996893, 31.82025349400611 ], [ 118.773741979907015, 31.819054743529094 ], [ 118.768799612966433, 31.818718500351526 ], [ 118.759493119753984, 31.819742115723148 ], [ 118.751025302463788, 31.820997622322786 ], [ 118.74837406041577, 31.821381065686541 ], [ 118.749448221670164, 31.831464595478231 ], [ 118.74957711296527, 31.83262312332057 ], [ 118.750006509133939, 31.83391043717295 ], [ 118.75030706593347, 31.834639923084726 ], [ 118.751509139595214, 31.836313520295523 ], [ 118.751981376137152, 31.837085919566878 ], [ 118.753483825949885, 31.83893109296622 ], [ 118.751724029417474, 31.839231242234018 ], [ 118.750092994010828, 31.840775608498888 ], [ 118.747938421907378, 31.842308142494456 ], [ 118.745027354391496, 31.84437826161501 ], [ 118.741935838695497, 31.845749876007599 ], [ 118.739101534726359, 31.84634897358438 ], [ 118.734548783169203, 31.847375568138158 ], [ 118.735237043229375, 31.858102807951948 ], [ 118.739017010373232, 31.861280498703735 ], [ 118.742538275761518, 31.859394559490148 ], [ 118.747433140139151, 31.860254654037021 ], [ 118.753185620484203, 31.863345090141635 ], [ 118.758507434406781, 31.865232934511141 ], [ 118.77008105483398, 31.864913510547854 ], [ 118.77118047903501, 31.858323913829825 ], [ 118.77041139498327, 31.856374951295841 ], [ 118.769786635462538, 31.853564041731449 ], [ 118.770132063679711, 31.849482338635532 ], [ 118.770131823336413, 31.846865014246603 ], [ 118.772319290524024, 31.848794552093999 ], [ 118.773005619730995, 31.850553300335875 ], [ 118.773820465965898, 31.851067643996235 ], [ 118.775921704103538, 31.85149521424669 ], [ 118.777465328682553, 31.85149401500593 ], [ 118.778194170522283, 31.850849816789804 ], [ 118.777765195169678, 31.848533195028477 ], [ 118.778879911990003, 31.847974476057928 ], [ 118.779437490353544, 31.850290970503789 ], [ 118.780466508512944, 31.851019474035283 ], [ 118.781581191243134, 31.851361699375271 ], [ 118.783684095891587, 31.847472110963885 ], [ 118.783124504297618, 31.851660554272232 ], [ 118.784217538246963, 31.8508656723988 ], [ 118.785117813125495, 31.851980313270037 ], [ 118.78520339080923, 31.850328307256063 ], [ 118.786081924524183, 31.848418006016917 ], [ 118.787474874071094, 31.847665590412028 ], [ 118.78906061633873, 31.846869981850432 ], [ 118.788096167682511, 31.845648253879666 ], [ 118.78940320863731, 31.843866084922013 ], [ 118.788031604130978, 31.842666287776375 ], [ 118.787067065854714, 31.8408438274368 ], [ 118.784837887271436, 31.837756924790842 ], [ 118.786294979035375, 31.834666043559373 ], [ 118.786294892535878, 31.833722083293804 ], [ 118.782951317023546, 31.832953231291647 ], [ 118.784494287919301, 31.830377228623007 ], [ 118.785093897063817, 31.824884447278194 ], [ 118.794839771769759, 31.826729412247591 ], [ 118.795924761210415, 31.822844740193673 ] ] ] ] } }
+{ "type": "Feature", "properties": { "fid": 1.0, "CENTERX": 118.762835877664, "CENTERY": 31.890183680582105, "CODE": "320115402", "NAME": "江苏软件园", "NOTE": null, "SHAPE_AREA": 73241240.470899999, "SHAPE_LENG": 50271.742558899998, "SUMCASE": null, "USERID01": null, "USERID012": null, "USERID0123": null, "UserID": null, "UserID0": null, "UserID_1": null }, "geometry": { "type": "MultiPolygon", "coordinates": [ [ [ [ 118.795924761210415, 31.822844740193673 ], [ 118.791994007008626, 31.821915813271012 ], [ 118.789036842569587, 31.821275807449588 ], [ 118.782049907996893, 31.82025349400611 ], [ 118.773741979907015, 31.819054743529094 ], [ 118.768799612966433, 31.818718500351526 ], [ 118.759493119753984, 31.819742115723148 ], [ 118.751025302463788, 31.820997622322786 ], [ 118.74837406041577, 31.821381065686541 ], [ 118.749448221670164, 31.831464595478231 ], [ 118.74957711296527, 31.83262312332057 ], [ 118.750006509133939, 31.83391043717295 ], [ 118.75030706593347, 31.834639923084726 ], [ 118.751509139595214, 31.836313520295523 ], [ 118.751981376137152, 31.837085919566878 ], [ 118.753483825949885, 31.83893109296622 ], [ 118.751724029417474, 31.839231242234018 ], [ 118.750092994010828, 31.840775608498888 ], [ 118.747938421907378, 31.842308142494456 ], [ 118.745027354391496, 31.84437826161501 ], [ 118.741935838695497, 31.845749876007599 ], [ 118.739101534726359, 31.84634897358438 ], [ 118.734548783169203, 31.847375568138158 ], [ 118.735237043229375, 31.858102807951948 ], [ 118.739017010373232, 31.861280498703735 ], [ 118.742538275761518, 31.859394559490148 ], [ 118.747433140139151, 31.860254654037021 ], [ 118.753185620484203, 31.863345090141635 ], [ 118.758507434406781, 31.865232934511141 ], [ 118.77008105483398, 31.864913510547854 ], [ 118.77118047903501, 31.858323913829825 ], [ 118.77041139498327, 31.856374951295841 ], [ 118.769786635462538, 31.853564041731449 ], [ 118.770132063679711, 31.849482338635532 ], [ 118.770131823336413, 31.846865014246603 ], [ 118.772319290524024, 31.848794552093999 ], [ 118.773005619730995, 31.850553300335875 ], [ 118.773820465965898, 31.851067643996235 ], [ 118.775921704103538, 31.85149521424669 ], [ 118.777465328682553, 31.85149401500593 ], [ 118.778194170522283, 31.850849816789804 ], [ 118.777765195169678, 31.848533195028477 ], [ 118.778879911990003, 31.847974476057928 ], [ 118.779437490353544, 31.850290970503789 ], [ 118.780466508512944, 31.851019474035283 ], [ 118.781581191243134, 31.851361699375271 ], [ 118.783684095891587, 31.847472110963885 ], [ 118.783124504297618, 31.851660554272232 ], [ 118.784217538246963, 31.8508656723988 ], [ 118.785117813125495, 31.851980313270037 ], [ 118.78520339080923, 31.850328307256063 ], [ 118.786081924524183, 31.848418006016917 ], [ 118.787474874071094, 31.847665590412028 ], [ 118.78906061633873, 31.846869981850432 ], [ 118.788096167682511, 31.845648253879666 ], [ 118.78940320863731, 31.843866084922013 ], [ 118.788031604130978, 31.842666287776375 ], [ 118.787067065854714, 31.8408438274368 ], [ 118.784837887271436, 31.837756924790842 ], [ 118.786294979035375, 31.834666043559373 ], [ 118.786294892535878, 31.833722083293804 ], [ 118.782951317023546, 31.832953231291647 ], [ 118.784494287919301, 31.830377228623007 ], [ 118.785093897063817, 31.824884447278194 ], [ 118.794839771769759, 31.826729412247591 ], [ 118.795924761210415, 31.822844740193673 ] ] ] ] } }
 ]
 }
diff --git a/src/utils/request1.js b/src/utils/request1.js
index 8233dac..8e06ef8 100644
--- a/src/utils/request1.js
+++ b/src/utils/request1.js
@@ -91,7 +91,7 @@ service.interceptors.response.use(res => {
           // store.dispatch('LogOut').then(() => {
           //   location.href = '/#/login';
           // })
-          location.href = "http://39.101.188.84:9999/demo/JiangNingUmaleWeb/#/index"
+          location.href = "https://t-jn-bjh-admin.jsszkd.com/"
         }).catch(() => {
           isRelogin.show = false;
         });
diff --git a/src/views/bigScreen/index.vue b/src/views/bigScreen/index.vue
index 2a4cfce..5c50632 100644
--- a/src/views/bigScreen/index.vue
+++ b/src/views/bigScreen/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-14 14:40:02
  * @LastEditors: JC9527
- * @LastEditTime: 2023-12-28 11:10:12
+ * @LastEditTime: 2024-01-12 23:43:59
 -->
 <template>
   <div class="pc-container">
@@ -312,7 +312,7 @@ div {
     display: flex;
     padding: 0 40px;
     .system-title {
-      padding: 18px 0 0 65px;
+      padding: 15px 0 0 45px;
       font-size: 40px;
       font-family: "YouSheBiaoTiHei";
       font-weight: 400;
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index e3499b8..cd38254 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-09 23:08:15
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-12 12:52:48
+ * @LastEditTime: 2024-01-17 11:34:56
 -->
 <template>
   <div class="map-main">
@@ -471,6 +471,7 @@ import {
   regionalsettings,
   roadsetting,
   fence,
+  bgridsetting,
   getDeviceList,
   levelQywg,
   videoSurveillance,
@@ -562,44 +563,16 @@ export default {
       isPositioning:false,
       markerOffset: [-35,-123],
       mapLoading:false,
+      count:0,
+      cluster:null,
 
 
 
-
-      globalMap: null,
-      basemap: null,
-      townCenter: [31.863971, 118.835418],
-      myZoom: 12,
-      mapLayers: {
-        mapLayer1: null,
-        mapLayer2: null,
-        mapLayer3: null,
-        mapLayer4: null,
-        mapLayer5: null,
-        mapLayer6: null,
-        mapLayer7: null,
-        mapLayer8: null,
-      },
-      mapEvent: {
-        mapEvent1: null,
-        mapEvent2: null,
-        mapEvent3: null,
-        mapEvent4: null,
-      },
-      mapLayer1: null,
-      mapLayer2: null,
-      mapLayer3: null,
-      mapLayer4: null,
-      mapLayer5: null,
       input: "", // 输入框的值
       actionMap: 1, // 默认选中执法人员地图
       action: 1, // 切换执法人员/车辆/事件分类/监控视频/沿街商铺分布 控制的值
-      mypoint: {},
       leftAnimationData: true,
       rightAnimationData: true,
-      electronicMap: null, // 电子地图
-      satelliteMap: null, // 卫星地图
-      satelliteNoteMap: null, // 卫星地图注记
       wanggeData: null, // 区域网格数据
       quyuData: null, // 重点区域数据
       weilanData: null, // 考勤围栏数据
@@ -616,7 +589,6 @@ export default {
       map.setMapStyle("amap://styles/d02b66b0a7f190d5a1556a3f59c86518");
       // console.log(o.getCenter())
       // console.log(this.map,'initMapinitMap');
-     
       this.layers.layer = new AMap.OverlayGroup();            // 一级网格
       this.layers.layer2 = new AMap.OverlayGroup();           // 二级网格
       this.layers.layer3 = new AMap.OverlayGroup();           // 围栏、路段、区域、及文本
@@ -885,8 +857,10 @@ export default {
               }
               
               if(this.layers.layer) {
-                this.layers.layer.hide();
-                this.layers.text.hide();
+                if(this.wanggeData.length > 0){
+                  this.layers.layer.hide();
+                  this.layers.text.hide();
+                }
               }
               if(this.layers.layer3) {
                 this.layers.layer3.hide();
@@ -907,327 +881,59 @@ export default {
     },
 
 
-    
-    initMap() {
-      this.globalMap = L.map("showMap", {
-        center: this.townCenter, // 地图中心[纬度，经度]
-        zoom: this.myZoom, // 地图层级
-        zoomControl: false,
-        attributionControl: false, // 右下角leaflet图标
-        doubleClickZoom: false, // 双击放大
-        scrollWheelZoom: true, // 滚轮放大
-        dragging: true,
-        renderer: L.svg(),
-      });
-
-      // 电子底图/百度
-      this.basemap = L.tileLayer(
-        "https://api.mapbox.com/styles/v1/sharealex/cllg9dw1i00iz01oj9zmu6iv7/tiles/256/{z}/{x}/{y}?access_token=pk.eyJ1Ijoic2hhcmVhbGV4IiwiYSI6ImNsaXNhZmRjbTFhbnczZmxib3h1OW05YXYifQ.PhlKv60ar3K359d8x2yBPw",
-        {
-          maxZoom: 18,
-          minZoom: 9,
-          subdomains: ["0", "1", "2", "3", "4", "5", "6", "7"],
-        }
-      ).addTo(this.globalMap);
-
-      // this.basemap = L.tileLayer(
-      //   "/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}",
-      //   {
-      //     maxZoom: 18,
-      //     minZoom: 9,
-      //     subdomains: ["0", "1", "2", "3", "4", "5", "6", "7"],
-      //   }
-      // ).addTo(this.globalMap);
-
-      //L.tileLayer
-      // .colorizr(
-      //   "/appmaptile?lang=zh_cn&size=1&scale=1&style=8&x={x}&y={y}&z={z}",
-      //   {
-      //    maxZoom: 18,
-      //    minZoom: 3,
-      //   colorize: function (pixel) {
-      // 这个方法用来调整所有的图片上的rgb值，pixel是图片原有的rgb值
-      //    pixel.r += 30;
-      //     pixel.g += 30;
-      //      pixel.b += 48;
-      //     return pixel;
-      //   },
-      //   }
-      //    )
-      //   .addTo(this.globalMap);
-      // 电子地图
-      // this.electronicMap = L.tileLayer
-      //   .chinaProvider("GaoDe.Normal.Map", {
-      //     maxZoom: 18,
-      //     minZoom: 5,
-      //     color: { r: 10, g: 38, b: 74 }, //自定义颜色滤镜
-      //   })
-      // // 卫星地图
-      // this.satelliteMap = L.tileLayer
-      //   .chinaProvider("GaoDe.Satellite.Map", {
-      //     maxZoom: 18,
-      //     minZoom: 5,
-      //     color: { r: 10, g: 38, b: 74 }, //自定义颜色滤镜
-      //   })
-      // // 卫星地图注记
-      // this.satelliteNoteMap = L.tileLayer
-      //   .chinaProvider("GaoDe.Satellite.Annotion", {
-      //     maxZoom: 18,
-      //     minZoom: 5,
-      //     color: { r: 10, g: 38, b: 74 }, //自定义颜色滤镜
-      //   })
-      this.globalMap.addLayer(this.basemap);
-      // L.tileLayer
-      //   .chinaProvider("GaoDe.Satellite.Annotion", {
-      //     maxZoom: 18,
-      //     minZoom: 5,
-      //   })
-      //   .addTo(this.globalMap);
-
-      this.globalMap.createPane("mapLayer1");
-      this.globalMap.getPane("mapLayer1").style.zIndex = 501;
-      this.globalMap.getPane("mapLayer1").style.pointerEvents = "none";
-
-      this.globalMap.createPane("mapLayer2");
-      this.globalMap.getPane("mapLayer2").style.zIndex = 502;
-      this.globalMap.getPane("mapLayer2").style.pointerEvents = "none";
-
-      this.globalMap.createPane("mapLayer3");
-      this.globalMap.getPane("mapLayer3").style.zIndex = 502;
-      this.globalMap.getPane("mapLayer3").style.pointerEvents = "none";
-
-      this.globalMap.createPane("mapLayer4");
-      this.globalMap.getPane("mapLayer4").style.zIndex = 502;
-      this.globalMap.getPane("mapLayer4").style.pointerEvents = "none";
-
-      this.globalMap.createPane("mapLayer5");
-      this.globalMap.getPane("mapLayer5").style.zIndex = 502;
-      this.globalMap.getPane("mapLayer5").style.pointerEvents = "none";
-
-      this.globalMap.createPane("mapLayer6");
-      this.globalMap.getPane("mapLayer6").style.zIndex = 502;
-      this.globalMap.getPane("mapLayer6").style.pointerEvents = "none";
-
-      this.globalMap.createPane("mapLayer7");
-      this.globalMap.getPane("mapLayer7").style.zIndex = 503;
-      this.globalMap.getPane("mapLayer7").style.pointerEvents = "none";
-
-      this.globalMap.createPane("mapEvent1");
-      this.globalMap.getPane("mapEvent1").style.zIndex = 504;
-      this.globalMap.getPane("mapEvent1").style.pointerEvents = "none";
-
-      this.mapEvent.mapEvent1 = L.featureGroup().addTo(this.globalMap);
-
-      this.mapLayers.mapLayer1 = L.featureGroup().addTo(this.globalMap);
-      this.mapLayers.mapLayer2 = L.featureGroup().addTo(this.globalMap);
-      this.mapLayers.mapLayer3 = L.featureGroup().addTo(this.globalMap);
-      this.mapLayers.mapLayer4 = L.featureGroup().addTo(this.globalMap);
-      this.mapLayers.mapLayer5 = L.featureGroup().addTo(this.globalMap);
-      this.mapLayers.mapLayer6 = L.featureGroup().addTo(this.globalMap);
-      this.mapLayers.mapLayer7 = L.featureGroup().addTo(this.globalMap);
-      this.mapLayers.mapLayer8 = L.featureGroup().addTo(this.globalMap);
-
-      this.globalMap.on("zoomend", (e) => {
-        let zoom = this.globalMap.getZoom();
-        // console.log("层级：", zoom);
-      });
-      this.globalMap.on("click", (e) => {
-        // console.log("click：", e);
-      });
-      // this.addLayer2();
-      this.addLayer1();
-      this.getTem();
-      // this.addLayer2();
-      // this.addLayer3();
-      // this.addLayer4();
-      // this.addLayer5();
-      this.addLayer6(); // 重点区域
-      this.addLayer7(); // 重点路段
-
-      this.addLayer8(); // 网格and围栏
-
-      // 定位点 118.797442,32.087219 南京站   测试偏移量点位
-      L.marker(L.latLng(31.96840071263104, 118.79808425903322), {
-        icon: L.icon({
-          iconUrl: require("../../../assets/images/3.png"),
-          iconSize: [38, 43],
-          iconAnchor: [22, 38],
-        }),
-      }).addTo(this.globalMap);
+    // 自定义聚合样式
+    _renderClusterMarker(context){
+      
+      var factor = Math.pow(context.count / this.count, 1 / 18);
+      var div = document.createElement('div');
+      var Hue = 180 - factor * 180;
+      var bgColor = 'hsla(' + Hue + ',100%,40%,0.7)';
+      var fontColor = 'hsla(' + Hue + ',100%,90%,1)';
+      var borderColor = 'hsla(' + Hue + ',100%,40%,1)';
+      var shadowColor = 'hsla(' + Hue + ',100%,90%,1)';
+      div.style.backgroundColor = bgColor;
+      var size = Math.round(30 + Math.pow(context.count / this.count, 1 / 5) * 20);
+      div.style.width = div.style.height = size + 'px';
+      div.style.border = 'solid 1px ' + borderColor;
+      div.style.borderRadius = size / 2 + 'px';
+      div.style.boxShadow = '0 0 5px ' + shadowColor;
+      div.innerHTML = context.count;
+      div.style.lineHeight = size + 'px';
+      div.style.color = fontColor;
+      div.style.fontSize = '14px';
+      div.style.textAlign = 'center';
+      context.marker.setOffset(new AMap.Pixel(-size / 2, -size / 2));
+      context.marker.setContent(div)
     },
-    // 网格and围栏
-    addLayer8() {
-      // 网格
-      levelQywg({ level: 1 }).then((res) => {
-        this.wanggeData = res.data;
-        res.data.forEach((element) => {
-          let shapeStr = JSON.parse(element.shapeStr);
-          let geojson = L.geoJSON(shapeStr.features[0], {
-            pane: "mapLayer2",
-            style: function (feature) {
-              return {
-                color: "#ffa500",
-                weight: 3,
-                fillColor: "#ffa500",
-                fillOpacity: 0.3,
-              };
-            },
-            onEachFeature: (feature, layer) => {
-              // let text = feature.properties.name;
-              // let bounds = layer._bounds;
-              // let center = bounds.getCenter();
-              let myIcon = L.divIcon({
-                className: "land-name2",
-                html: element.name,
-                iconSize: [150, 24],
-                iconAnchor: [75, 12],
-              });
-              // 多边形上的标记点;
-              L.marker(
-                {
-                  lng: shapeStr.features[1].geometry.coordinates[0],
-                  lat: shapeStr.features[1].geometry.coordinates[1],
-                },
-                {
-                  pane: "mapLayer3",
-                  icon: myIcon,
-                }
-              ).addTo(this.mapLayers.mapLayer8);
-            },
-          });
-        })
-        // console.log(res,'网格');
+    _renderMarker (context) {
+      
+      var content = `<div class="markerStyles"><img src="${require("../../../assets/images/icon/icon5.png")}" alt=""></div>`;
+      var offset = new AMap.Pixel(-27, -94);
+      context.marker.setContent(content)
+      context.marker.setOffset(offset)
+      context.marker.on('click',(ev)=>{
+        this.monitoringInfo.position = context.data[0].position;
+        this.monitoringInfo.info = context.data[0].info;
+        this.monitoringInfo.visible = true;
       })
-      // .addTo(this.mapLayers.mapLayer8);
-
-      // 加载围栏
-      fence({ pageNum: 1, pageSize: 100 }).then((res) => {
-        // console.log(res,'考勤围栏');
-        this.weilanData = res.rows;
-        res.rows.forEach((element) => {
-          let shapeStr = JSON.parse(element.shapeStr);
-          // 圆形围栏
-          if (shapeStr.features[0].geometry.type == "Point") {
-            let geojson2 = L.circle(
-              [
-                shapeStr.features[0].geometry.coordinates[1],
-                shapeStr.features[0].geometry.coordinates[0],
-              ],
-              {
-                radius: shapeStr.features[0].properties.radius,
-                color: "#62E1FA",
-                weight: 1,
-                fillColor: "#62E1FA",
-                fillOpacity: 0.3,
-                pane: "mapLayer2",
-              }
-            ).addTo(this.mapLayers.mapLayer8);
-            let myIcon = L.divIcon({
-              className: "land-name5",
-              html: element.name,
-              iconSize: [150, 24],
-              iconAnchor: [75, 12],
-            });
-            // 多边形上的标记点;
-            L.marker(
-              [
-                shapeStr.features[0].geometry.coordinates[1],
-                shapeStr.features[0].geometry.coordinates[0],
-              ],
-              {
-                pane: "mapLayer3",
-                icon: myIcon,
-              }
-            ).addTo(this.mapLayers.mapLayer8);
-          } else if (shapeStr.features[0].geometry.type == "Polygon") {
-            // 多边形围栏
-            let geojson2 = L.geoJSON(shapeStr.features[0], {
-              pane: "mapLayer2",
-              style: function (feature) {
-                return {
-                  color: "#62E1FA",
-                  weight: 1,
-                  fillColor: "#62E1FA",
-                  fillOpacity: 0.3,
-                };
-              },
-              onEachFeature: (feature, layer) => {
-                let text = feature.properties.name;
-                let bounds = layer._bounds;
-                let center = bounds.getCenter();
-                let myIcon = L.divIcon({
-                  className: "land-name5",
-                  html: element.name,
-                  iconSize: [150, 24],
-                  iconAnchor: [75, 12],
-                });
-                // 多边形上的标记点;
-                L.marker(center, {
-                  pane: "mapLayer3",
-                  icon: myIcon,
-                }).addTo(this.mapLayers.mapLayer8);
-              },
-            }).addTo(this.mapLayers.mapLayer8);
-          }
-        });
-      });
-    },
-    addLayer1() {
-      this.mapLayers.mapLayer1.clearLayers();
-      // this.mapLayers.mapLayer2.clearLayers()
-      let geojson = L.geoJSON(
-        jiangninggeo,
-        {
-          pane: "mapLayer1",
-          style: function (feature) {
-            return {
-              color: "#00C5EC",
-              weight: 1,
-              fillColor: "rgba(64,175,255,0.4)",
-              fillOpacity: 1,
-            };
-          },
-        },
-        { className: "jack-s" }
-      ).addTo(this.mapLayers.mapLayer1);
-      // this.addMark()
-      // 获取json文件的中心位置
-      this.mapLayer1 = geojson.getBounds();
-      // 居中加载json文件
-      this.globalMap.fitBounds(this.mapLayer1);
     },
-    // 执法人员点位
-    getTem() {
-      this.personLine = [];
-      getDeviceList({ imei: "861316060217211" }).then((res) => {
-        console.log("res0", res);
-        let obj = [];
-        if (res.data.obj) {
-          res.data.obj.forEach((element) => {
-            if (element.status == 0) {
-              // 离线
-              obj.push(element);
-              this.personLine.push(element);
-            } else if (element.status == 1) {
-              // 在线
-              obj.push(element);
-              this.personLine.push(element);
-              console.log(this.personLine, "请求回来的在线情况");
-            } else if (element.status == 9) {
-              // 掉线
-            }
-          });
-        } else {
-          this.$modal.msgError("执法人员" + res.data.msg);
-        }
-        this.addMark(obj);
-      });
+    _DrenderMarker(context) {
+      var content = `<div class="markerStyles"><div class="marker-Text" style="width:${context.data[0].info.shopName.length * 15}px">${context.data[0].info.shopName}</div><img src="${require("../../../assets/images/icon/icon6.png")}" alt=""></div>`;
+      var offset = new AMap.Pixel(-27, -94);
+      context.marker.setContent(content)
+      context.marker.setOffset(offset)
+      context.marker.on('click',(ev)=>{
+        this.shopInfo.position = context.data[0].position;
+        this.shopInfo.info = context.data[0].info;
+        this.shopInfo.visible = true;
+      })
     },
 
-
-
     // 各个点位获取
     getMarkers(id,status){
+      if (this.cluster) {
+        this.cluster.setMap(null);
+      }
       let ico1 = require("../../../assets/images/icon/icon1.png");
       let ico2 = require("../../../assets/images/icon/icon2.png");
       let ico3 = require("../../../assets/images/icon/icon3.png");
@@ -1296,34 +1002,46 @@ export default {
           }
         })
       } else if(id == 4){
-        point.features.forEach((element)=>{
-          if (element.properties.name == "监控视频") {
-            this.mapLoading = false;
-            let obj = {position:[]};
-            obj.position[0] = element.geometry.coordinates[0];
-            obj.position[1] = element.geometry.coordinates[1];
-            obj.imgSrc = element.properties.status == "0" ? offIcon4 : ico5;
-            // obj.imgSrc = ico5;
-            obj.info = element;
-            
-            this.markers.push(obj)
-          }
-        })
-        // getVideoPageEq({pageNo:1,pageSize:50}).then(res=>{
-        //   this.mapLoading = false;
-        //   // console.log(res,"res");
-        //   res.data.forEach((element)=>{
+        // point.features.forEach((element)=>{
+        //   if (element.properties.name == "监控视频") {
+        //     this.mapLoading = false;
         //     let obj = {position:[]};
-        //     obj.position[0] = element.longitude;
-        //     obj.position[1] = element.latitude;
-        //     // obj.imgSrc = element.status == "0" ? offIcon4 : ico5;
-        //     obj.imgSrc = ico5;
-        //     obj.info = element
+        //     obj.position[0] = element.geometry.coordinates[0];
+        //     obj.position[1] = element.geometry.coordinates[1];
+        //     obj.imgSrc = element.properties.status == "0" ? offIcon4 : ico5;
+        //     // obj.imgSrc = ico5;
+        //     obj.info = element;
+            
         //     this.markers.push(obj)
-        //   })
-        // }).catch(err=>{
-        //   this.mapLoading = false;
+        //   }
         // })
+        getVideoPageEq({pageNo:1,pageSize:1000}).then(res=>{
+          this.mapLoading = false;
+          // console.log(res,"res");
+          let videoPoint = [];
+          res.data.forEach((element)=>{
+            let obj = {position:[]};
+            obj.position[0] = element.longitude;
+            obj.position[1] = element.latitude;
+            // obj.imgSrc = element.status == "0" ? offIcon4 : ico5;
+            obj.lnglat = new AMap.LngLat(element.longitude ? element.longitude : 0 ,element.latitude ? element.latitude : 0)
+            obj.imgSrc = ico5;
+            obj.info = element
+            // this.markers.push(obj)
+            videoPoint.push(obj)
+          })
+          this.count = videoPoint.length;
+          AMap.plugin(['AMap.MarkerCluster'],()=>{
+            this.cluster = new AMap.MarkerCluster(this.map,videoPoint,{
+              gridSize: 20, // 设置网格像素大小
+              renderClusterMarker: this._renderClusterMarker, // 自定义聚合点样式
+              renderMarker: this._renderMarker, // 自定义非聚合点样式
+            })
+          })
+        }).catch(err=>{
+          this.$modal.msgError(err);
+          this.mapLoading = false;
+        })
       } else if(id == 5){
         // point.features.forEach((element)=>{
         //   if (element.properties.name == "沿街商铺分布") {
@@ -1335,48 +1053,41 @@ export default {
         //     this.mapLoading = false;
         //   }
         // })
-        getStreetShopList({pageSize:20,pageNum:1}).then(res=>{
-          res.rows.forEach(element => {
+        getStreetShopList({pageSize:500,pageNum:1}).then(res=>{
+          let videoPoint = [];
+          this.mapLoading = false;
+          res.rows.forEach((element)=>{
             let obj = {position:[]};
             obj.position[0] = element.longitude;
             obj.position[1] = element.latitude;
+            // obj.imgSrc = element.status == "0" ? offIcon4 : ico5;
+            obj.lnglat = new AMap.LngLat(element.longitude ? element.longitude : 0 ,element.latitude ? element.latitude : 0)
             obj.imgSrc = ico6;
             obj.info = element;
-            this.markers.push(obj)
-            this.mapLoading = false;
+            // this.markers.push(obj)
+            videoPoint.push(obj)
           })
-        }).catch(err=>{
-          this.$modal.msgError(err);
-          this.mapLoading = false;
-        })
-      }
-    },
-    // TODO:缩放地图获取新的监控点位
-    getPageEq(pageNum){
-      this.mapLoading = true;
-      let ico5 = require("../../../assets/images/icon/icon5.png");
-      let offIcon4 = require("../../../assets/images/icon/offLine4.png");
-      getVideoPageEq({pageNo:pageNum,pageSize:30}).then(res=>{
-        this.mapLoading = false;
-        // console.log(res,"res");
-        res.data.forEach((element)=>{
-          var marker = new AMap.Marker({
-            position: [element.longitude, element.latitude], // 标记位置
-            offset: new AMap.Pixel(-27, -94),
-            content:`<div class="markerStyles">
-                        <img src="${element.status == "0"? offIcon4 : ico5}" alt="">
-                      </div>`,
-          });
-          marker.on("click",(e)=>{
-            this.monitoringInfo.visible = true;
-            this.monitoringInfo.position = [element.longitude,element.latitude];
-          })
-          this.layers.markers.addLayer(marker);
-          this.map.add(this.layers.markers)
+          this.count = videoPoint.length;
+          AMap.plugin(['AMap.MarkerCluster'],()=>{
+            this.cluster = new AMap.MarkerCluster(this.map,videoPoint,{
+              gridSize: 20, // 设置网格像素大小
+              renderClusterMarker: this._renderClusterMarker, // 自定义聚合点样式
+              renderMarker: this._DrenderMarker, // 自定义非聚合点样式
+            })
           })
+          // res.rows.forEach(element => {
+          //   let obj = {position:[]};
+          //   obj.position[0] = element.longitude;
+          //   obj.position[1] = element.latitude;
+          //   obj.imgSrc = ico6;
+          //   obj.info = element;
+          //   this.markers.push(obj)
+          //   this.mapLoading = false;
+          // })
         }).catch(err=>{
           this.mapLoading = false;
         })
+      }
     },
     // 点位点击事件
     clickMarker(marker,e){
@@ -1496,7 +1207,7 @@ export default {
       this.showVideo = true;
       videoSurveillance({...this.videoCondition,imei:this.personInfo.info.imei}).then(res=>{
         if(res.code == 200 && res.data.msg == '操作成功') {
-          this.initVideoPlayer(`http://121.229.2.163:9302/live/9999_${this.personInfo.info.userId}.flv`)
+          this.initVideoPlayer(`http://121.229.2.163:9291/live/9999_${this.personInfo.info.userId}.flv`)
         }
       })
     },
@@ -1567,43 +1278,50 @@ export default {
 
     // 二级网格获取
     getWanggeGeoJson(){
-      this.wanggeData = gridding.features;
-      gridding.features.forEach((element)=>{
-        var wangge = new AMap.Polygon({
-          path:element.geometry.coordinates[0],
-          strokeColor: '#FFBF7A',
-          fillColor: '#DC8419',
-          strokeOpacity: 1,
-          fillOpacity: 0.3,
-          editable:false,
-          visible:true,
-          extData:{
-            name: element.properties.NAME
-          },
+      
+      bgridsetting({pageNum:1,pageSize:100}).then(res=>{
+        console.log(res,"网格数据");
+        let W = []
+        res.rows.forEach((element)=>{
+          let shapeStr = JSON.parse(element.shapeStr)
+          W.push(shapeStr)
+          var wangge = new AMap.Polygon({
+            path:shapeStr.geometry.coordinates[0],
+            strokeColor: '#FFBF7A',
+            fillColor: '#DC8419',
+            strokeOpacity: 1,
+            fillOpacity: 0.3,
+            editable:false,
+            visible:true,
+            extData:{
+              name: shapeStr.properties.NAME
+            },
+          })
+          var text = new AMap.Text({
+            // position: [element.properties.CENTERX,element.properties.CENTERY],
+            position: getCenter(shapeStr.geometry.coordinates[0][0]),
+            anchor: 'bottom-center',
+            text: shapeStr.properties.NAME,
+            style:{
+              'font-size': '16px',
+              'font-weight': 'bold',
+              'text-align': 'center',
+              'color': '#FBFF00',
+              'text-shadow': '0px 1px 0px rgba(0,0,0,0.3)',
+              'white-space': 'nowrap',
+            },
+          });
+          shapeStr.myPolygon = wangge;
+          shapeStr.text = text;
+          // this.myWange.push(wangge);
+          // this.layers.layer.addLayer(wangge);
+          // this.layers.layer.addLayer(text);
+          this.layers.layer2.addOverlay(wangge);
+          this.layers.text1.addOverlay(text);
+          this.map.add(this.layers.layer2);
+          this.map.add(this.layers.text1);
         })
-        var text = new AMap.Text({
-          // position: [element.properties.CENTERX,element.properties.CENTERY],
-          position: getCenter(element.geometry.coordinates[0][0]),
-          anchor: 'bottom-center',
-          text: element.properties.NAME,
-          style:{
-            'font-size': '16px',
-            'font-weight': 'bold',
-            'text-align': 'center',
-            'color': '#FBFF00',
-            'text-shadow': '0px 1px 0px rgba(0,0,0,0.3)',
-            'white-space': 'nowrap',
-          },
-        });
-        element.myPolygon = wangge;
-        element.text = text;
-        // this.myWange.push(wangge);
-        // this.layers.layer.addLayer(wangge);
-        // this.layers.layer.addLayer(text);
-        this.layers.layer2.addOverlay(wangge);
-        this.layers.text1.addOverlay(text);
-        this.map.add(this.layers.layer2);
-        this.map.add(this.layers.text1);
+        this.wanggeData = W;
       })
       // console.log(this.layers.layer,'this.layers.layer');
       // this.map.add(this.layers.layer);
@@ -2098,474 +1816,6 @@ export default {
       });
       return icon;
     },
-    addMark(obj) {
-      this.mapEvent.mapEvent1.clearLayers();
-      let ico1 = require("../../../assets/images/icon/icon1.png");
-      // let ico1 = L.icon({
-      //   iconUrl: require("../../../assets/images/icon/icon1.png"),
-      //   iconSize: [52, 81],
-      // });
-      let ico2 = L.icon({
-        iconUrl: require("../../../assets/images/icon/icon2.png"),
-        iconSize: [44, 91],
-      });
-      let ico3 = L.icon({
-        iconUrl: require("../../../assets/images/icon/icon3.png"),
-        iconSize: [44, 91],
-      });
-      let ico4 = L.icon({
-        iconUrl: require("../../../assets/images/icon/icon4.png"),
-        iconSize: [45, 95],
-      });
-      let ico5 = L.icon({
-        iconUrl: require("../../../assets/images/icon/icon5.png"),
-        iconSize: [52, 81],
-      });
-      if (this.actionMap == 1) {
-        obj.forEach((item, index) => {
-          let marker = L.marker(
-            {
-              lng: item.longitude,
-              lat: item.latitude,
-            },
-            { icon: this.getIcons(item.userName, ico1) }
-          )
-            .bindPopup(
-              `
-            <div class="person-popup">
-              <div class="person-title">
-                <div class="title">人员信息</div>
-                <div class="mask" id='monitoring${index}'></div>
-              </div>
-              <div class="person-main">
-                <div class="person-info">
-                  <div class="dot"></div>
-                  <div class="name">李飞</div>
-                  <div class="position">执法1队队员</div>
-                </div>
-                <div class="btns">
-                  <div id='personClick${index}'>行程轨迹</div>
-                  <div>附近队员</div>
-                  <div>位置分享</div>
-                  <div>任务派发</div>
-                </div>
-              </div>
-            </div>
-            `,
-              {
-                className: "popup-pc-person",
-              }
-            )
-            .openPopup();
-          marker.addTo(this.mapEvent.mapEvent1);
-          this.markerClick(marker, index, item);
-        });
-      } else if (this.actionMap == 2) {
-      } else if (this.actionMap == 3) {
-      } else if (this.actionMap == 4) {
-      } else if (this.actionMap == 5) {
-      }
-      point.features.map((item, index) => {
-        // if (this.actionMap == 1) {
-        //   if (item.properties.name == "执法人员") {
-        //     let marker = L.marker(
-        //       {
-        //         lng: item.geometry.coordinates[0],
-        //         lat: item.geometry.coordinates[1],
-        //       },
-        //       { icon: ico1 }
-        //     )
-        //       .bindPopup(
-        //         `
-        //       <div class="person-popup">
-        //         <div class="person-title">
-        //           <div class="title">人员信息</div>
-        //           <div class="mask" id='monitoring${index}'></div>
-        //         </div>
-        //         <div class="person-main">
-        //           <div class="person-info">
-        //             <div class="dot"></div>
-        //             <div class="name">李飞</div>
-        //             <div class="position">执法1队队员</div>
-        //           </div>
-        //           <div class="btns">
-        //             <div id='personClick${index}'>行程轨迹</div>
-        //             <div>附近队员</div>
-        //             <div>位置分享</div>
-        //             <div>任务派发</div>
-        //           </div>
-        //         </div>
-        //       </div>
-        //       `,
-        //         {
-        //           className: "popup-pc-person",
-        //         }
-        //       )
-        //       .openPopup();
-        //     marker.addTo(this.mapEvent.mapEvent1);
-        //     this.markerClick(marker, index);
-        //   }
-        // } else
-        if (this.actionMap == 2) {
-          let marker;
-          if (item.properties.name == "普通事件") {
-            marker = L.marker(
-              {
-                lng: item.geometry.coordinates[0],
-                lat: item.geometry.coordinates[1],
-              },
-              { icon: ico2 }
-            )
-              .bindPopup(
-                `
-              <div class="event-popup">
-                <div class="event-title">
-                  <div class="title">事件信息</div>
-                  <div class="mask" id='monitoring${index}'></div>
-                </div>
-                <div class="event-main">
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">事件名称：</div>
-                    <div class="position">XXX小区乱堆杂物</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">事件类别：</div>
-                    <div class="position">暴露垃圾</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">事件地址：</div>
-                    <div class="position">XX街道XX小区</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">描述：</div>
-                    <div class="position">XXXXXXXXXXXXXX</div>
-                  </div>
-                  <div class="btn" id="zhipai${index}">
-                    指派
-                  </div>
-                </div>
-              </div>
-              `,
-                {
-                  className: "popup-pc-common",
-                }
-              )
-              .openPopup();
-            marker.addTo(this.mapEvent.mapEvent1);
-            this.markerClick(marker, index);
-          } else if (item.properties.name == "重点事件") {
-            marker = L.marker(
-              {
-                lng: item.geometry.coordinates[0],
-                lat: item.geometry.coordinates[1],
-              },
-              { icon: ico3 }
-            )
-              .bindPopup(
-                `
-              <div class="event-popup">
-                <div class="event-title">
-                  <div class="title">事件信息</div>
-                  <div class="mask" id='monitoring${index}'></div>
-                </div>
-                <div class="event-main">
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">事件名称：</div>
-                    <div class="position">XXX小区乱堆杂物</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">事件类别：</div>
-                    <div class="position">暴露垃圾</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">事件地址：</div>
-                    <div class="position">XX街道XX小区</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">描述：</div>
-                    <div class="position">XXXXXXXXXXXXXX</div>
-                  </div>
-                  <div class="btn" id="zhipai${index}">
-                    指派
-                  </div>
-                </div>
-              </div>
-              `,
-                {
-                  className: "popup-pc-emphasis",
-                }
-              )
-              .openPopup();
-            marker.addTo(this.mapEvent.mapEvent1);
-            this.markerClick(marker, index);
-          }
-        } else if (this.actionMap == 3) {
-          if (item.properties.name == "执法车辆") {
-            let marker = L.marker(
-              {
-                lng: item.geometry.coordinates[0],
-                lat: item.geometry.coordinates[1],
-              },
-              { icon: ico4 }
-            )
-              .bindPopup(
-                `
-              <div class="car-popup">
-                <div class="car-title">
-                  <div class="title">车辆信息</div>
-                  <div class="mask" id='monitoring${index}'></div>
-                </div>
-                <div class="car-main">
-                  <div class="car-info">
-                    <div class="dot"></div>
-                    <div class="name">执法一队1号车</div>
-                    <div class="position">苏A568974</div>
-                  </div>
-                  <div class="btn" id="carinfo${index}">行程轨迹</div>
-                </div>
-              </div>
-              `,
-                {
-                  className: "popup-pc-car",
-                }
-              )
-              .openPopup();
-            marker.addTo(this.mapEvent.mapEvent1);
-            this.markerClick(marker, index);
-          }
-        } else if (this.actionMap == 4) {
-          if (item.properties.name == "监控视频") {
-            let marker = L.marker(
-              {
-                lng: item.geometry.coordinates[0],
-                lat: item.geometry.coordinates[1],
-              },
-              { icon: ico5 }
-            )
-              .bindPopup(
-                `
-              <div class="monitoring-popup">
-                <div class="monitoring-title">
-                  <div class="title">监控视频</div>
-                  <div class="mask" id='monitoring${index}'></div>
-                </div>
-                <div class="monitoring">
-                  <div class="bg">
-                    <img src="@/assets/images/popup/screenshot20230817.png" alt="">
-                  </div>
-                  <div class="btns">
-                    <div class="btn" id="monitoringInfo${index}">上墙</div>
-                    <div class="btn">转发</div>
-                  </div>
-                </div>
-              </div>
-              `,
-                {
-                  className: "popup-pc-monitoring",
-                }
-              )
-              .openPopup();
-            marker.addTo(this.mapEvent.mapEvent1);
-            this.markerClick(marker, index);
-          }
-        } else if (this.actionMap == 5) {
-          if (item.properties.name == "沿街商铺分布") {
-            let marker = L.marker(
-              {
-                lng: item.geometry.coordinates[0],
-                lat: item.geometry.coordinates[1],
-              },
-              { icon: ico2 }
-            )
-              .bindPopup(
-                `
-              <div class="event-popup">
-                <div class="event-title">
-                  <div class="title">主体基本信息</div>
-                  <div class="mask" id='monitoring${index}'></div>
-                </div>
-                <div class="event-main">
-                <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">商铺名称：</div>
-                    <div class="position">xxx商铺</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">商铺类型：</div>
-                    <div class="position">餐饮店</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">所在地址：</div>
-                    <div class="position">XX街道XX小区</div>
-                  </div>
-                  <div class="event-info">
-                    <div class="dot"></div>
-                    <div class="name">描述：</div>
-                    <div class="position">xxxxxxxxxxxxxxxxxxxxxxxx</div>
-                  </div>
-                
-                  <div class="btn" id="shopInfo">
-                    查看载体详情
-                  </div>
-                </div>
-              </div>
-              `,
-                {
-                  className: "popup-pc-common",
-                }
-              )
-              .openPopup();
-            marker.addTo(this.mapEvent.mapEvent1);
-            this.markerClick(marker, index);
-          }
-        }
-      });
-    },
-    markerClick(marker, index, item) {
-      marker.on("click", (e) => {
-        this.$nextTick(() => {
-          document
-            .querySelector("#monitoring" + index)
-            .addEventListener("click", function () {
-              //通过个体ElementsById()方法获得的element对象中的addEventListener()方法用于添加事件监听器，第一个参数设置事件类型，第二个参数可用来设置具体事件
-              marker.closePopup();
-            });
-          if (this.actionMap == 1) {
-            document
-              .querySelector("#personClick" + index)
-              .addEventListener("click", () => {
-                this.$refs.personageTrack.open("person", item);
-              });
-          } else if (this.actionMap == 2) {
-            document
-              .querySelector("#zhipai" + index)
-              .addEventListener("click", () => {
-                this.$refs.crewAssign.open();
-              });
-            // document.querySelector('#zhipai2' + index).addEventListener("click",()=>{
-            //   this.$refs.crewAssign.open();
-            // })
-          } else if (this.actionMap == 3) {
-            document
-              .querySelector("#carinfo" + index)
-              .addEventListener("click", () => {
-                this.$refs.personageTrack.open("car");
-              });
-          } else if (this.actionMap == 4) {
-            document
-              .querySelector("#monitoringInfo" + index)
-              .addEventListener("click", () => {
-                this.$refs.videoWall.open();
-              });
-          } else if (this.actionMap == 5) {
-            document
-              .querySelector("#shopInfo")
-              .addEventListener("click", () => {
-                this.$refs.shop.open();
-              });
-          }
-        });
-      });
-    },
-    // 重点区域
-    addLayer6() {
-      // this.mapLayers.mapLayer5.clearLayers();
-      regionalsettings({ pageNum: 1, pageSize: 100 }).then((res) => {
-        // console.log(res,'重点区域');
-        this.quyuData = res.rows;
-        res.rows.forEach((element) => {
-          let shapeStr = JSON.parse(element.shapeStr);
-          let geojson = L.geoJSON(
-            shapeStr.features[0],
-            {
-              pane: "mapLayer6",
-              style: function (feature) {
-                return {
-                  color: "rgba(255,0,0,0.38)",
-                  weight: 1,
-                  fillColor: "rgba(255,0,0,0.38)",
-                  fillOpacity: 1,
-                };
-              },
-            },
-            { className: "jack-s6" }
-          ).addTo(this.mapLayers.mapLayer6);
-
-          let myIcon1 = L.divIcon({
-            className: "region-name1",
-            html: element.name,
-            iconSize: [120, 68],
-          });
-          L.marker(
-            {
-              lng: shapeStr.features[1].geometry.coordinates[0],
-              lat: shapeStr.features[1].geometry.coordinates[1],
-            },
-            {
-              pane: "mapLayer4",
-              icon: myIcon1,
-            }
-          ).addTo(this.mapLayers.mapLayer6);
-        });
-      });
-      // this.mapLayer5 = geojson.getBounds()
-    },
-    // 重点路段
-    addLayer7() {
-      // this.mapLayers.mapLayer7.clearLayers();
-      roadsetting({ pageNum: 1, pageSize: 100 }).then((res) => {
-        // console.log(res,'重点路段');
-        this.luduanData = res.rows;
-        res.rows.forEach((element) => {
-          let shapeStr = JSON.parse(element.shapeStr);
-          let geojson = L.geoJSON(
-            shapeStr.features[0],
-            {
-              pane: "mapLayer7",
-              style: function (feature) {
-                return {
-                  color: "#46FF77",
-                  // weight: 0,
-                  // fillColor: "rgba(70,255,119,0.38)",
-                  // fillOpacity: 1,
-                };
-              },
-            },
-            { className: "jack-s7" }
-          ).addTo(this.mapLayers.mapLayer7);
-          // 获取json文件的中心位置
-          // this.mapLayer5 = geojson.getBounds()
-          // let bounds = geojson.getBounds();
-          // let latlng = bounds.getCenter();
-
-          let myIcon1 = L.divIcon({
-            className: "region-name2",
-            html: element.name,
-            iconSize: [120, 68],
-          });
-          L.marker(
-            {
-              lng: shapeStr.features[1].geometry.coordinates[0],
-              lat: shapeStr.features[1].geometry.coordinates[1],
-            },
-            {
-              pane: "mapLayer4",
-              icon: myIcon1,
-            }
-          ).addTo(this.mapLayers.mapLayer7);
-        });
-      });
-    },
     // 电子底图/卫星底图切换事件
     actionBtn(id) {
       this.action = id;
@@ -2701,16 +1951,6 @@ export default {
         this.map.setMapStyle("amap://styles/whitesmoke")
         
       }
-      // if(id == 1) {
-      //   this.globalMap.removeLayer(this.satelliteMap);
-      //   this.globalMap.removeLayer(this.satelliteNoteMap);
-      //   this.globalMap.addLayer(this.electronicMap);
-      // } else {
-      //   this.globalMap.removeLayer(this.electronicMap);
-      //   this.globalMap.addLayer(this.satelliteMap);
-      //   this.globalMap.addLayer(this.satelliteNoteMap);
-      // }
-      // console.log(id)
     },
     // 输入框的搜索框点击事件
     search() {
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index 1759f4b..eabd0a1 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-16 14:19:37
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-12 11:29:36
+ * @LastEditTime: 2024-01-15 16:32:33
 -->
 <template>
   <el-dialog
@@ -23,6 +23,8 @@
         ? 'dialog-boxed2'
         : type == 3
         ? 'dialog-boxed3'
+        : type == 9
+        ? 'dialog-boxed9'
         : type == 10
         ? 'dialog-boxed10'
         : ''
@@ -170,16 +172,31 @@ export default {
     }
   }
 }
+::v-deep .dialog-boxed9 {
+  background-image: url("../../../assets/images/dialogbg/792@2x.png");
+  .el-dialog__header {
+    .closeClick {
+      .close {
+        position: absolute;
+        width: 27px;
+        height: 25px;
+        right: 20px;
+        top: 12px;
+        cursor: pointer;
+      }
+    }
+  }
+}
 ::v-deep .dialog-boxed10 {
   background-image: url("../../../assets/images/dialogbg/792@2x.png");
   .el-dialog__header {
     .closeClick {
       .close {
         position: absolute;
-        width: 20px;
-        height: 18px;
-        right: 17px;
-        top: 8px;
+        width: 27px;
+        height: 27px;
+        right: 20px;
+        top: 15px;
         cursor: pointer;
       }
     }
diff --git a/src/views/components/newEvent/index.vue b/src/views/components/newEvent/index.vue
index 572e102..0e63e70 100644
--- a/src/views/components/newEvent/index.vue
+++ b/src/views/components/newEvent/index.vue
@@ -1698,11 +1698,10 @@ export default {
           this.formInline.reportEventObj.audioUrl = this.baseUrl + this.formInline.reportEventObj.audioUrl;
           this.formInline.reportEventObj.meshOccurs = this.formInline.reportEventObj.meshOccurs.join(',');
           this.formInline.reportEventObj.type = this.formInline.reportEventObj.type.join(',');
-          console.log(this.formInline);
+          // console.log(this.formInline);
           eventSaveData(this.formInfo,{formData:this.formInline}).then(res=>{
-            console.log(res,'===================res');
             if(res.code == 200 && res.success == true) {
-              this.$refs.dialog5.Close();
+              this.cancel();
               this.$modal.msgSuccess("新增成功");
             }
           })
diff --git a/src/views/components/personageTask/index.vue b/src/views/components/personageTask/index.vue
index 056cf7e..6529be8 100644
--- a/src/views/components/personageTask/index.vue
+++ b/src/views/components/personageTask/index.vue
@@ -81,12 +81,13 @@ export default {
     }
   },
   mounted() {
-    this.getViewListPageList();
+    // this.getViewListPageList();
   },
   methods:{
     open(info){
       this.info = info;
       this.$refs.taskDialog.open();
+      this.getViewListPageList();
     },
     getViewListPageList(){
       let data = {'queryValue' : [], "myInstanceClassify" : "all"}
@@ -111,8 +112,17 @@ export default {
     },
     // 确定按钮
     confirm(refForm){
-      autoSubmit().then(res=>{
-        
+      this.$refs[formName].validate((valid) => {
+        if(valid){
+          let ts = Math.round(new Date().getTime()/1000).toString();
+          // console.log(ts,"tstststs");
+          // console.log(this.taskForm,"taskForm");
+          // getBpmOperateVo({_t:ts,id:this.taskForm.task,idType:"formId",formCode:"event-holder"}).then(res=>{
+          //   if(res.code == 200) {
+          //     return distributeSaveData()
+          //   }
+          // })
+        }
       })
     },
   },
diff --git a/src/views/components/shop/components/TabOne.vue b/src/views/components/shop/components/TabOne.vue
index 3ad1221..677e3a9 100644
--- a/src/views/components/shop/components/TabOne.vue
+++ b/src/views/components/shop/components/TabOne.vue
@@ -16,24 +16,50 @@
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">营业执照：</div>
-            <div class="item-value value-image">
-              <img :src="myShopInfo ? myShopInfo.businessLicenseUrl : ''" alt="" />
+            <div class="item-lable">营业执照名称：</div>
+            <!--  value-image -->
+            <div class="item-value">
+              <!-- <img :src="myShopInfo ? myShopInfo.bodyName : ''" alt="" /> -->
+              {{ myShopInfo ? myShopInfo.bodyName : '' }}
             </div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">经营范围：</div>
+            <div class="item-lable">登记机关：</div>
             <div class="item-value">{{ myShopInfo ? myShopInfo.operation : '/' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">注册资本：</div>
-            <div class="item-value">/</div>
+            <div class="item-lable">统一社会信用代码：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.code : '/' }}</div>
+          </div>
+        </div>
+        <div class="main-cell">
+          <div class="cell-item">
+            <div class="item-icon"></div>
+            <div class="item-lable">负责人姓名：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.bodyPrincipal : '/'}}</div>
+          </div>
+        </div>
+        <div class="main-cell">
+          <div class="cell-item">
+            <div class="item-icon"></div>
+            <div class="item-lable">二维码：</div>
+            <!--  value-image -->
+            <div class="item-value value-image" v-if="myShopInfo.baseImg">
+              <img :src="myShopInfo ? myShopInfo.baseImg : ''" alt="" />
+            </div>
+          </div>
+        </div>
+        <div class="main-cell">
+          <div class="cell-item">
+            <div class="item-icon"></div>
+            <div class="item-lable">经营范围：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.manageScope : '/'}}</div>
           </div>
         </div>
         <div class="main-cell">
@@ -43,44 +69,51 @@
             <div class="item-value">{{ myShopInfo ? myShopInfo.permissionProject : '/'}}</div>
           </div>
         </div>
+        <div class="main-cell">
+          <div class="cell-item">
+            <div class="item-icon"></div>
+            <div class="item-lable">门前三包等级：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.sbLevel : '/'}}</div>
+          </div>
+        </div>
       </div>
       <div class="cell-right">
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">食品生产经营主体类别：</div>
+            <div class="item-lable">经营业态：</div>
             <div class="item-value">{{ myShopInfo ? myShopInfo.operation : '/' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">法定代表人：</div>
-            <div class="item-value">{{ myShopInfo ? myShopInfo.bodyPrincipal : '' }}</div>
+            <div class="item-lable">路段：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.road : '' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">有效期至：</div>
-            <div class="item-value">2025-02-01</div>
+            <div class="item-lable">营业执照领取时间：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.businessLicenseTime : '' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">企业地址：</div>
+            <div class="item-lable">具体地址：</div>
             <div class="item-value">{{ myShopInfo ? myShopInfo.bodyAddress : '' }}</div>
           </div>
         </div>
         <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
-            <div class="item-lable">统一社会信用代码：</div>
-            <div class="item-value">{{ myShopInfo ? myShopInfo.code : '' }}</div>
+            <div class="item-lable">负责人手机号：</div>
+            <div class="item-value">{{ myShopInfo ? myShopInfo.phoneOne : '' }}</div>
           </div>
         </div>
-        <div class="main-cell">
+        <!-- <div class="main-cell">
           <div class="cell-item">
             <div class="item-icon"></div>
             <div class="item-lable">登记地址 ：</div>
@@ -100,7 +133,7 @@
             <div class="item-lable">成立日期：</div>
             <div class="item-value">{{ myShopInfo ? myShopInfo.businessLicenseTime : '/' }}</div>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
@@ -154,7 +187,7 @@ export default {
 .tab-main {
   margin-top: 20px;
   display: flex;
-  align-items: center;
+  // align-items: center;
   & > div {
     flex: 1;
   }
@@ -166,7 +199,7 @@ export default {
     .cell-item {
       flex: 1;
       display: flex;
-      align-items: flex-start;
+      // align-items: flex-start;
       margin-bottom: 20px;
       .item-icon {
         height: 30px;
@@ -190,12 +223,13 @@ export default {
         color: #e9f4ff;
       }
       .value-image {
-        width: 243px;
-        height: 163px;
+        width: 150px;
+        height: 150px;
         img {
           display: block;
           height: 100%;
-          width: 100%;
+          // width: 100%;
+          width: 150px;
         }
       }
     }
diff --git a/src/views/components/shop/index.vue b/src/views/components/shop/index.vue
index d7607c3..4be5822 100644
--- a/src/views/components/shop/index.vue
+++ b/src/views/components/shop/index.vue
@@ -53,7 +53,11 @@ export default {
     },
     open(info) {
       this.shopInfo = info;
-      this.$refs.dialog5.open("1");
+      if(info.baseImg) {
+        this.$refs.dialog5.open("10");
+      } else {
+        this.$refs.dialog5.open("9");
+      }
     },
     Close() {
       this.$refs.dialog5.Close();
diff --git a/src/views/components/title/index.vue b/src/views/components/title/index.vue
index ff4285a..0dca15b 100644
--- a/src/views/components/title/index.vue
+++ b/src/views/components/title/index.vue
@@ -4,11 +4,11 @@
  * @Author: JC9527
  * @Date: 2023-08-15 09:52:05
  * @LastEditors: JC9527
- * @LastEditTime: 2023-08-16 13:13:48
+ * @LastEditTime: 2024-01-12 23:50:11
 -->
 <template>
   <div class="mytitle">
-    <div class="title-text">
+    <div class="title-text" :text="title">
       {{ title }}
     </div>
     <!-- <div class="title-num" v-show="numShow > 0">
@@ -43,13 +43,25 @@ export default {
   display: flex;
   justify-content: space-between;
   .title-text {
-    font-size: vw(22);
+    font-size: vw(20);
     letter-spacing: vw(2);
-    font-family: 'YouSheBiaoTiHei';
+    font-family: 'Source Han Sans CN--Bold';
     font-weight: 400;
     color: #e9eff5;
     text-align: left;
     padding-left: vw(30);
+    &::before {
+      content: attr(text);
+      position: absolute;
+      z-index: 10;
+      color: #ffffff;
+      // 渐变样式
+      background: linear-gradient(180deg, #ffffff 0%, #43B4C5  100%);
+      -webkit-background-clip: text;
+      color: transparent;
+      // 去除继承父级样式
+      text-shadow: none;
+    }
   }
   .title-num {
     margin-right: vw(15);