gis-map-admin 1.6.0 → 1.6.2

package/lib/gismap.umd.js

@@ -12105,7 +12105,7 @@ var apiNow = __webpack_require__("dc47");
       };
       this.nearbyCameraListALL = [];
       this.showTextALL = false;
-      api["t" /* nearbyCamera */](
+      api["u" /* nearbyCamera */](
           params,
           this.$GlobalConfig.trafficMonitorUrl,
           this.$GlobalConfig.trafficMonitorType
@@ -12149,7 +12149,7 @@ var apiNow = __webpack_require__("dc47");
       this.nearbyVMSList2 = [];
       this.showTextALL = false;
       this.showText2 = false;
-      api["u" /* nearbyVMS */](
+      api["v" /* nearbyVMS */](
           params,
           this.$GlobalConfig.trafficMonitorUrl,
           this.$GlobalConfig.trafficMonitorType
@@ -12204,7 +12204,7 @@ var apiNow = __webpack_require__("dc47");
       this.videoInfo = {};
       this.videoInfo2 = {};
       let _this = this;
-      api["v" /* openCam */](
+      api["w" /* openCam */](
           camId,
           this.$GlobalConfig.trafficMonitorUrl,
           this.$GlobalConfig.trafficMonitorType,
@@ -18764,34 +18764,35 @@ module.exports = exports;
 "use strict";
 
 // EXPORTS
-__webpack_require__.d(__webpack_exports__, "o", function() { return /* binding */ getVideo; });
-__webpack_require__.d(__webpack_exports__, "w", function() { return /* binding */ positionLocation; });
-__webpack_require__.d(__webpack_exports__, "z", function() { return /* binding */ savePanTiltPosition; });
-__webpack_require__.d(__webpack_exports__, "k", function() { return /* binding */ getPanTiltPosition; });
-__webpack_require__.d(__webpack_exports__, "x", function() { return /* binding */ presetControl; });
+__webpack_require__.d(__webpack_exports__, "p", function() { return /* binding */ getVideo; });
+__webpack_require__.d(__webpack_exports__, "x", function() { return /* binding */ positionLocation; });
+__webpack_require__.d(__webpack_exports__, "A", function() { return /* binding */ savePanTiltPosition; });
+__webpack_require__.d(__webpack_exports__, "l", function() { return /* binding */ getPanTiltPosition; });
+__webpack_require__.d(__webpack_exports__, "y", function() { return /* binding */ presetControl; });
 __webpack_require__.d(__webpack_exports__, "b", function() { return /* binding */ closestcameraangleByXy; });
-__webpack_require__.d(__webpack_exports__, "p", function() { return /* binding */ getVideoPic; });
-__webpack_require__.d(__webpack_exports__, "i", function() { return /* binding */ getFgsList; });
-__webpack_require__.d(__webpack_exports__, "e", function() { return /* binding */ getDimmdmroadriList; });
-__webpack_require__.d(__webpack_exports__, "j", function() { return /* binding */ getOpmasubsectionriList; });
-__webpack_require__.d(__webpack_exports__, "g", function() { return /* binding */ getEquipList; });
-__webpack_require__.d(__webpack_exports__, "s", function() { return /* binding */ lonandlatTopile; });
-__webpack_require__.d(__webpack_exports__, "d", function() { return /* binding */ getDevdeviceInfo; });
-__webpack_require__.d(__webpack_exports__, "n", function() { return /* binding */ getStationData; });
-__webpack_require__.d(__webpack_exports__, "m", function() { return /* binding */ getRoadData; });
-__webpack_require__.d(__webpack_exports__, "h", function() { return /* binding */ getEventMainType; });
-__webpack_require__.d(__webpack_exports__, "q", function() { return /* binding */ getWeatherByLonAndLat; });
-__webpack_require__.d(__webpack_exports__, "y", function() { return /* binding */ queryMasterDetail; });
-__webpack_require__.d(__webpack_exports__, "t", function() { return /* binding */ nearbyCamera; });
-__webpack_require__.d(__webpack_exports__, "u", function() { return /* binding */ nearbyVMS; });
-__webpack_require__.d(__webpack_exports__, "v", function() { return /* binding */ openCam; });
+__webpack_require__.d(__webpack_exports__, "q", function() { return /* binding */ getVideoPic; });
+__webpack_require__.d(__webpack_exports__, "j", function() { return /* binding */ getFgsList; });
+__webpack_require__.d(__webpack_exports__, "f", function() { return /* binding */ getDimmdmroadriList; });
+__webpack_require__.d(__webpack_exports__, "k", function() { return /* binding */ getOpmasubsectionriList; });
+__webpack_require__.d(__webpack_exports__, "h", function() { return /* binding */ getEquipList; });
+__webpack_require__.d(__webpack_exports__, "t", function() { return /* binding */ lonandlatTopile; });
+__webpack_require__.d(__webpack_exports__, "e", function() { return /* binding */ getDevdeviceInfo; });
+__webpack_require__.d(__webpack_exports__, "o", function() { return /* binding */ getStationData; });
+__webpack_require__.d(__webpack_exports__, "n", function() { return /* binding */ getRoadData; });
+__webpack_require__.d(__webpack_exports__, "i", function() { return /* binding */ getEventMainType; });
+__webpack_require__.d(__webpack_exports__, "r", function() { return /* binding */ getWeatherByLonAndLat; });
+__webpack_require__.d(__webpack_exports__, "z", function() { return /* binding */ queryMasterDetail; });
+__webpack_require__.d(__webpack_exports__, "c", function() { return /* binding */ eventConvertType; });
+__webpack_require__.d(__webpack_exports__, "u", function() { return /* binding */ nearbyCamera; });
+__webpack_require__.d(__webpack_exports__, "v", function() { return /* binding */ nearbyVMS; });
+__webpack_require__.d(__webpack_exports__, "w", function() { return /* binding */ openCam; });
 __webpack_require__.d(__webpack_exports__, "a", function() { return /* binding */ addVideoPointData; });
-__webpack_require__.d(__webpack_exports__, "f", function() { return /* binding */ getEmergencyData; });
-__webpack_require__.d(__webpack_exports__, "r", function() { return /* binding */ gettrafficSafetyData; });
-__webpack_require__.d(__webpack_exports__, "c", function() { return /* binding */ getAuthCode; });
-__webpack_require__.d(__webpack_exports__, "l", function() { return /* binding */ getQuerybasicdata; });
-__webpack_require__.d(__webpack_exports__, "B", function() { return /* binding */ updateEventMaster; });
-__webpack_require__.d(__webpack_exports__, "A", function() { return /* binding */ sendMqttMessage; });
+__webpack_require__.d(__webpack_exports__, "g", function() { return /* binding */ getEmergencyData; });
+__webpack_require__.d(__webpack_exports__, "s", function() { return /* binding */ gettrafficSafetyData; });
+__webpack_require__.d(__webpack_exports__, "d", function() { return /* binding */ getAuthCode; });
+__webpack_require__.d(__webpack_exports__, "m", function() { return /* binding */ getQuerybasicdata; });
+__webpack_require__.d(__webpack_exports__, "C", function() { return /* binding */ updateEventMaster; });
+__webpack_require__.d(__webpack_exports__, "B", function() { return /* binding */ sendMqttMessage; });
 
 // UNUSED EXPORTS: getVideoToken, presetPositionPTZControl, closestcameraangle, getLdList, getCamBylatlon
 
@@ -19117,7 +19118,15 @@ function queryMasterDetail(data,urlPrefix,environmentType) {
     data
   })
 }
-
+// 事件类型列表
+function eventConvertType (data,urlPrefix,environmentType) {
+  return Object(request["a" /* default */])({
+    url: urlPrefix+ '/trafficMonitor/event/report/eventConvertType',
+    method: 'get',
+    type: environmentType,
+    data
+  })
+}
 /**
  * 拥堵路段附近摄像机
  * @param {*} devCategory {string} 设备类型（大类）003摄像机 005情报板
@@ -23916,7 +23925,7 @@ var api_api = __webpack_require__("4260");
 				this.$emit('videoUrlChange', this.videoUrl)
 				if(this.presetPosition !=null && this.presetPosition !=''){
 					//云台控制-预置位
-					Object(api_api["x" /* presetControl */])(this.camId, this.presetPosition);
+					Object(api_api["y" /* presetControl */])(this.camId, this.presetPosition);
 				}
             }
           }
@@ -137368,7 +137377,7 @@ var roadVms = __webpack_require__("cee8");
 		this.nearbyCameraList2 = []
 		this.showText = false
 		this.showText2 = false
-      api["t" /* nearbyCamera */](params, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType).then(res => {
+      api["u" /* nearbyCamera */](params, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType).then(res => {
         if (res !=null && res.code == 0) {
           // 上行
           this.nearbyCameraList = res.data.UP
@@ -137419,7 +137428,7 @@ var roadVms = __webpack_require__("cee8");
 		this.nearbyVMSList2 = []
 		this.showText = false
 		this.showText2 = false
-      api["u" /* nearbyVMS */](params, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType).then(res => {
+      api["v" /* nearbyVMS */](params, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType).then(res => {
         if (res !=null && res.code == 0) {
           // 上行
           this.nearbyVMSList = res.data.UP
@@ -137459,7 +137468,7 @@ var roadVms = __webpack_require__("cee8");
       if (!camId) return
       this.videoInfo = {}
       this.videoInfo2 = {}
-      api["v" /* openCam */](camId, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType, this.$GlobalConfig.netWorkType).then(res => {
+      api["w" /* openCam */](camId, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType, this.$GlobalConfig.netWorkType).then(res => {
         if (res !=null && res.data.recCode == '0') {
           name == 'playerUp' ? (this.videoInfo = res.data || {}) : (this.videoInfo2 = res.data || {})
 			if (name == 'playerUp') {
@@ -165376,7 +165385,7 @@ var flv_default = /*#__PURE__*/__webpack_require__.n(dist_flv);
 						userName: "userGisMap",
 						userDiffId: "1"
 					}
-					Object(api["o" /* getVideo */])(param).then((videoRes) => {
+					Object(api["p" /* getVideo */])(param).then((videoRes) => {
 						_this.videoUrl = videoRes.data.liveUrl
 						if (flv_default.a.isSupported()) {
 							if (_this.flvPlayer === null) {
@@ -165421,13 +165430,13 @@ var flv_default = /*#__PURE__*/__webpack_require__.n(dist_flv);
 						"tilt": res.data.tilt
 					}
 					//16、获取云台位置信息
-					Object(api["k" /* getPanTiltPosition */])({"camId": res.data.devBasicRiDTO.devNo}).then((gres) =>{
+					Object(api["l" /* getPanTiltPosition */])({"camId": res.data.devBasicRiDTO.devNo}).then((gres) =>{
 						if(gres !=null && gres.code ==0 && gres.data !=null && gres.data.msgType == '9'){
 							_this.zoom = gres.data.zoom;
 							_this.pan = gres.data.pan;
 							_this.tilt = gres.data.tilt;
 							//17、根据位置快速定位
-							Object(api["w" /* positionLocation */])(positionLocationParam).then((pres) =>{
+							Object(api["x" /* positionLocation */])(positionLocationParam).then((pres) =>{
 								if(pres !=null && pres.code ==0 && pres.data !=null){
 									_this.savepantiltPositionReq(res.data.zoom,res.data.pan,res.data.tilt,"0");
 									_this.savepantiltPositionInterval = setInterval(() => {
@@ -165449,7 +165458,7 @@ var flv_default = /*#__PURE__*/__webpack_require__.n(dist_flv);
 			"tilt": tilt,
 			"status": status
 		}
-		Object(api["z" /* savePanTiltPosition */])(savepantiltPositionParam).then((res) =>{
+		Object(api["A" /* savePanTiltPosition */])(savepantiltPositionParam).then((res) =>{
 			console.log('savePanTiltPosition.res',res)
 		})
 	},
@@ -165465,7 +165474,7 @@ var flv_default = /*#__PURE__*/__webpack_require__.n(dist_flv);
 				"pan": _this.pan,
 				"tilt": _this.tilt
 			}
-			Object(api["w" /* positionLocation */])(positionLocationParam).then((pres) =>{
+			Object(api["x" /* positionLocation */])(positionLocationParam).then((pres) =>{
 				console.log('closestcameraangle.positionLocation.pres',pres)
 				if(pres !=null && pres.code ==0 && pres.data !=null){
 					_this.savepantiltPositionReq(_this.zoom,_this.pan,_this.tilt,"2");
@@ -165682,7 +165691,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -166293,7 +166302,7 @@ var md5_default = /*#__PURE__*/__webpack_require__.n(md5);
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -166433,7 +166442,7 @@ var md5_default = /*#__PURE__*/__webpack_require__.n(md5);
 				userName: "userGisMap",
         userDiffId: "1"
       }
-      Object(api["o" /* getVideo */])(param)
+      Object(api["p" /* getVideo */])(param)
         .then((res) => {
           let videoUrl = res.data.liveUrl
           if (flv_default.a.isSupported()) {
@@ -167018,7 +167027,7 @@ var CMLayervue_type_template_id_3e494b25_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -168049,7 +168058,7 @@ var visibilityLayervue_type_template_id_58911984_scoped_true_staticRenderFns = [
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -168781,7 +168790,7 @@ var roadstateLayervue_type_template_id_aa120892_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -169567,7 +169576,7 @@ var meteorologicalLayervue_type_template_id_1af1f284_scoped_true_staticRenderFns
 						camId: this.camId,
 						timestamp: new Date().getTime()
 					}
-					Object(api["p" /* getVideoPic */])(paramPic)
+					Object(api["q" /* getVideoPic */])(paramPic)
 						.then((res) => {
 							this.loading = false;
 							if (res && res.size > 500) {
@@ -171199,7 +171208,7 @@ var mountLayervue_type_template_id_4ead02fb_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -171230,7 +171239,7 @@ var mountLayervue_type_template_id_4ead02fb_scoped_true_staticRenderFns = []
 				userName: "userGisMap",
         userDiffId: "1"
       }
-      Object(api["o" /* getVideo */])(param)
+      Object(api["p" /* getVideo */])(param)
         .then((res) => {
           this.videoUrl = res.data.liveUrl
           if (flv_default.a.isSupported()) {
@@ -171297,7 +171306,7 @@ var mountLayervue_type_template_id_4ead02fb_scoped_true_staticRenderFns = []
       }
     },
     controlDialogOpen() {
-      Object(api["o" /* getVideo */])('29818')
+      Object(api["p" /* getVideo */])('29818')
         .then((res) => {
           this.videoUrl = res.data.liveUrl
           if (flv_default.a.isSupported()) {
@@ -171785,7 +171794,7 @@ var lightSignLayervue_type_template_id_a24a0996_scoped_true_staticRenderFns = [f
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -172442,7 +172451,7 @@ var rippleLayervue_type_template_id_7dfa846a_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -173264,7 +173273,7 @@ var VideoPlayLivevue_type_template_id_649824c4_scoped_true_staticRenderFns = []
 		userName: "userGisMap",
         userDiffId: "1"
       }
-      Object(api["o" /* getVideo */])(param)
+      Object(api["p" /* getVideo */])(param)
         .then((res) => {
           this.videoUrl = res.data.liveUrl
           if (flv_default.a.isSupported()) {
@@ -173733,7 +173742,7 @@ var VideoPlayLive_component = Object(componentNormalizer["a" /* default */])(
           camId: this.camId,
           timestamp: new Date().getTime()
         }
-        Object(api["p" /* getVideoPic */])(paramPic)
+        Object(api["q" /* getVideoPic */])(paramPic)
           .then((res) => {
             this.loading = false;
             if (res && res.size > 500) {
@@ -176160,7 +176169,7 @@ var vue_seamless_scroll_min_default = /*#__PURE__*/__webpack_require__.n(vue_sea
       this.devCode = this.popupAttr.dev_no;
       //console.log(this.devCode+':devCode')
       let req = { devNo: this.devCode, devCategory: "005" };
-      Object(api["d" /* getDevdeviceInfo */])(req).then((res) => {
+      Object(api["e" /* getDevdeviceInfo */])(req).then((res) => {
         if (res != null && res.code == 0) {
           this.boardInfo = res.data[0] || {};
           this.camId = this.boardInfo.cameraId;
@@ -176635,7 +176644,7 @@ var vue_seamless_scroll_min_default = /*#__PURE__*/__webpack_require__.n(vue_sea
         camId: this.camId,
         timestamp: new Date().getTime()
       }
-      Object(api["p" /* getVideoPic */])(paramPic)
+      Object(api["q" /* getVideoPic */])(paramPic)
         .then((res) => {
           this.loading = false;
           if (res && res.size > 500) {
@@ -177649,7 +177658,7 @@ var fogGuideLayervue_type_template_id_7fea8d7e_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -178428,7 +178437,7 @@ var js_pinyin_default = /*#__PURE__*/__webpack_require__.n(js_pinyin);
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -178735,7 +178744,7 @@ var coneBarrelLayervue_type_template_id_94993e56_scoped_true_staticRenderFns = [
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -179223,7 +179232,7 @@ var radarAndvideoLayervue_type_template_id_e84e04a2_scoped_true_staticRenderFns
           camId: this.camId,
           timestamp: new Date().getTime()
         }
-        Object(api["p" /* getVideoPic */])(paramPic)
+        Object(api["q" /* getVideoPic */])(paramPic)
           .then((res) => {
             this.loading = false;
             if (res && res.size > 500) {
@@ -179608,7 +179617,7 @@ var smartBoxLayervue_type_template_id_a5916382_scoped_true_staticRenderFns = [fu
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -180031,7 +180040,7 @@ var parkingSignLayervue_type_template_id_7c849bfc_scoped_true_staticRenderFns =
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -180326,7 +180335,7 @@ var baseStationLayervue_type_template_id_c19e8356_scoped_true_staticRenderFns =
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -180569,7 +180578,7 @@ var VideoPlayNetLayervue_type_template_id_32f47a90_scoped_true_staticRenderFns =
 		userName: "userGisMap",
         userDiffId: "1"
       }
-      Object(api["o" /* getVideo */])(param)
+      Object(api["p" /* getVideo */])(param)
         .then((res) => {
           this.videoUrl = res.data.liveUrl
           if (flv_default.a.isSupported()) {
@@ -180596,7 +180605,7 @@ var VideoPlayNetLayervue_type_template_id_32f47a90_scoped_true_staticRenderFns =
 				this.$emit('videoUrlChange', this.videoUrl)
 				if(this.presetPosition !=null && this.presetPosition !=''){
 					//云台控制-预置位
-					Object(api["x" /* presetControl */])(this.camId, this.presetPosition);
+					Object(api["y" /* presetControl */])(this.camId, this.presetPosition);
 				}
             }
           }
@@ -180939,7 +180948,7 @@ var VideoPlayNetLayer_component = Object(componentNormalizer["a" /* default */])
 					//sessionStorage.setItem('sdhsg_its_app-1.6.12-uuid','admin')
 					isGoto = false;
 					//获取authCode
-					Object(api["c" /* getAuthCode */])(sessionStorage.getItem('sdhsg_its_app-1.6.12-uuid')).then((res) => {
+					Object(api["d" /* getAuthCode */])(sessionStorage.getItem('sdhsg_its_app-1.6.12-uuid')).then((res) => {
 						if(res.code == 0){
 							window.open(item.jumpUrl.replace('{authCode}',res.data));
 						}else{
@@ -180981,7 +180990,7 @@ var VideoPlayNetLayer_component = Object(componentNormalizer["a" /* default */])
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -181519,7 +181528,7 @@ var pivotLayervue_type_template_id_2c87731c_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -181788,7 +181797,7 @@ var interchangeLayervue_type_template_id_0decb4d0_scoped_true_staticRenderFns =
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -183201,7 +183210,7 @@ var stationLayervue_type_template_id_190bfc05_scoped_true_staticRenderFns = [fun
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -183619,7 +183628,7 @@ var bridgeLayervue_type_template_id_2051ff00_scoped_true_staticRenderFns = [func
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -183960,7 +183969,7 @@ var tunnelLayervue_type_template_id_0fb53471_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -184294,7 +184303,7 @@ var ETCLayervue_type_template_id_23a620d8_scoped_true_staticRenderFns = [functio
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -185287,7 +185296,7 @@ var organizationLayervue_type_template_id_5bdc7018_scoped_true_staticRenderFns =
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -185326,7 +185335,7 @@ var organizationLayervue_type_template_id_5bdc7018_scoped_true_staticRenderFns =
 				userName: "userGisMap",
 				userDiffId: "1"
 			}
-     Object(api["o" /* getVideo */])(param)
+     Object(api["p" /* getVideo */])(param)
         .then((res) => {
           this.videoUrl = res.data.liveUrl
           if (flv_default.a.isSupported()) {
@@ -185898,7 +185907,7 @@ var roadVms = __webpack_require__("cee8");
       this.nearbyCameraList2 = [];
       this.showText = false;
       this.showText2 = false;
-      api["t" /* nearbyCamera */](
+      api["u" /* nearbyCamera */](
           params,
           this.$GlobalConfig.trafficMonitorUrl,
           this.$GlobalConfig.trafficMonitorType
@@ -185955,7 +185964,7 @@ var roadVms = __webpack_require__("cee8");
       this.nearbyVMSList2 = [];
       this.showText = false;
       this.showText2 = false;
-      api["u" /* nearbyVMS */](
+      api["v" /* nearbyVMS */](
           params,
           this.$GlobalConfig.trafficMonitorUrl,
           this.$GlobalConfig.trafficMonitorType
@@ -186012,7 +186021,7 @@ var roadVms = __webpack_require__("cee8");
       this.videoInfo = {};
       this.videoInfo2 = {};
       let _this = this;
-      api["v" /* openCam */](
+      api["w" /* openCam */](
           camId,
           this.$GlobalConfig.trafficMonitorUrl,
           this.$GlobalConfig.trafficMonitorType,
@@ -186433,12 +186442,12 @@ var trafficEventLayer_component = Object(componentNormalizer["a" /* default */])
 )
 
 /* harmony default export */ var trafficEventLayer = (trafficEventLayer_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7149c62c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gis-map/src/component/eventLayer/perceptionEventLayer.vue?vue&type=template&id=6f22e751&
-var perceptionEventLayervue_type_template_id_6f22e751_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"perceptionEventLayer"},[_c('div',{staticClass:"discontent"},[_c('div',{staticClass:"content_l"},[_c('div',{staticClass:"topCon"},[_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.videoActive),expression:"videoActive"}],staticClass:"btnsCarousel"},[_c('el-button',{staticClass:"leftCarousel",attrs:{"disabled":_vm.leftCarouselBtn,"icon":"el-icon-caret-left","circle":"","size":"mini"},on:{"click":function($event){return _vm.switchVideo('left')}}}),_c('el-button',{staticClass:"rightCarousel",attrs:{"disabled":_vm.rightCarouselBtn,"icon":"el-icon-caret-right","circle":"","size":"mini"},on:{"click":function($event){return _vm.switchVideo('right')}}})],1),_c('div',{staticClass:"videoBox"},[_c('i',{directives:[{name:"show",rawName:"v-show",value:(_vm.videoActive),expression:"videoActive"}],staticClass:"el-icon-full-screen",class:_vm.fullScreenZoom,attrs:{"title":_vm.fullscreen ? '退出全屏' : '全屏'},on:{"click":function($event){return _vm.handleFullScreen($event)}}}),_c('video',{directives:[{name:"show",rawName:"v-show",value:(_vm.videoActive),expression:"videoActive"}],staticStyle:{"object-fit":"fill"},attrs:{"autoplay":"","width":"100%","height":"100%","id":"videoElement"}})]),_c('img',{directives:[{name:"show",rawName:"v-show",value:(_vm.imgActive),expression:"imgActive"}],staticClass:"xcImg",staticStyle:{"cursor":"pointer"},attrs:{"src":_vm.imgUrl,"alt":""},on:{"click":function($event){return _vm.imgx2($event)}}}),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.imgVideoActive),expression:"imgVideoActive"}],staticClass:"videoBox"},[_c('i',{directives:[{name:"show",rawName:"v-show",value:(_vm.imgVideoActive),expression:"imgVideoActive"}],staticClass:"el-icon-full-screen",class:_vm.fullScreenZoom2,attrs:{"title":_vm.fullscreen ? '退出全屏' : '全屏'},on:{"click":function($event){return _vm.handleFullScreen($event)}}}),_c('video',{directives:[{name:"show",rawName:"v-show",value:(_vm.imgVideoActive),expression:"imgVideoActive"}],staticStyle:{"object-fit":"fill"},attrs:{"autoplay":"","loop":"","width":"100%","height":"100%","src":_vm.imgVideoUrl}})]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.popupAttr.dataSource == 2),expression:"popupAttr.dataSource == 2"}],staticClass:"btns"},[_c('div',{class:_vm.btnImgActive,on:{"click":function($event){return _vm.showActive('video')}}},[_vm._v("视频")]),_c('div',{class:_vm.btnVideoActive,on:{"click":function($event){return _vm.showActive('img')}}},[_vm._v("图像")])])]),_c('div',{staticClass:"dmcll"},[(_vm.echartsIsShow)?_c('div',{staticClass:"noInfoText"},[_vm._v("断面车流量暂无数据")]):_vm._e(),_c('div',{ref:"etCharts",staticStyle:{"height":"0.885416rem","width":"100%"}})])]),_c('div',{staticClass:"content_r"},[_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("事件地点：")]),_c('span',{staticStyle:{"padding-top":"0.0104166rem"}},[_vm._v(_vm._s(_vm.popupAttr.location))]),_vm._v(" "),(_vm.popupAttr.eventType !== '大雾')?_c('span',{staticStyle:{"padding-top":"0.0104166rem"}},[_vm._v(_vm._s(_vm.popupAttr.stakeNumber))]):_vm._e(),_vm._v(" "),(_vm.popupAttr.eventType === '大雾')?_c('span',{staticStyle:{"padding-top":"0.0104166rem"}},[_vm._v(_vm._s(_vm.popupAttr.beginPile)+" ~")]):_vm._e(),_vm._v(" "),(_vm.popupAttr.eventType === '大雾')?_c('span',{staticStyle:{"padding-top":"0.0104166rem"}},[_vm._v(_vm._s(_vm.popupAttr.endPile))]):_vm._e(),_vm._v(" "),(_vm.popupAttr.eventType !== '大雾')?_c('span',[_vm._v(_vm._s(_vm.eventDirection))]):_vm._e()]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("事件类型：")]),_c('span',[_vm._v(_vm._s(_vm.trafficMainName))])]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("细分类别：")]),_c('span',[_vm._v(_vm._s(_vm.trafficSubName))])]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("事件来源：")]),_c('span',[_vm._v(_vm._s(_vm.popupAttr.eventSource))])]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("事件描述：")]),_c('el-input',{attrs:{"type":"textarea","rows":4},on:{"blur":_vm.updataEvent},model:{value:(_vm.eventForm.eventDis),callback:function ($$v) {_vm.$set(_vm.eventForm, "eventDis", $$v)},expression:"eventForm.eventDis"}})],1),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("报警时间：")]),_c('span',[_vm._v(_vm._s(_vm.popupAttr.occurTime))])]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("影响车道：")]),_c('el-checkbox-group',{attrs:{"text-color":"#fff !important"},on:{"input":_vm.updataEvent},model:{value:(_vm.eventForm.enentCd),callback:function ($$v) {_vm.$set(_vm.eventForm, "enentCd", $$v)},expression:"eventForm.enentCd"}},[_c('el-checkbox-button',{key:"1",attrs:{"label":"1"}},[_vm._v("1")]),_c('el-checkbox-button',{key:"2",attrs:{"label":"2"}},[_vm._v("2")]),_c('el-checkbox-button',{key:"4",attrs:{"label":"4"}},[_vm._v("3")]),_c('el-checkbox-button',{key:"5",attrs:{"label":"5"}},[_vm._v("4")]),_c('el-checkbox-button',{key:"3",attrs:{"label":"3"}},[_vm._v("应急")])],1)],1),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("持续时间：")]),_c('span',[_vm._v(_vm._s(_vm.duration))])]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("天气情况：")]),_c('span',[_vm._v(_vm._s(_vm.weatherDescription))])]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.perceptionEventReleaseShow),expression:"perceptionEventReleaseShow"}],staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("解除原因：")]),_c('el-radio-group',{staticStyle:{"width":"1.3rem"},model:{value:(_vm.popupAttr.releaseReason),callback:function ($$v) {_vm.$set(_vm.popupAttr, "releaseReason", $$v)},expression:"popupAttr.releaseReason"}},[_c('el-row',[_c('el-col',{attrs:{"span":12}},[_c('el-radio',{attrs:{"label":1}},[_vm._v("误报解除")])],1),_c('el-col',{attrs:{"span":12}},[_c('el-radio',{attrs:{"label":2}},[_vm._v("事件已结束")])],1),_c('el-col',{attrs:{"span":12}},[_c('el-radio',{attrs:{"label":3}},[_vm._v("无需处理事件")])],1),_c('el-col',{attrs:{"span":12}},[_c('el-radio',{attrs:{"label":4}},[_vm._v("其他")])],1)],1)],1)],1),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.perceptionEventReleaseShow),expression:"perceptionEventReleaseShow"}],staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("解除描述：")]),_c('el-input',{attrs:{"type":"textarea","rows":2},on:{"blur":_vm.updataEvent},model:{value:(_vm.popupAttr.reasonDesc),callback:function ($$v) {_vm.$set(_vm.popupAttr, "reasonDesc", $$v)},expression:"popupAttr.reasonDesc"}})],1)]),_c('div',{staticStyle:{"clear":"both"}}),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.shouldShow),expression:"shouldShow"}],staticClass:"content_b"},[_c('div',{staticClass:"btn",on:{"click":_vm.schedulingSettings}},[_vm._v("调度处置")]),_c('div',{staticClass:"btn btn_c",on:{"click":_vm.terminationOfAlarm}},[_vm._v("事件解除")])])])])}
-var perceptionEventLayervue_type_template_id_6f22e751_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7149c62c-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gis-map/src/component/eventLayer/perceptionEventLayer.vue?vue&type=template&id=8b626b3c&
+var perceptionEventLayervue_type_template_id_8b626b3c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],staticClass:"perceptionEventLayer",attrs:{"element-loading-background":"rgba(4, 27, 51, 0.5)"}},[_c('div',{staticClass:"discontent"},[_c('div',{staticClass:"content_l"},[_c('div',{staticClass:"topCon"},[_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.videoActive),expression:"videoActive"}],staticClass:"btnsCarousel"},[_c('el-button',{staticClass:"leftCarousel",attrs:{"disabled":_vm.leftCarouselBtn,"icon":"el-icon-caret-left","circle":"","size":"mini"},on:{"click":function($event){return _vm.switchVideo('left')}}}),_c('el-button',{staticClass:"rightCarousel",attrs:{"disabled":_vm.rightCarouselBtn,"icon":"el-icon-caret-right","circle":"","size":"mini"},on:{"click":function($event){return _vm.switchVideo('right')}}})],1),_c('div',{staticClass:"videoBox"},[_c('i',{directives:[{name:"show",rawName:"v-show",value:(_vm.videoActive),expression:"videoActive"}],staticClass:"el-icon-full-screen",class:_vm.fullScreenZoom,attrs:{"title":_vm.fullscreen ? '退出全屏' : '全屏'},on:{"click":function($event){return _vm.handleFullScreen($event)}}}),_c('video',{directives:[{name:"show",rawName:"v-show",value:(_vm.videoActive),expression:"videoActive"}],staticStyle:{"object-fit":"fill"},attrs:{"autoplay":"","width":"100%","height":"100%","id":"videoElement"}})]),_c('img',{directives:[{name:"show",rawName:"v-show",value:(_vm.imgActive),expression:"imgActive"}],staticClass:"xcImg",staticStyle:{"cursor":"pointer"},attrs:{"src":_vm.imgUrl,"alt":""},on:{"click":function($event){return _vm.imgx2($event)}}}),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.imgVideoActive),expression:"imgVideoActive"}],staticClass:"videoBox"},[_c('i',{directives:[{name:"show",rawName:"v-show",value:(_vm.imgVideoActive),expression:"imgVideoActive"}],staticClass:"el-icon-full-screen",class:_vm.fullScreenZoom2,attrs:{"title":_vm.fullscreen ? '退出全屏' : '全屏'},on:{"click":function($event){return _vm.handleFullScreen($event)}}}),_c('video',{directives:[{name:"show",rawName:"v-show",value:(_vm.imgVideoActive),expression:"imgVideoActive"}],staticStyle:{"object-fit":"fill"},attrs:{"autoplay":"","loop":"","width":"100%","height":"100%","src":_vm.imgVideoUrl}})]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.popupAttr.dataSource == 2),expression:"popupAttr.dataSource == 2"}],staticClass:"btns"},[_c('div',{class:_vm.btnImgActive,on:{"click":function($event){return _vm.showActive('video')}}},[_vm._v("视频")]),_c('div',{class:_vm.btnVideoActive,on:{"click":function($event){return _vm.showActive('img')}}},[_vm._v("图像")])])]),_c('div',{staticClass:"dmcll"},[(_vm.echartsIsShow)?_c('div',{staticClass:"noInfoText"},[_vm._v("断面车流量暂无数据")]):_vm._e(),_c('div',{ref:"etCharts",staticStyle:{"height":"0.885416rem","width":"100%"}})])]),_c('div',{staticClass:"content_r"},[_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("事件地点：")]),_c('span',{staticStyle:{"padding-top":"0.0104166rem"}},[_vm._v(_vm._s(_vm.popupAttr.location))]),_vm._v(" "),(_vm.popupAttr.eventType !== '大雾')?_c('span',{staticStyle:{"padding-top":"0.0104166rem"}},[_vm._v(_vm._s(_vm.popupAttr.stakeNumber))]):_vm._e(),_vm._v(" "),(_vm.popupAttr.eventType === '大雾')?_c('span',{staticStyle:{"padding-top":"0.0104166rem"}},[_vm._v(_vm._s(_vm.popupAttr.beginPile)+" ~")]):_vm._e(),_vm._v(" "),(_vm.popupAttr.eventType === '大雾')?_c('span',{staticStyle:{"padding-top":"0.0104166rem"}},[_vm._v(_vm._s(_vm.popupAttr.endPile))]):_vm._e(),_vm._v(" "),(_vm.popupAttr.eventType !== '大雾')?_c('span',[_vm._v(_vm._s(_vm.eventDirection))]):_vm._e()]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("事件类型：")]),_c('el-select',{staticStyle:{"width":"70%"},on:{"change":_vm.mainCodeChange},model:{value:(_vm.popupAttr.trafficMainCode),callback:function ($$v) {_vm.$set(_vm.popupAttr, "trafficMainCode", $$v)},expression:"popupAttr.trafficMainCode"}},_vm._l((_vm.eventTypeList),function(item,i){return _c('el-option',{key:i,attrs:{"label":item.trafficMainName,"value":item.trafficMainCode}})}),1)],1),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("细分类别：")]),_c('el-select',{staticStyle:{"width":"70%"},on:{"change":_vm.subCodeChange},model:{value:(_vm.popupAttr.trafficSubCode),callback:function ($$v) {_vm.$set(_vm.popupAttr, "trafficSubCode", $$v)},expression:"popupAttr.trafficSubCode"}},_vm._l((_vm.subEventTypeList),function(item,i){return _c('el-option',{key:i,attrs:{"label":item.trafficSubName,"value":item.trafficSubCode}})}),1)],1),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("事件来源：")]),_c('span',[_vm._v(_vm._s(_vm.popupAttr.eventSource))])]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("事件描述：")]),_c('el-input',{attrs:{"type":"textarea","rows":4},on:{"blur":_vm.updataEvent},model:{value:(_vm.eventForm.eventDis),callback:function ($$v) {_vm.$set(_vm.eventForm, "eventDis", $$v)},expression:"eventForm.eventDis"}})],1),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("报警时间：")]),_c('span',[_vm._v(_vm._s(_vm.popupAttr.occurTime))])]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("影响车道：")]),_c('el-checkbox-group',{attrs:{"text-color":"#fff !important"},on:{"input":_vm.updataEvent},model:{value:(_vm.eventForm.enentCd),callback:function ($$v) {_vm.$set(_vm.eventForm, "enentCd", $$v)},expression:"eventForm.enentCd"}},[_c('el-checkbox-button',{key:"1",attrs:{"label":"1"}},[_vm._v("1")]),_c('el-checkbox-button',{key:"2",attrs:{"label":"2"}},[_vm._v("2")]),_c('el-checkbox-button',{key:"4",attrs:{"label":"4"}},[_vm._v("3")]),_c('el-checkbox-button',{key:"5",attrs:{"label":"5"}},[_vm._v("4")]),_c('el-checkbox-button',{key:"3",attrs:{"label":"3"}},[_vm._v("应急")])],1)],1),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("持续时间：")]),_c('span',[_vm._v(_vm._s(_vm.duration))])]),_c('div',{staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("天气情况：")]),_c('span',[_vm._v(_vm._s(_vm.weatherDescription))])]),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.perceptionEventReleaseShow),expression:"perceptionEventReleaseShow"}],staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("解除原因：")]),_c('el-radio-group',{staticStyle:{"width":"1.3rem"},model:{value:(_vm.popupAttr.releaseReason),callback:function ($$v) {_vm.$set(_vm.popupAttr, "releaseReason", $$v)},expression:"popupAttr.releaseReason"}},[_c('el-row',[_c('el-col',{attrs:{"span":12}},[_c('el-radio',{attrs:{"label":1}},[_vm._v("误报解除")])],1),_c('el-col',{attrs:{"span":12}},[_c('el-radio',{attrs:{"label":2}},[_vm._v("事件已结束")])],1),_c('el-col',{attrs:{"span":12}},[_c('el-radio',{attrs:{"label":3}},[_vm._v("无需处理事件")])],1),_c('el-col',{attrs:{"span":12}},[_c('el-radio',{attrs:{"label":4}},[_vm._v("其他")])],1)],1)],1)],1),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.perceptionEventReleaseShow),expression:"perceptionEventReleaseShow"}],staticClass:"item"},[_c('span',{staticClass:"lable"},[_vm._v("解除描述：")]),_c('el-input',{attrs:{"type":"textarea","rows":2},on:{"blur":_vm.updataEvent},model:{value:(_vm.popupAttr.reasonDesc),callback:function ($$v) {_vm.$set(_vm.popupAttr, "reasonDesc", $$v)},expression:"popupAttr.reasonDesc"}})],1)]),_c('div',{staticStyle:{"clear":"both"}}),_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.shouldShow),expression:"shouldShow"}],staticClass:"content_b"},[_c('div',{staticClass:"btn",on:{"click":_vm.schedulingSettings}},[_vm._v("事件确认")]),_c('div',{staticClass:"btn btn_c",on:{"click":_vm.terminationOfAlarm}},[_vm._v("事件解除")])])])])}
+var perceptionEventLayervue_type_template_id_8b626b3c_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/gis-map/src/component/eventLayer/perceptionEventLayer.vue?vue&type=template&id=6f22e751&
+// CONCATENATED MODULE: ./packages/gis-map/src/component/eventLayer/perceptionEventLayer.vue?vue&type=template&id=8b626b3c&
 
 // EXTERNAL MODULE: ./node_modules/swiper/css/swiper.min.css
 var swiper_min = __webpack_require__("f4bd");
@@ -186657,6 +186666,12 @@ var swiper_min = __webpack_require__("f4bd");
 //
 //
 //
+//
+//
+//
+//
+//
+//
 
 //import flvjs from "flv.js";
 
@@ -186681,6 +186696,8 @@ var swiper_min = __webpack_require__("f4bd");
         eventDis: "",
         enentCd: [],
       },
+      eventTypeList: [],
+      subEventTypeList: [],
       echartsIsShow: false,
       messageEvent: true,
       // dispatchDialog: false,
@@ -186714,6 +186731,7 @@ var swiper_min = __webpack_require__("f4bd");
       fullscreen: null,
       masterDetailInfo: null,
       perceptionEventReleaseShow: false,
+      loading: false,
     };
   },
   mounted() {
@@ -186731,6 +186749,35 @@ var swiper_min = __webpack_require__("f4bd");
       }
       this.fullscreen = !this.fullscreen;
     },
+    getEventTypeList(eventTypeCode) {
+      this.eventTypeList = [];
+      this.subEventTypeList = [];
+      Object(api["c" /* eventConvertType */])(
+        eventTypeCode,
+        this.$GlobalConfig.trafficMonitorUrl,
+        this.$GlobalConfig.trafficMonitorType
+      ).then((data) => {
+        this.eventTypeList = data.data || [];
+        this.subEventTypeList = data.data[0].childList || [];
+      });
+    },
+    // 主类型改变
+    mainCodeChange(val) {
+      let obj = this.eventTypeList.find((e) => e.trafficMainCode == val);
+      this.popupAttr.trafficMainCode = val;
+      this.popupAttr.trafficMainName = obj.trafficMainName;
+      this.subEventTypeList = obj.childList || [];
+      this.popupAttr.trafficSubCode = this.subEventTypeList[0].trafficSubCode;
+      this.popupAttr.trafficSubName = this.subEventTypeList[0].trafficSubName;
+      this.popupAttr.eventCode = this.subEventTypeList[0].eventCode;
+    },
+    // 子类型改变
+    subCodeChange(val) {
+      let obj = this.subEventTypeList.find((e) => e.trafficSubCode == val);
+      this.popupAttr.trafficSubCode = val;
+      this.popupAttr.trafficSubName = obj.trafficSubName;
+      this.popupAttr.eventCode = obj.eventCode;
+    },
     imgx2(e) {
       console.log(e.target.src);
       this.$emit("imgDoubleClick", e.target.src);
@@ -186742,6 +186789,7 @@ var swiper_min = __webpack_require__("f4bd");
       return value;
     },
     _show() {
+      this.loading = true;
       this.perceptionEventReleaseShow = false;
       window.addEventListener("fullscreenchange", () => {
         if (document.fullscreenElement) {
@@ -186913,9 +186961,10 @@ var swiper_min = __webpack_require__("f4bd");
           }
         }
       }
+      this.getEventTypeList(this.popupAttr.eventTypecode);
     },
     initEventMainType() {
-      Object(api["h" /* getEventMainType */])().then((res) => {
+      Object(api["i" /* getEventMainType */])().then((res) => {
         if (res != null && res.code == 0) {
           this.eventMainTypeList = res.data;
         }
@@ -186946,11 +186995,12 @@ var swiper_min = __webpack_require__("f4bd");
       this.videoList = [];
       //console.log('popupAttr',this.popupAttr)
       let reqData = { id: this.popupAttr.id };
-      Object(api["y" /* queryMasterDetail */])(
+      Object(api["z" /* queryMasterDetail */])(
         reqData,
         this.$GlobalConfig.trafficMonitorUrl,
         this.$GlobalConfig.trafficMonitorType
       ).then((res) => {
+        this.loading = false;
         console.log("queryMasterDetail.res", res);
         if (res.code == 0 && res.data != null) {
           this.masterDetailInfo = res.data;
@@ -186976,6 +187026,8 @@ var swiper_min = __webpack_require__("f4bd");
             this.rightCarouselBtn = true;
           }
         }
+      }).catch(() => {
+        this.loading = false;
       });
     },
     initWeatherByLonAndLat() {
@@ -186983,7 +187035,7 @@ var swiper_min = __webpack_require__("f4bd");
         lon: this.popupAttr.longitude,
         lat: this.popupAttr.latitude,
       };
-      Object(api["q" /* getWeatherByLonAndLat */])(reqData).then((res) => {
+      Object(api["r" /* getWeatherByLonAndLat */])(reqData).then((res) => {
         if (res != null && res.code == 0) {
           this.weatherDescription = res.data.data;
         }
@@ -186993,8 +187045,15 @@ var swiper_min = __webpack_require__("f4bd");
       this.popupAttr.type = this.trafficEventType;
     },
     schedulingSettings() {
-      this.$emit("schedulingSettings", this.popupAttr, this.masterDetailInfo);
-      this.$emit("removeAllVideoPoint", this.popupAttr, this.masterDetailInfo);
+      if(!this.popupAttr.trafficMainCode) return this.$message({message:'请选择事件类型',type:'warning'});
+      if(!this.popupAttr.trafficSubCode) return this.$message({message:'请选择细分类型',type:'warning'});
+      this.$confirm(`是否将本事件确认为 ${this.popupAttr.trafficMainName}(${this.popupAttr.trafficSubName})？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(() => {
+          this.$emit("schedulingSettings", this.popupAttr, this.masterDetailInfo);
+          this.$emit("removeAllVideoPoint", this.popupAttr, this.masterDetailInfo);
+        }).catch(() => {});
     },
     terminationOfAlarm() {
       if (this.perceptionEventReleaseShow) {
@@ -187175,7 +187234,7 @@ var swiper_min = __webpack_require__("f4bd");
       // 	camId: this.devId,
       // };
       // console.log("发送流请求", param);
-      Object(api["v" /* openCam */])(
+      Object(api["w" /* openCam */])(
         devId,
         this.$GlobalConfig.trafficMonitorUrl,
         this.$GlobalConfig.trafficMonitorType,
@@ -187266,7 +187325,7 @@ var swiper_min = __webpack_require__("f4bd");
         eventDesc: this.eventForm.eventDis,
         lane: lanes,
       };
-      Object(api["B" /* updateEventMaster */])(reqData).then((res) => {
+      Object(api["C" /* updateEventMaster */])(reqData).then((res) => {
         if (res.code == 0) {
           /* this.$message({
 					message: "修改成功",
@@ -187340,10 +187399,21 @@ var swiper_min = __webpack_require__("f4bd");
       return className;
     },
     shouldShow() {
-      console.log('1111111111111111111111',this.specialId === this.popupAttr.deptId || this.specialId === this.popupAttr.deptPid ||this.specialId === 'YG1'||this.specialId === '');
-      
-      return this.specialId === this.popupAttr.deptId || this.specialId === this.popupAttr.deptPid ||this.specialId === 'YG1'||this.specialId === ''
-    }, 
+      console.log(
+        "1111111111111111111111",
+        this.specialId === this.popupAttr.deptId ||
+          this.specialId === this.popupAttr.deptPid ||
+          this.specialId === "YG1" ||
+          this.specialId === ""
+      );
+
+      return (
+        this.specialId === this.popupAttr.deptId ||
+        this.specialId === this.popupAttr.deptPid ||
+        this.specialId === "YG1" ||
+        this.specialId === ""
+      );
+    },
   },
   watch: {},
 });
@@ -187364,8 +187434,8 @@ var perceptionEventLayervue_type_style_index_0_scope_true_lang_css_ = __webpack_
 
 var perceptionEventLayer_component = Object(componentNormalizer["a" /* default */])(
   eventLayer_perceptionEventLayervue_type_script_lang_js_,
-  perceptionEventLayervue_type_template_id_6f22e751_render,
-  perceptionEventLayervue_type_template_id_6f22e751_staticRenderFns,
+  perceptionEventLayervue_type_template_id_8b626b3c_render,
+  perceptionEventLayervue_type_template_id_8b626b3c_staticRenderFns,
   false,
   null,
   null,
@@ -187516,7 +187586,7 @@ var cameraTreevue_type_template_id_74923d88_scoped_true_staticRenderFns = []
 		// this.$emit('select', CheckE.checkedKeys.filter(item => !!item));
     },
 	loadRoadList(node, resolve){
-		Object(api["e" /* getDimmdmroadriList */])({isAdminister: "1"}).then((res) =>{
+		Object(api["f" /* getDimmdmroadriList */])({isAdminister: "1"}).then((res) =>{
 			if(res !=null && res.data !=null){
 				res.data.forEach((item) => {
 					item.label = item.roadName;
@@ -187557,7 +187627,7 @@ var cameraTreevue_type_template_id_74923d88_scoped_true_staticRenderFns = []
         } else {
           params = { opmaCliqueId: '', opmaManagerCorpId: '' }
         }
-        Object(api["i" /* getFgsList */])(params).then((res) => {
+        Object(api["j" /* getFgsList */])(params).then((res) => {
           res.data.forEach((item) => {
             item.label = item.opmaManagerCorpName
             item.disabledTmp = false
@@ -187614,7 +187684,7 @@ var cameraTreevue_type_template_id_74923d88_scoped_true_staticRenderFns = []
           return resolve([])
         }
         this.isBranch = true
-        Object(api["j" /* getOpmasubsectionriList */])({ opmaManagerCorpId: node.data.opmaManagerCorpId }).then((res) => {
+        Object(api["k" /* getOpmasubsectionriList */])({ opmaManagerCorpId: node.data.opmaManagerCorpId }).then((res) => {
           if (res.data != null && res.data.length > 0) {
             const map = new Map()
             const datas = res.data.filter((key) => !map.has(key.roadName) && map.set(key.roadName, 1))
@@ -187637,7 +187707,7 @@ var cameraTreevue_type_template_id_74923d88_scoped_true_staticRenderFns = []
         return resolve([])
       }
       if (this.isBranch) {
-        Object(api["g" /* getEquipList */])({
+        Object(api["h" /* getEquipList */])({
           devCategory: this.equipType,
           opmaManagerCorpId: node.data.opmaManagerId,
           roadId: node.data.roadId,
@@ -187658,7 +187728,7 @@ var cameraTreevue_type_template_id_74923d88_scoped_true_staticRenderFns = []
         })
         this.isEnd = true
       } else {
-        Object(api["j" /* getOpmasubsectionriList */])({ opmaManagerId: node.data.opmaManagerId }).then((res) => {
+        Object(api["k" /* getOpmasubsectionriList */])({ opmaManagerId: node.data.opmaManagerId }).then((res) => {
           const map = new Map()
           const datas = res.data.filter((key) => !map.has(key.roadName) && map.set(key.roadName, 1))
           datas.forEach((item) => {
@@ -187678,7 +187748,7 @@ var cameraTreevue_type_template_id_74923d88_scoped_true_staticRenderFns = []
       if (this.typeNameLocal == 'danao') {
         return resolve([])
       }
-      Object(api["g" /* getEquipList */])({
+      Object(api["h" /* getEquipList */])({
         devCategory: this.equipType,
         opmaManagerId: node.data.opmaManagerId,
         roadId: node.data.roadId,
@@ -187709,7 +187779,7 @@ var cameraTreevue_type_template_id_74923d88_scoped_true_staticRenderFns = []
       }
     },
 	initRoadList() {
-		Object(api["e" /* getDimmdmroadriList */])({isAdminister: "1"}).then((res) =>{
+		Object(api["f" /* getDimmdmroadriList */])({isAdminister: "1"}).then((res) =>{
 			if(res !=null && res.data !=null){
 				res.data.forEach((item) => {
 					item.label = item.roadName;
@@ -188103,6 +188173,8 @@ var searchvue_type_template_id_276a7099_scoped_true_staticRenderFns = []
         "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAyVBMVEUARG4ARW8ARXAAR3EAR3IASHMASXQASnQAS3YATHgATXoATnkAT3kAVIAAVYEAVoIAWIQAWIUAWYUAXosAX4wAYI0AYY4AY5AAZJIAZ5QAbpwAcZ8AdaUAdqUAd6cAeqkAgrEAhLUAiLgAjb8Ak8UAlccAlsgAmMoAms0Am84AntAAo9YApNcApdgAptoAp9sAreEAsOQAs+gAs+kAtOgAtOkAteoAt+wAue8Au/AAv/YAwPYAwfcAwvkAw/oAxfsAxfwAyP////91s5qpAAAAAWJLR0RCENc99AAAALVJREFUOMvl0skSgjAQBNBGEHdBcd9xRcUtKG6o5P9/ypNFYopwtcq+5h0yMw2aEFBI81+g6TGrCSYiIPz22gAAnQEhD4YASsuHDKTHT0plYEepHAQiuC32UvAykdrKwBHAKAJ3AYQVKG4EMsWu//2H1eHz7uVtcpoZPgOu3BAde6pisG4woMfNmSUqgE2ZvWbBilKFBwBOLf7c8z5gEi0e5FzXIRdLVhijrrXOSkKj9B9qdULe+vxb2NAp6xsAAAAASUVORK5CYII=",
       weight_clear_D:
         'data:image/png;base64,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',
+      jiandanyuan_red: 'data:image/gif;base64,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',
+      jiandanyuan_blue: 'data:image/png;base64,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',
 		gradeChangePoint_img: "data:image/png;base64,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",
 		iconTest: [
 			//故障停车
@@ -188367,7 +188439,7 @@ var searchvue_type_template_id_276a7099_scoped_true_staticRenderFns = []
 		}else if(this.organizationType ==3){
 			params.opmaManagerId = this.organizationId;
 		} */
-		Object(api["l" /* getQuerybasicdata */])(params).then((res) => {
+		Object(api["m" /* getQuerybasicdata */])(params).then((res) => {
 			this.restaurants = res.data;
 		})
 	},
@@ -189130,7 +189202,7 @@ var roadCameraPresetLayervue_type_template_id_1d7afaa3_scoped_true_staticRenderF
 					userName: "userGisMap",
 					userDiffId: "1"
 				}
-				Object(api["o" /* getVideo */])(param)
+				Object(api["p" /* getVideo */])(param)
 					.then((res) => {
 						this.videoUrl = res.data.liveUrl
 						if (flv_default.a.isSupported()) {
@@ -189488,7 +189560,7 @@ var barrierCollisionWarningLayervue_type_template_id_262454b3_scoped_true_static
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -189839,7 +189911,7 @@ var bridgeHealthLayervue_type_template_id_d9da83b8_scoped_true_staticRenderFns =
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -190134,7 +190206,7 @@ var rsuLayervue_type_template_id_a3039a70_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -190429,7 +190501,7 @@ var awakenLayervue_type_template_id_47558512_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -190979,7 +191051,7 @@ var confluenceLayervue_type_template_id_70ab3549_scoped_true_staticRenderFns = [
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -191343,7 +191415,7 @@ var removeSnowLayervue_type_template_id_68d65c6e_scoped_true_staticRenderFns = [
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -191649,7 +191721,7 @@ var spikeLayervue_type_template_id_5719ddac_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -191944,7 +192016,7 @@ var distanceMarkerLayervue_type_template_id_0182b6e4_scoped_true_staticRenderFns
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -192239,7 +192311,7 @@ var sectionRadioLayervue_type_template_id_16077e28_scoped_true_staticRenderFns =
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -192534,7 +192606,7 @@ var beidouLayervue_type_template_id_0a262ba4_scoped_true_staticRenderFns = []
 			camId: this.camId,
 			timestamp: new Date().getTime()
 		}
-		Object(api["p" /* getVideoPic */])(paramPic)
+		Object(api["q" /* getVideoPic */])(paramPic)
 			.then((res) => {
 				this.loading = false;
 				if (res && res.size >500) {
@@ -194415,7 +194487,7 @@ var emergencyLayervue_type_template_id_77225db4_scoped_true_staticRenderFns = []
       let req = {
         manageUnit: this.popupAttr.manageUnit,
       };
-      Object(api["f" /* getEmergencyData */])(req).then((res) => {
+      Object(api["g" /* getEmergencyData */])(req).then((res) => {
         this.tableData = res.data;
       });
     },
@@ -194578,7 +194650,7 @@ var trafficSafetyLayervue_type_template_id_f55b98ec_scoped_true_staticRenderFns
         opmaManagerName: '',
         roadId: this.popupAttr.road_id
       }
-      Object(api["r" /* gettrafficSafetyData */])(data).then(res => {
+      Object(api["s" /* gettrafficSafetyData */])(data).then(res => {
         this.equipMeaage = res.data[0]
       })
     },
@@ -194911,7 +194983,7 @@ var congestionSectionvue_type_template_id_4f7f5f2a_scoped_true_staticRenderFns =
 		this.nearbyCameraList2 = []
 		this.showText = false
 		this.showText2 = false
-      api["t" /* nearbyCamera */](params, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType).then(res => {
+      api["u" /* nearbyCamera */](params, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType).then(res => {
         if (res !=null && res.code == 0) {
           // 上行
           this.nearbyCameraList = res.data.UP
@@ -194962,7 +195034,7 @@ var congestionSectionvue_type_template_id_4f7f5f2a_scoped_true_staticRenderFns =
 		this.nearbyVMSList2 = []
 		this.showText = false
 		this.showText2 = false
-      api["u" /* nearbyVMS */](params, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType).then(res => {
+      api["v" /* nearbyVMS */](params, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType).then(res => {
         if (res !=null && res.code == 0) {
           // 上行
           this.nearbyVMSList = res.data.UP
@@ -195002,7 +195074,7 @@ var congestionSectionvue_type_template_id_4f7f5f2a_scoped_true_staticRenderFns =
       if (!camId) return
       this.videoInfo = {}
       this.videoInfo2 = {}
-      api["v" /* openCam */](camId, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType, this.$GlobalConfig.netWorkType).then(res => {
+      api["w" /* openCam */](camId, this.$GlobalConfig.trafficMonitorUrl, this.$GlobalConfig.trafficMonitorType, this.$GlobalConfig.netWorkType).then(res => {
         if (res !=null && res.data.recCode == '0') {
           name == 'playerUp' ? (this.videoInfo = res.data || {}) : (this.videoInfo2 = res.data || {})
 			if (name == 'playerUp') {
@@ -196787,22 +196859,24 @@ class echartsLayer_EchartsglLayer {
       getPatrolAccidentLayerInterval: null,
       series: null,
       colorMap: [
-        '#FF4040',
-        '#FF8C00',
-        '#FFD700',
-        '#00ff33',
-        '#0033ff',
-        '#00ffff',
-        '#BF3EFF',
-        '#33FF9D',
-        '#DAA520',
-        '#E3E3E3'
+        "#FF4040",
+        "#FF8C00",
+        "#FFD700",
+        "#00ff33",
+        "#0033ff",
+        "#00ffff",
+        "#BF3EFF",
+        "#33FF9D",
+        "#DAA520",
+        "#E3E3E3",
       ],
       pieChartLayer: null,
       scatterChartLayer: null,
       chartElements: [],
       myChart: null,
-      scatterContainer: null
+      scatterContainer: null,
+      yzDistance: 1,
+      pointGraphicArrCC: null
     };
   },
   methods: {
@@ -197425,7 +197499,38 @@ class echartsLayer_EchartsglLayer {
     },
     // 气象数据图层 -- 不需要区分状态
     initMeteorologicaldataLayer() {
-      Object(esri_loader["loadModules"])(["esri/layers/FeatureLayer"]).then(([FeatureLayer]) => {
+      let that = this;
+      Object(esri_loader["loadModules"])([
+        "esri/layers/FeatureLayer",
+        "esri/renderers/support/jsonUtils",
+      ]).then(([FeatureLayer, rendererJsonUtils]) => {
+        var Symbol1 = {
+          type: "esriPMS",
+          url: this.jiandanyuan_blue,
+          width: 20 * this.styleZoom + "px",
+          height: 20 * this.styleZoom + "px",
+        };
+        var Symbol2 = {
+          type: "esriPMS",
+          url: this.jiandanyuan_red,
+          width: 30 * this.styleZoom + "px",
+          height: 30 * this.styleZoom + "px",
+        };
+        var renderJson = {
+          type: "uniqueValue",
+          field1: "panduan",
+          uniqueValueInfos: [
+            {
+              value: "1",
+              symbol: Symbol1,
+            },
+            {
+              value: "2",
+              symbol: Symbol2,
+            },
+          ],
+        };
+        var renderer = rendererJsonUtils.fromJSON(renderJson);
         this.meteorologicaldataLayer = new FeatureLayer({
           id: "meteorologicaldataLayer",
           outFields: ["*"],
@@ -197473,6 +197578,11 @@ class echartsLayer_EchartsglLayer {
               alias: "opma_man_2",
               type: "string",
             },
+            {
+              name: "panduan",
+              alias: "panduan",
+              type: "string",
+            },
             {
               name: "managerCorpId",
               alias: "managerCorpId",
@@ -197589,50 +197699,127 @@ class echartsLayer_EchartsglLayer {
               type: "double",
             },
           ],
-          featureReduction: this.clusterConfigNoFields,
           definitionExpression: this.makeRoadSql("meteorologicaldataLayer"),
-          renderer: {
-            type: "class-breaks",
-            field: "cluster_count",
-            defaultLabel: "1",
-            defaultSymbol: {
-              type: "picture-marker",
-              url: this.meteorologicalLayer_img,
-              width: 35 * this.styleZoom + "px",
-              height: 35 * this.styleZoom + "px",
-              // yoffset: "25px"
-            },
-            classBreakInfos: [
-              {
-                minValue: 2,
-                maxValue: 1000000,
-                symbol: {
-                  type: "picture-marker",
-                  url: this.meteorologicalLayer_img,
-                  width: 35 * this.styleZoom + "px",
-                  height: 35 * this.styleZoom + "px",
-                  // yoffset: "20px"
-                },
-              },
-            ],
-          },
+          renderer: renderer,
+          // featureReduction: this.clusterConfigNoFields,
         });
         if (this.$GlobalConfig.meteorologicaldataLayer === true) {
           this.map.add(this.meteorologicaldataLayer);
         }
         this.meteorologicaldataLayer.visible = false;
-        this.getMeteorologicalLayer();
+        this.getMeteorologicalLayer(false, this.yzDistance);
         setInterval(() => {
-          this.getMeteorologicalLayer(true);
-        }, 60 * 60 * 1000); //60*60*1000
+          this.getMeteorologicalLayer(true, this.yzDistance);
+        }, 60 * 60 * 1000);
+        this.view.watch("zoom", function () {
+          if (that.view.zoom <= 12) {
+            if (that.yzDistance == 0||that.yzDistance == 1) {
+              
+              that.yzDistance = 2
+              that.getMeteorologicalLayer(true,that.yzDistance);
+            }
+          }else if(that.view.zoom > 12 && that.view.zoom <= 14){
+            if (that.yzDistance == 0||that.yzDistance == 2) {
+              
+              that.yzDistance = 1
+              that.getMeteorologicalLayer(true,that.yzDistance);
+            }
+          }else if(that.view.zoom > 14){
+            if (that.yzDistance == 1||that.yzDistance == 2) {
+              
+              that.yzDistance = 0
+              that.getMeteorologicalLayer(true,that.yzDistance);
+            }
+          }
+        });
       });
     },
-    getMeteorologicalLayer(update) {
+    getMeteorologicalLayer(update, yzDistance) {
       Object(esri_loader["loadModules"])(["esri/Graphic"]).then(([Graphic]) => {
+        let createPointGraphic = function (
+          item,
+          index,
+          point,
+          symbol,
+          panduanValue
+        ) {
+          return new Graphic({
+            attributes: {
+              objId: index + 1,
+              X: item.lon,
+              Y: item.lat,
+              opma_cliqu: "YG1",
+              opma_manag: item.managerCorpId,
+              opma_man_2: item.managerId,
+              panduan: panduanValue,
+              ...item,
+            },
+            geometry: point,
+            symbol: symbol,
+          });
+        };
+        let thinOutPoints = function(points, roadIds, skipNDeleteM) {
+          const [n, m] = skipNDeleteM; // 解构赋值获取n和m
+  
+          // 根据roadId对点位进行分组
+          const groupedByRoad = roadIds.reduce((acc, roadId) => {
+            acc[roadId] = points.filter(point => point.roadId === roadId);
+            return acc;
+          }, {});
+        
+          // 对每个道路进行抽稀操作
+          Object.keys(groupedByRoad).forEach(roadId => {
+            let roadPoints = groupedByRoad[roadId];
+            
+            if (roadPoints.length > n + m) { // 如果有足够的点应用指定的抽稀策略
+              const thinnedPoints = [];
+              
+              for(let i = 0; i < roadPoints.length; i += n + m) {
+                thinnedPoints.push(roadPoints[i]); // 保留第i个点
+                
+                // 自动跳过接下来的n个点并删除m个点
+              }
+              
+              groupedByRoad[roadId] = thinnedPoints;
+            } else if (roadPoints.length > 1) { // 如果点数不足但大于1，则使用默认策略（隔一个删两个）
+              const thinnedPoints = [];
+              
+              for(let i = 0; i < roadPoints.length; i += 3) { // 隔一个删两个
+                thinnedPoints.push(roadPoints[i]);
+              }
+              
+              groupedByRoad[roadId] = thinnedPoints;
+            }
+            // 如果只有一点或没有点，则无需进行任何处理
+          });
+        
+          // 将抽稀后的点重新组合成一个数组
+          const thinnedPointsArray = Object.values(groupedByRoad).flat();
+        
+          return thinnedPointsArray;
+        }
+        let filterAndMergePoints = function(thinnedArray, originalArray) {
+          // 定义判断是否满足条件的函数
+          const isSpecialPoint = (item) =>
+            item.vis <= 500 ||
+            item.pph === 3 ||
+            ((item.pph === 1 || item.pph === 4) &&
+              (item.preLevel === 5 || item.preLevel === 6 || item.preLevel === 7));
+        
+          // 从抽稀后的数组中过滤掉满足条件的点
+          const filteredThinnedArray = thinnedArray.filter(point => !isSpecialPoint(point));
+        
+          // 从原数组中筛选出所有满足条件的点
+          const specialPointsFromOriginal = originalArray.filter(isSpecialPoint);
+        
+          // 将满足条件的点添加回抽稀后的数组
+          const mergedArray = [...filteredThinnedArray, ...specialPointsFromOriginal];
+        
+          return mergedArray;
+        }
         axios_default()({
           method: "post",
           url: this.$GlobalConfig.localServerUrl + "get_weather_info",
-          // url: '/meteApi/api/weather_service/get_weather_info',
           data: {
             orgCode: "",
             managerId: "",
@@ -197643,8 +197830,22 @@ class echartsLayer_EchartsglLayer {
             forecastHour: "",
           },
         }).then((res) => {
+          let originalArr = res.data.data
           let pointGraphicArr = [];
-          res.data.data.forEach((item, index) => {
+          let uniqueRoadIds = [...new Set(originalArr.map(item => item.roadId))];
+          let endArr = null
+          
+          if (yzDistance == 0) {
+            endArr = originalArr;
+          }else if (yzDistance == 1) {
+            let thinnedArr = thinOutPoints(originalArr, uniqueRoadIds,[1,1]);
+            endArr = filterAndMergePoints(thinnedArr, originalArr)
+          }
+          else if (yzDistance == 2) {
+            let thinnedArr = thinOutPoints(originalArr, uniqueRoadIds,[1,8]);
+            endArr = filterAndMergePoints(thinnedArr, originalArr)
+          }
+          endArr.forEach((item, index) => {
             let point = {
               //点设置
               type: "point", //类型：点、线、面
@@ -197655,33 +197856,47 @@ class echartsLayer_EchartsglLayer {
               //点符号设置
               type: "simple-marker",
               color: [226, 119, 35], //符号颜色
-              size: 8,
+              size: 30,
               outline: {
                 //轮廓设置
                 color: [0, 0, 0], //轮廓颜色
-                width: 1, //轮廓宽度
+                width: 5, //轮廓宽度
               },
               // yoffset: (item.iconHeight || arr.height) / 2 + "px",
             };
-            let pointGraphic = new Graphic({
-              attributes: {
-                objId: index + 1,
-                X: item.lon,
-                Y: item.lat,
-                opma_cliqu: "YG1",
-                opma_manag: item.managerCorpId,
-                opma_man_2: item.managerId,
-                ...item,
-                // orgName:update&&(''+item.lng+item.lat) == "120.089870636.03720572"?item.orgName+'123':item.orgName,
-              },
-              geometry: point,
-              symbol: simpleMarkerSymbol,
-            });
+            let pointGraphic = null;
+            if (
+              item.vis <= 500 ||
+              item.pph === 3 ||
+              ((item.pph === 1 || item.pph === 4) &&
+                (item.preLevel === 5 ||
+                  item.preLevel === 6 ||
+                  item.preLevel === 7))
+            ) {
+              pointGraphic = createPointGraphic(
+                item,
+                index,
+                point,
+                simpleMarkerSymbol,
+                "2"
+              );
+            } else {
+              pointGraphic = createPointGraphic(
+                item,
+                index,
+                point,
+                simpleMarkerSymbol,
+                "1"
+              );
+            }
             pointGraphicArr.push(pointGraphic);
           });
           if (update) {
             this.meteorologicaldataLayer.applyEdits({
-              updateFeatures: pointGraphicArr,
+              deleteFeatures: this.pointGraphicArrCC,
+            });
+            this.meteorologicaldataLayer.applyEdits({
+              addFeatures: pointGraphicArr,
             });
             if (
               this.$refs.infoWindowRef &&
@@ -197694,12 +197909,9 @@ class echartsLayer_EchartsglLayer {
               addFeatures: pointGraphicArr,
             });
           }
-          setTimeout(() => {
-            this.meteorologicaldataLayer.queryFeatureCount().then((res) => {
-              // console.log(res)
-              this.$set(this.tabListNumber, "meteorologicaldataLayer", res);
-            });
-          }, 3000);
+          // this.meteorologicaldataLayer.refresh()
+          this.pointGraphicArrCC = pointGraphicArr;
+          this.$set(this.tabListNumber, "meteorologicaldataLayer", endArr.length);
         });
       });
     },
@@ -199538,7 +199750,7 @@ class echartsLayer_EchartsglLayer {
             {
               value: "2",
               symbol: Symbol2,
-            }
+            },
           ],
         };
         var renderer = rendererJsonUtils.fromJSON(renderJson);
@@ -201271,7 +201483,7 @@ class echartsLayer_EchartsglLayer {
         }
         this.congestionLineLayer = new GraphicsLayer({
           id: "congestionLineLayer",
-          zIndex: 20
+          zIndex: 20,
         });
         this.congestionLineLayer.visible = false;
         this.map.add(this.congestionLineLayer);
@@ -201283,7 +201495,7 @@ class echartsLayer_EchartsglLayer {
         }
         this.congestionPointLayer = new GraphicsLayer({
           id: "congestionPointLayer",
-          zIndex: 30
+          zIndex: 30,
         });
         this.congestionPointLayer.visible = false;
         this.map.add(this.congestionPointLayer);
@@ -201294,18 +201506,21 @@ class echartsLayer_EchartsglLayer {
       this.congestionPointLayer.visible = false;
     },
     toCongestionPointLayer(data) {
-      Object(esri_loader["loadModules"])(["esri/Graphic","esri/geometry/Polyline","esri/symbols/SimpleLineSymbol","esri/Color"]).then(([Graphic, Polyline, SimpleLineSymbol, Color]) => {
+      Object(esri_loader["loadModules"])([
+        "esri/Graphic",
+        "esri/geometry/Polyline",
+        "esri/symbols/SimpleLineSymbol",
+        "esri/Color",
+      ]).then(([Graphic, Polyline, SimpleLineSymbol, Color]) => {
         let res = data;
-        let status = 0
+        let status = 0;
         if (res) {
           if (this.congestionPointLayer) {
             this.congestionPointLayer.removeAll();
-          }
-          else if(this.congestionLineLayer){
+          } else if (this.congestionLineLayer) {
             this.congestionLineLayer.removeAll();
-          }
-          else{
-            this.initCongestionPointLayer()
+          } else {
+            this.initCongestionPointLayer();
           }
           res.forEach((item, index) => {
             let imgUrl1 = this.dudian_sfz_img;
@@ -201315,10 +201530,10 @@ class echartsLayer_EchartsglLayer {
               type: "point",
               longitude: item.lng,
               latitude: item.lat,
-            }
+            };
             let lineSymbol = new SimpleLineSymbol({
               color: new Color([255, 0, 0]),
-              width: 5
+              width: 5,
             });
             let simpleMarkerSymbol1 = {
               type: "picture-marker",
@@ -201345,7 +201560,7 @@ class echartsLayer_EchartsglLayer {
                 Y: Number(item.lat),
                 ...item,
               },
-              geometry: point
+              geometry: point,
             });
             if (item.holidays[0].positionType == "point") {
               pointGraphic.symbol = simpleMarkerSymbol3;
@@ -201353,18 +201568,18 @@ class echartsLayer_EchartsglLayer {
               status = 1;
 
               this.congestionLineLayer.visible = true;
-              let paths = item.polyLine.map(point => {
+              let paths = item.polyLine.map((point) => {
                 const [longitude, latitude] = point.split(",").map(Number);
                 return [longitude, latitude];
               });
               let polyline = new Polyline({
-                paths: [paths]
-              })
+                paths: [paths],
+              });
               let polylineGraphic = new Graphic({
                 geometry: polyline,
-                symbol: lineSymbol
+                symbol: lineSymbol,
               });
-              this.congestionLineLayer.add(polylineGraphic)
+              this.congestionLineLayer.add(polylineGraphic);
             }
             if (item.holidays[0].positionType == "station") {
               pointGraphic.symbol = simpleMarkerSymbol1;
@@ -201822,35 +202037,35 @@ class echartsLayer_EchartsglLayer {
       });
     },
     creatPieH() {
-      let dataArr = []
+      let dataArr = [];
       for (var i = 0; i < 4; i++) {
-          if (i % 2 === 0) {
-              dataArr.push({
-                  name: (i + 1).toString(),
-                  value: 20,
-                  itemStyle: {
-                      normal: {
-                          color: '#34B1FB',
-                          borderWidth: 0,
-                          borderColor: 'rgba(0,0,0,0)'
-                      }
-                  }
-              })
-          } else {
-              dataArr.push({
-                  name: (i + 1).toString(),
-                  value: 20,
-                  itemStyle: {
-                      normal: {
-                          color: 'rgba(0,0,0,0)',
-                          borderWidth: 0,
-                          borderColor: 'rgba(0,0,0,0)'
-                      }
-                  }
-              })
-          }
+        if (i % 2 === 0) {
+          dataArr.push({
+            name: (i + 1).toString(),
+            value: 20,
+            itemStyle: {
+              normal: {
+                color: "#34B1FB",
+                borderWidth: 0,
+                borderColor: "rgba(0,0,0,0)",
+              },
+            },
+          });
+        } else {
+          dataArr.push({
+            name: (i + 1).toString(),
+            value: 20,
+            itemStyle: {
+              normal: {
+                color: "rgba(0,0,0,0)",
+                borderWidth: 0,
+                borderColor: "rgba(0,0,0,0)",
+              },
+            },
+          });
+        }
       }
-      return dataArr
+      return dataArr;
     },
     createEffectScatter(divId, newEnergy, size, cityName) {
       const chartDom = document.getElementById(divId);
@@ -201862,52 +202077,59 @@ class echartsLayer_EchartsglLayer {
           top: "center",
           textStyle: {
             fontSize: 14,
-            color: '#FFF'
-          }
+            color: "#FFF",
+          },
         },
         tooltip: {
-          trigger: 'item',
-          backgroundColor: 'rgba(0,0,0,0)', // 设置为透明
+          trigger: "item",
+          backgroundColor: "rgba(0,0,0,0)", // 设置为透明
           borderWidth: 0,
           textStyle: {
-            color: '#FFF'
-          },
-          position: 'top',
-          extraCssText: 'color:#FFF,border-radius:0;height:0.3rem;width: 0.75rem;background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIYAAAA/CAYAAAAlvLAsAAAAAXNSR0IArs4c6QAABJBJREFUeF7tnTGIXFUUhv9zzp0ZsoHAKqiJEKIiaxQbUcFida3SGEQIaW0CaiEIgpVFrAQLEUQUCxErUdANCLERs2DsLLSIa1IIFhGxEFncdWffvUfvezPLTrK6B3aa2XN2eNw37/33zvv//+PN22roxGvfPMu3Hv8Q8RcJjBLQ9T9XqIJBzfDV4UcvXYhkIoH06DP38CNn5gOMYGEigQAjgNg1gQAjwAgwggF7AnHHsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflSjkBxvjH8kgIxAAJg5jQve9GZgJG4/j4+P328Yk5dQ2M5jNIun3muk+uwt7LbCkKFIVub2j3oQrNCq1jq+mO37Qpuvnb2tH8XdZs57brolv/hs+szbQ/lrfXRR/I86q8dBVvaNGX9/RH9EOTcfryA/TLntoDJPAJxqjApVV9XlXfBpB275S+bAhnL99Haweoc5OVDozzyrj+nZw4tiYbh2+RrcGG5DQnZX0oh9JAimxJn3tSOEmPkxRqJJF040BEwFKIhROLEIsOeky5JGEwESftJ2YlqS8WCDF1GyCcpH5hCREEPWnH9hxxuy+pfg7adVFfYJOx/xMRoaQ+3v/qbvrtyWt6Kjf6CQFHJuYQvXvbAl78lCgvXmnOEcmd+/5gAIR6xy9ZFRkF7ZgzshZkEDdFS0HhRqk7Vs+XOtaNkEvu3vN4v85NaOoa9VhukDMh83gk5GbYnduqx/9G3gSyEPL6GrIcQe5tofkdqF8u3XaW8giM84yjTwl+XZPbx2D8NSeHe0NpdoChA+GUcyqUOjAGI0DSgIVyktRnUZZccpI+MSeSgp5wCwQJaRaWNAlGyxIJVQC0iCSuDHSAVFgqOBWMipRCwFMAA+UYQKeY6emvF+j7x3/UBwH9goDjIMpQvLJykt587Fs91J/HBwq9C6CL0wGjaFbOqiWjGYGhXektEHW/5KIkzU1gVChquQV5KzeZRnBoSg0NUUoFpLkBkJ1gbHZQ8BgMIKcGTQJy7w+U6/NoJsGYhuMZW2NpVc8o8A4Rnru0QMtLP+sd2MTHKHjr0v20vHhFjzJjGcDVOcG5i/fS5oxZ3Nflun7GWLymD3GDzwG8t3KSXh8n+V/H95X0jE12DUbtqr0zkF4A0U/1zrCRcXrnnWTG+pza5boHoyY5fpb49znjYQC98bPH1FKewYUCjB2lPbGqL6Q+Pqv/rcxgl1O95H8A5zh1gRl+DV0AAAAASUVORK5CYII=) no-repeat;background-size: 100% 100%;',
-          formatter: '{b}: 100%'
-        },
-        series: [{
-          name: '车辆类型',
-          type: 'pie',
-          itemStyle: {
-            borderRadius: 3,
-            borderColor: '#fff',
-            borderWidth: 0,
-            color: this.colorMap[cityName],
-            opacity: 0.8
-          },
-          label: {
-            show: false,
             color: "#FFF",
-            fontSize: 11,
-            position: 'center',//'inside',
-            formatter: '{a}' // 自定义标签格式
           },
-          labelLine: {
-            show: false
+          position: "top",
+          extraCssText:
+            "color:#FFF,border-radius:0;height:0.3rem;width: 0.75rem;background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIYAAAA/CAYAAAAlvLAsAAAAAXNSR0IArs4c6QAABJBJREFUeF7tnTGIXFUUhv9zzp0ZsoHAKqiJEKIiaxQbUcFida3SGEQIaW0CaiEIgpVFrAQLEUQUCxErUdANCLERs2DsLLSIa1IIFhGxEFncdWffvUfvezPLTrK6B3aa2XN2eNw37/33zvv//+PN22roxGvfPMu3Hv8Q8RcJjBLQ9T9XqIJBzfDV4UcvXYhkIoH06DP38CNn5gOMYGEigQAjgNg1gQAjwAgwggF7AnHHsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflSjkBxvjH8kgIxAAJg5jQve9GZgJG4/j4+P328Yk5dQ2M5jNIun3muk+uwt7LbCkKFIVub2j3oQrNCq1jq+mO37Qpuvnb2tH8XdZs57brolv/hs+szbQ/lrfXRR/I86q8dBVvaNGX9/RH9EOTcfryA/TLntoDJPAJxqjApVV9XlXfBpB275S+bAhnL99Haweoc5OVDozzyrj+nZw4tiYbh2+RrcGG5DQnZX0oh9JAimxJn3tSOEmPkxRqJJF040BEwFKIhROLEIsOeky5JGEwESftJ2YlqS8WCDF1GyCcpH5hCREEPWnH9hxxuy+pfg7adVFfYJOx/xMRoaQ+3v/qbvrtyWt6Kjf6CQFHJuYQvXvbAl78lCgvXmnOEcmd+/5gAIR6xy9ZFRkF7ZgzshZkEDdFS0HhRqk7Vs+XOtaNkEvu3vN4v85NaOoa9VhukDMh83gk5GbYnduqx/9G3gSyEPL6GrIcQe5tofkdqF8u3XaW8giM84yjTwl+XZPbx2D8NSeHe0NpdoChA+GUcyqUOjAGI0DSgIVyktRnUZZccpI+MSeSgp5wCwQJaRaWNAlGyxIJVQC0iCSuDHSAVFgqOBWMipRCwFMAA+UYQKeY6emvF+j7x3/UBwH9goDjIMpQvLJykt587Fs91J/HBwq9C6CL0wGjaFbOqiWjGYGhXektEHW/5KIkzU1gVChquQV5KzeZRnBoSg0NUUoFpLkBkJ1gbHZQ8BgMIKcGTQJy7w+U6/NoJsGYhuMZW2NpVc8o8A4Rnru0QMtLP+sd2MTHKHjr0v20vHhFjzJjGcDVOcG5i/fS5oxZ3Nflun7GWLymD3GDzwG8t3KSXh8n+V/H95X0jE12DUbtqr0zkF4A0U/1zrCRcXrnnWTG+pza5boHoyY5fpb49znjYQC98bPH1FKewYUCjB2lPbGqL6Q+Pqv/rcxgl1O95H8A5zh1gRl+DV0AAAAASUVORK5CYII=) no-repeat;background-size: 100% 100%;",
+          formatter: "{b}: 100%",
+        },
+        series: [
+          {
+            name: "车辆类型",
+            type: "pie",
+            itemStyle: {
+              borderRadius: 3,
+              borderColor: "#fff",
+              borderWidth: 0,
+              color: this.colorMap[cityName],
+              opacity: 0.8,
+            },
+            label: {
+              show: false,
+              color: "#FFF",
+              fontSize: 11,
+              position: "center", //'inside',
+              formatter: "{a}", // 自定义标签格式
+            },
+            labelLine: {
+              show: false,
+            },
+            data: [
+              { value: newEnergy, name: "新能源车辆" }, // 只显示新能源车辆
+            ],
           },
-          data: [
-            { value: newEnergy, name: '新能源车辆' } // 只显示新能源车辆
-          ]
-        }]
+        ],
       };
       myChart.setOption(option);
     },
-    initScatterChartLayer(){
-      Object(esri_loader["loadModules"])(["esri/geometry/Point", "esri/Graphic", "esri/layers/GraphicsLayer"]).then(([Point,Graphic,GraphicsLayer]) => {
+    initScatterChartLayer() {
+      Object(esri_loader["loadModules"])([
+        "esri/geometry/Point",
+        "esri/Graphic",
+        "esri/layers/GraphicsLayer",
+      ]).then(([Point, Graphic, GraphicsLayer]) => {
         this.scatterChartLayer = new GraphicsLayer();
         this.map.add(this.scatterChartLayer);
-        this.cities.forEach(city => {
+        this.cities.forEach((city) => {
           const point = new Point({ latitude: city.lat, longitude: city.lng });
           const graphic = new Graphic({
             geometry: point,
@@ -201917,16 +202139,16 @@ class echartsLayer_EchartsglLayer {
               size: 0,
               outline: {
                 color: [255, 255, 255],
-                width: 1
-              }
-            }
+                width: 1,
+              },
+            },
           });
           // 创建ECharts容器
           const divId = `chart-${city.name}`;
-          const chartDiv = document.createElement('div');
+          const chartDiv = document.createElement("div");
           chartDiv.id = divId;
-          chartDiv.className = 'echarts-container';
-          document.getElementById('map').appendChild(chartDiv);
+          chartDiv.className = "echarts-container";
+          document.getElementById("map").appendChild(chartDiv);
           // 计算图表大小
           // 计算新能源车流量的最小值和最大值
           // const newEnergyValues = this.cities.map(item => item.newEnergy);
@@ -201935,7 +202157,13 @@ class echartsLayer_EchartsglLayer {
           // 计算图表大小
           const minSize = 80;
           const maxSize = 130;
-          const newSize = minSize + (maxSize - minSize) * ((city.newEnergy - Math.min(...this.cities.map(d => d.newEnergy))) / (Math.max(...this.cities.map(d => d.newEnergy)) - Math.min(...this.cities.map(d => d.newEnergy))));
+          const newSize =
+            minSize +
+            (maxSize - minSize) *
+              ((city.newEnergy -
+                Math.min(...this.cities.map((d) => d.newEnergy))) /
+                (Math.max(...this.cities.map((d) => d.newEnergy)) -
+                  Math.min(...this.cities.map((d) => d.newEnergy))));
           chartDiv.style.width = `${newSize}px`;
           chartDiv.style.height = `${newSize}px`;
           // 初始化ECharts图表
@@ -201982,103 +202210,113 @@ class echartsLayer_EchartsglLayer {
           this.scatterChartLayer.add(graphic);
           this.chartElements.push(chartDiv);
         });
-        
-      })
+      });
     },
 
     //所有气象设备分类图层
-    initAllWeatherLayer(){
+    initAllWeatherLayer() {
       let data = {
         status: "1",
-        devicetype: ""
-      }
-      Object(esri_loader["loadModules"])(["esri/layers/GraphicsLayer",'esri/Graphic']).then(([GraphicsLayer,Graphic]) => {
-        this.allWeatherLayer = new GraphicsLayer({
-          id: 'allWeatherLayer',
-        });
-        this.allWeatherLayer.visible = false
-        this.map.add(this.allWeatherLayer)
-        const updateLayerData = () => {
-          this.allWeatherLayer.removeAll()
-          Object(apiNow["a" /* getAllWeatherList */])(data).then((res) => {
-            const getURLByValue = (devicetype, status) => {
-              let img_Url;
-              if (devicetype == '010') { //气象监测器
-                if(status == "1"){
-                  img_Url = this.dev_meteorology_online
-                }else if(status == "2"){
-                  img_Url = this.dev_meteorology_offline
-                }else{
-                  img_Url = this.dev_meteorology_error
-                }
-              } else if (devicetype == '013') { //道路结冰监测装置
-                if(status == "1"){
-                  img_Url = this.dev_icingDetection_online
-                }else if(status == "2"){
-                  img_Url = this.dev_icingDetection_offline
-                }else{
-                  img_Url = this.dev_icingDetection_error
-                }
-              } else if (devicetype == '020') { //CO/VI检测器
-                if(status == "1"){
-                  img_Url = this.dev_coDetection_online
-                }else if(status == "2"){
-                  img_Url = this.dev_coDetection_offline
-                }else{
-                  img_Url = this.dev_coDetection_error
-                }
-              } else if (devicetype == '023') { //能见度检测器
-                if(status == "1"){
-                  img_Url = this.dev_visibility_online
-                }else if(status == "2"){
-                  img_Url = this.dev_visibility_offline
-                }else{
-                  img_Url = this.dev_visibility_error
-                }
-              } else if (devicetype == '030') { //风速风向监测仪
-                if(status == "1"){
-                  img_Url = this.dev_windDdirection_online
-                }else if(status == "2"){
-                  img_Url = this.dev_windDdirection_offline
-                }else{
-                  img_Url = this.dev_windDdirection_error
+        devicetype: "",
+      };
+      Object(esri_loader["loadModules"])(["esri/layers/GraphicsLayer", "esri/Graphic"]).then(
+        ([GraphicsLayer, Graphic]) => {
+          this.allWeatherLayer = new GraphicsLayer({
+            id: "allWeatherLayer",
+          });
+          this.allWeatherLayer.visible = false;
+          this.map.add(this.allWeatherLayer);
+          const updateLayerData = () => {
+            this.allWeatherLayer.removeAll();
+            Object(apiNow["a" /* getAllWeatherList */])(data).then((res) => {
+              const getURLByValue = (devicetype, status) => {
+                let img_Url;
+                if (devicetype == "010") {
+                  //气象监测器
+                  if (status == "1") {
+                    img_Url = this.dev_meteorology_online;
+                  } else if (status == "2") {
+                    img_Url = this.dev_meteorology_offline;
+                  } else {
+                    img_Url = this.dev_meteorology_error;
+                  }
+                } else if (devicetype == "013") {
+                  //道路结冰监测装置
+                  if (status == "1") {
+                    img_Url = this.dev_icingDetection_online;
+                  } else if (status == "2") {
+                    img_Url = this.dev_icingDetection_offline;
+                  } else {
+                    img_Url = this.dev_icingDetection_error;
+                  }
+                } else if (devicetype == "020") {
+                  //CO/VI检测器
+                  if (status == "1") {
+                    img_Url = this.dev_coDetection_online;
+                  } else if (status == "2") {
+                    img_Url = this.dev_coDetection_offline;
+                  } else {
+                    img_Url = this.dev_coDetection_error;
+                  }
+                } else if (devicetype == "023") {
+                  //能见度检测器
+                  if (status == "1") {
+                    img_Url = this.dev_visibility_online;
+                  } else if (status == "2") {
+                    img_Url = this.dev_visibility_offline;
+                  } else {
+                    img_Url = this.dev_visibility_error;
+                  }
+                } else if (devicetype == "030") {
+                  //风速风向监测仪
+                  if (status == "1") {
+                    img_Url = this.dev_windDdirection_online;
+                  } else if (status == "2") {
+                    img_Url = this.dev_windDdirection_offline;
+                  } else {
+                    img_Url = this.dev_windDdirection_error;
+                  }
                 }
+                return img_Url;
+              };
+              if (res.data) {
+                res.data.forEach((item, index) => {
+                  const img_Url = getURLByValue(item.deviceType, item.status);
+                  let point = {
+                    type: "point",
+                    longitude: Number(item.lng),
+                    latitude: Number(item.lat),
+                  };
+                  let simpleMarkerSymbol = {
+                    type: "picture-marker",
+                    url: img_Url,
+                    width: 35 * this.styleZoom + "px",
+                    height: 35 * this.styleZoom + "px",
+                  };
+                  let pointGraphic = new Graphic({
+                    attributes: {
+                      objId: index + 1,
+                      X: Number(item.lng),
+                      Y: Number(item.lat),
+                      ...item,
+                    },
+                    geometry: point,
+                    symbol: simpleMarkerSymbol,
+                  });
+                  this.allWeatherLayer.add(pointGraphic);
+                });
+                this.$set(
+                  this.tabListNumber,
+                  "allWeatherLayer",
+                  res.data.length
+                );
               }
-              return img_Url
-            }
-            if(res.data){
-              res.data.forEach((item, index) => {
-                const img_Url = getURLByValue(item.deviceType, item.status)
-                let point = {
-                  type: 'point',
-                  longitude: Number(item.lng),
-                  latitude: Number(item.lat),
-                }
-                let simpleMarkerSymbol = {
-                  type: "picture-marker",
-                  url: img_Url,
-                  width: 35 * this.styleZoom + "px",
-                  height: 35 * this.styleZoom + "px",
-                };
-                let pointGraphic = new Graphic({
-                  attributes: {
-                    objId: index + 1,
-                    X: Number(item.lng),
-                    Y: Number(item.lat),
-                    ...item,
-                  },
-                  geometry: point,
-                  symbol: simpleMarkerSymbol
-                })
-                this.allWeatherLayer.add(pointGraphic)
-              })
-              this.$set(this.tabListNumber, "allWeatherLayer", res.data.length);
-            }
-          })
+            });
+          };
+          updateLayerData();
+          setInterval(updateLayerData, 20 * 60 * 1000);
         }
-        updateLayerData();
-        setInterval(updateLayerData, 20 * 60 * 1000);
-      })
+      );
     },
 
     // 外部图表联动饼图图层
@@ -202088,119 +202326,124 @@ class echartsLayer_EchartsglLayer {
       const option = {
         title: {
           text: CityName,
-          bottom: 'bottom',
+          bottom: "bottom",
           textStyle: {
             fontSize: 13,
             color: "rgba(255, 255, 255, 1)",
-            fontFamily: "serif"
+            fontFamily: "serif",
           },
-          left: 'center'
+          left: "center",
         },
         tooltip: {
-          trigger: 'item',
-          backgroundColor: 'rgba(0,0,0,0)',
+          trigger: "item",
+          backgroundColor: "rgba(0,0,0,0)",
           borderWidth: 0,
           textStyle: {
-            color: '#FFF'
+            color: "#FFF",
           },
-          position: 'top',
-          extraCssText: 'color:#FFF;padding: 0.05rem 0.05rem 0.08rem 0.05rem;border-radius:0;background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIYAAAA/CAYAAAAlvLAsAAAAAXNSR0IArs4c6QAABJBJREFUeF7tnTGIXFUUhv9zzp0ZsoHAKqiJEKIiaxQbUcFida3SGEQIaW0CaiEIgpVFrAQLEUQUCxErUdANCLERs2DsLLSIa1IIFhGxEFncdWffvUfvezPLTrK6B3aa2XN2eNw37/33zvv//+PN22roxGvfPMu3Hv8Q8RcJjBLQ9T9XqIJBzfDV4UcvXYhkIoH06DP38CNn5gOMYGEigQAjgNg1gQAjwAgwggF7AnHHsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflSjkBxvjH8kgIxAAJg5jQve9GZgJG4/j4+P328Yk5dQ2M5jNIun3muk+uwt7LbCkKFIVub2j3oQrNCq1jq+mO37Qpuvnb2tH8XdZs57brolv/hs+szbQ/lrfXRR/I86q8dBVvaNGX9/RH9EOTcfryA/TLntoDJPAJxqjApVV9XlXfBpB275S+bAhnL99Haweoc5OVDozzyrj+nZw4tiYbh2+RrcGG5DQnZX0oh9JAimxJn3tSOEmPkxRqJJF040BEwFKIhROLEIsOeky5JGEwESftJ2YlqS8WCDF1GyCcpH5hCREEPWnH9hxxuy+pfg7adVFfYJOx/xMRoaQ+3v/qbvrtyWt6Kjf6CQFHJuYQvXvbAl78lCgvXmnOEcmd+/5gAIR6xy9ZFRkF7ZgzshZkEDdFS0HhRqk7Vs+XOtaNkEvu3vN4v85NaOoa9VhukDMh83gk5GbYnduqx/9G3gSyEPL6GrIcQe5tofkdqF8u3XaW8giM84yjTwl+XZPbx2D8NSeHe0NpdoChA+GUcyqUOjAGI0DSgIVyktRnUZZccpI+MSeSgp5wCwQJaRaWNAlGyxIJVQC0iCSuDHSAVFgqOBWMipRCwFMAA+UYQKeY6emvF+j7x3/UBwH9goDjIMpQvLJykt587Fs91J/HBwq9C6CL0wGjaFbOqiWjGYGhXektEHW/5KIkzU1gVChquQV5KzeZRnBoSg0NUUoFpLkBkJ1gbHZQ8BgMIKcGTQJy7w+U6/NoJsGYhuMZW2NpVc8o8A4Rnru0QMtLP+sd2MTHKHjr0v20vHhFjzJjGcDVOcG5i/fS5oxZ3Nflun7GWLymD3GDzwG8t3KSXh8n+V/H95X0jE12DUbtqr0zkF4A0U/1zrCRcXrnnWTG+pza5boHoyY5fpb49znjYQC98bPH1FKewYUCjB2lPbGqL6Q+Pqv/rcxgl1O95H8A5zh1gRl+DV0AAAAASUVORK5CYII=) no-repeat;background-size: 100% 100%;',
+          position: "top",
+          extraCssText:
+            "color:#FFF;padding: 0.05rem 0.05rem 0.08rem 0.05rem;border-radius:0;background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIYAAAA/CAYAAAAlvLAsAAAAAXNSR0IArs4c6QAABJBJREFUeF7tnTGIXFUUhv9zzp0ZsoHAKqiJEKIiaxQbUcFida3SGEQIaW0CaiEIgpVFrAQLEUQUCxErUdANCLERs2DsLLSIa1IIFhGxEFncdWffvUfvezPLTrK6B3aa2XN2eNw37/33zvv//+PN22roxGvfPMu3Hv8Q8RcJjBLQ9T9XqIJBzfDV4UcvXYhkIoH06DP38CNn5gOMYGEigQAjgNg1gQAjwAgwggF7AnHHsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflShlguKrbbjbAsGflSjkBxvjH8kgIxAAJg5jQve9GZgJG4/j4+P328Yk5dQ2M5jNIun3muk+uwt7LbCkKFIVub2j3oQrNCq1jq+mO37Qpuvnb2tH8XdZs57brolv/hs+szbQ/lrfXRR/I86q8dBVvaNGX9/RH9EOTcfryA/TLntoDJPAJxqjApVV9XlXfBpB275S+bAhnL99Haweoc5OVDozzyrj+nZw4tiYbh2+RrcGG5DQnZX0oh9JAimxJn3tSOEmPkxRqJJF040BEwFKIhROLEIsOeky5JGEwESftJ2YlqS8WCDF1GyCcpH5hCREEPWnH9hxxuy+pfg7adVFfYJOx/xMRoaQ+3v/qbvrtyWt6Kjf6CQFHJuYQvXvbAl78lCgvXmnOEcmd+/5gAIR6xy9ZFRkF7ZgzshZkEDdFS0HhRqk7Vs+XOtaNkEvu3vN4v85NaOoa9VhukDMh83gk5GbYnduqx/9G3gSyEPL6GrIcQe5tofkdqF8u3XaW8giM84yjTwl+XZPbx2D8NSeHe0NpdoChA+GUcyqUOjAGI0DSgIVyktRnUZZccpI+MSeSgp5wCwQJaRaWNAlGyxIJVQC0iCSuDHSAVFgqOBWMipRCwFMAA+UYQKeY6emvF+j7x3/UBwH9goDjIMpQvLJykt587Fs91J/HBwq9C6CL0wGjaFbOqiWjGYGhXektEHW/5KIkzU1gVChquQV5KzeZRnBoSg0NUUoFpLkBkJ1gbHZQ8BgMIKcGTQJy7w+U6/NoJsGYhuMZW2NpVc8o8A4Rnru0QMtLP+sd2MTHKHjr0v20vHhFjzJjGcDVOcG5i/fS5oxZ3Nflun7GWLymD3GDzwG8t3KSXh8n+V/H95X0jE12DUbtqr0zkF4A0U/1zrCRcXrnnWTG+pza5boHoyY5fpb49znjYQC98bPH1FKewYUCjB2lPbGqL6Q+Pqv/rcxgl1O95H8A5zh1gRl+DV0AAAAASUVORK5CYII=) no-repeat;background-size: 100% 100%;",
           formatter: function (params) {
             const color = params.color;
-            const percent = (params.value / total * 100).toFixed(2);
+            const percent = ((params.value / total) * 100).toFixed(2);
             return `<div style="font-size:13px;display: flex; align-items: center;justify-content: center;margin-top: -0.01rem;">
                       <span style="display: inline-block;width: 0.05rem; height: 0.05rem; background-color: ${color};border-radius:1rem"></span>
                       <span style="margin-left: 5px;">${params.name} :&nbsp</span><span style="font-weight: bold;color: ${color}"> ${percent}%</span>
                     </div>`;
-          }
+          },
         },
         series: [
           {
-            name: '车辆类型',
-            type: 'pie',
-            radius: '65%',
+            name: "车辆类型",
+            type: "pie",
+            radius: "65%",
             itemStyle: {
-              borderColor: 'RGBA(14, 54, 99, .8)',
-              borderWidth: 2
+              borderColor: "RGBA(14, 54, 99, .8)",
+              borderWidth: 2,
             },
             label: {
               show: false,
               color: "#FFF",
               fontSize: 11,
-              position: 'inside',//'inside',
-              formatter: '{b}\n{d}%'
+              position: "inside", //'inside',
+              formatter: "{b}\n{d}%",
             },
             labelLine: {
-              show: false
+              show: false,
             },
-            data:  [
-              { 
-                value: total - newEnergy, 
-                name: '其它车辆', 
-                label: { 
-                  show: false
+            data: [
+              {
+                value: total - newEnergy,
+                name: "其它车辆",
+                label: {
+                  show: false,
+                },
+                itemStyle: {
+                  color: "#0179FF",
                 },
-                itemStyle:{
-                  color: '#0179FF'
-                }
               },
-              { 
-                value: newEnergy, 
-                name: '新能源车辆', 
-                label: { 
-                  show: false // 新能源车辆不显示标签
+              {
+                value: newEnergy,
+                name: "新能源车辆",
+                label: {
+                  show: false, // 新能源车辆不显示标签
                 },
-                itemStyle:{
-                  color: '#10D490'
-                }
-              }
-            ]
+                itemStyle: {
+                  color: "#10D490",
+                },
+              },
+            ],
           },
           {
-            type: 'pie',
+            type: "pie",
             zlevel: 2,
             silent: true,
-            center: ['50%', '50%'],
-            radius: ['83%', '88%'],
+            center: ["50%", "50%"],
+            radius: ["83%", "88%"],
             startAngle: 45,
             label: {
-                normal: {
-                    show: false
-                }
+              normal: {
+                show: false,
+              },
             },
             labelLine: {
-                normal: {
-                    show: false
-                }
+              normal: {
+                show: false,
+              },
             },
-            data: this.creatPieH()
+            data: this.creatPieH(),
           },
           {
-            type: 'pie',
-            radius: '83%',
-            center: ['50%', '50%'],
+            type: "pie",
+            radius: "83%",
+            center: ["50%", "50%"],
             z: 0,
             silent: true,
             itemStyle: {
-                normal: {
-                    color: 'RGBA(14, 44, 81, 0.6)'
-                }
+              normal: {
+                color: "RGBA(14, 44, 81, 0.6)",
+              },
             },
             hoverAnimation: false,
-            data: [100]
-          }
-        ]
+            data: [100],
+          },
+        ],
       };
       myChart.setOption(option);
     },
-    initPieChartLayer(chartData, ispPercent){
-      Object(esri_loader["loadModules"])(["esri/geometry/Point", "esri/Graphic", "esri/layers/GraphicsLayer"]).then(([Point,Graphic,GraphicsLayer]) => {
-        this.pieChartLayer = new GraphicsLayer({id:'pieChartLayer'});
+    initPieChartLayer(chartData, ispPercent) {
+      Object(esri_loader["loadModules"])([
+        "esri/geometry/Point",
+        "esri/Graphic",
+        "esri/layers/GraphicsLayer",
+      ]).then(([Point, Graphic, GraphicsLayer]) => {
+        this.pieChartLayer = new GraphicsLayer({ id: "pieChartLayer" });
         this.map.add(this.pieChartLayer);
-        const newEnergyValues = chartData.map(item => item.newEnergy);
+        const newEnergyValues = chartData.map((item) => item.newEnergy);
         const minNewEnergy = Math.min(...newEnergyValues);
         const maxNewEnergy = Math.max(...newEnergyValues);
-        chartData.forEach(city => {
+        chartData.forEach((city) => {
           const point = new Point({ latitude: city.lat, longitude: city.lng });
           const graphic = new Graphic({
             geometry: point,
@@ -202210,25 +202453,31 @@ class echartsLayer_EchartsglLayer {
               size: 0,
               outline: {
                 color: [255, 255, 255],
-                width: 1
-              }
-            }
+                width: 1,
+              },
+            },
           });
           const divId = `chart-${city.name}`;
-          const chartDiv = document.createElement('div');
+          const chartDiv = document.createElement("div");
           chartDiv.id = divId;
-          chartDiv.className = 'echarts-container';
-          document.getElementById('map').appendChild(chartDiv);
+          chartDiv.className = "echarts-container";
+          document.getElementById("map").appendChild(chartDiv);
           const minSize = 60;
           const maxSize = 110;
           const baseSize = 80;
           let newSize = 80;
-          if(ispPercent === 0){
-            newSize = minSize + (maxSize - minSize) * (city.newEnergy - minNewEnergy) / (maxNewEnergy - minNewEnergy);
-          }else if(ispPercent === 1){
-            newSize = baseSize
-          }else{
-            newSize = minSize + (maxSize - minSize) * (city.newEnergy - minNewEnergy) / (maxNewEnergy - minNewEnergy);
+          if (ispPercent === 0) {
+            newSize =
+              minSize +
+              ((maxSize - minSize) * (city.newEnergy - minNewEnergy)) /
+                (maxNewEnergy - minNewEnergy);
+          } else if (ispPercent === 1) {
+            newSize = baseSize;
+          } else {
+            newSize =
+              minSize +
+              ((maxSize - minSize) * (city.newEnergy - minNewEnergy)) /
+                (maxNewEnergy - minNewEnergy);
           }
           chartDiv.style.width = `${newSize}px`;
           chartDiv.style.height = `${newSize}px`;
@@ -202267,20 +202516,20 @@ class echartsLayer_EchartsglLayer {
           this.pieChartLayer.add(graphic);
           this.chartElements.push(chartDiv);
         });
-      })
+      });
     },
     removePieChartLayer() {
-      this.chartElements.forEach(chartDiv => {
-        document.getElementById('map').removeChild(chartDiv);
-      })
-      this.chartElements = []
-      if(this.pieChartLayer) {
-        this.pieChartLayer.removeAll()
-        this.map.remove(this.pieChartLayer)
+      this.chartElements.forEach((chartDiv) => {
+        document.getElementById("map").removeChild(chartDiv);
+      });
+      this.chartElements = [];
+      if (this.pieChartLayer) {
+        this.pieChartLayer.removeAll();
+        this.map.remove(this.pieChartLayer);
       }
     },
     //新能源车辆图层
-    initNevsstationflowsumLayer(){
+    initNevsstationflowsumLayer() {
       Object(esri_loader["loadModules"])(["esri/layers/GraphicsLayer"]).then(([GraphicsLayer]) => {
         if (this.nevsstationflowLayer) {
           this.nevsstationflowLayer.removeAll();
@@ -202288,62 +202537,66 @@ class echartsLayer_EchartsglLayer {
           this.nevsstationflowLayer = null;
         }
         this.nevsstationflowLayer = new GraphicsLayer({
-          id: "nevsstationflowLayer"
+          id: "nevsstationflowLayer",
         });
         this.nevsstationflowLayer.visible = false;
         this.map.add(this.nevsstationflowLayer);
-        this.toNevsstationflowsumLayer()
-      })
+        this.toNevsstationflowsumLayer();
+      });
     },
-    toNevsstationflowsumLayer(){
+    toNevsstationflowsumLayer() {
       Object(esri_loader["loadModules"])(["esri/Graphic"]).then(([Graphic]) => {
         let data = {
-          sysid: 'sdgs_it_brain',
-          service_code: 'ts_a_d_nevsstationflowsum'
-        }
+          sysid: "sdgs_it_brain",
+          service_code: "ts_a_d_nevsstationflowsum",
+        };
         Object(apiNow["j" /* getNevsstationflowsum */])(data).then((res) => {
           const colorMap = [
-            '#f01329', '#f08513', '#f0da13', '#1317f0', '#13e5f0','#3FD7FE'
+            "#f01329",
+            "#f08513",
+            "#f0da13",
+            "#1317f0",
+            "#13e5f0",
+            "#3FD7FE",
           ];
           const getColorByValue = (value) => {
             let color;
             let size;
             if (value > 5000) {
-                color = colorMap[0];
-                size = 22;
+              color = colorMap[0];
+              size = 22;
             } else if (value >= 4000) {
-                color = colorMap[1];
-                size = 19;
+              color = colorMap[1];
+              size = 19;
             } else if (value >= 3000) {
-                color = colorMap[2];
-                size = 16;
+              color = colorMap[2];
+              size = 16;
             } else if (value >= 2000) {
-                color = colorMap[3];
-                size = 13;
+              color = colorMap[3];
+              size = 13;
             } else {
-                color = colorMap[4];
-                size = 10;
+              color = colorMap[4];
+              size = 10;
             }
-        
             return { color, size };
-          }
+          };
           res.sort((a, b) => a.total_flow_nevs - b.total_flow_nevs);
           res.forEach((item, index) => {
-            const { color, size } = getColorByValue(item.total_flow_nevs)
+            const { color, size } = getColorByValue(item.total_flow_nevs);
             let point = {
-              type: 'point',
-              longitude: item.lng, 
+              type: "point",
+              longitude: item.lng,
               latitude: item.lat,
-            }
+            };
             let simpleMarkerSymbol = {
               type: "simple-marker",
               style: "circle",
-              color: this.hexToRgba(color,0.8),
-              size: size, 
+              color: this.hexToRgba(color, 0.8),
+              size: size,
               outline: {
-                width: 0
-              }
-            }
+                width: 0,
+              },
+            };
             let pointGraphic = new Graphic({
               attributes: {
                 objId: index + 1,
@@ -202352,26 +202605,26 @@ class echartsLayer_EchartsglLayer {
                 ...item,
               },
               geometry: point,
-              symbol: simpleMarkerSymbol
-            })
-            this.nevsstationflowLayer.add(pointGraphic)
-          })
-        })
-      })
+              symbol: simpleMarkerSymbol,
+            });
+            this.nevsstationflowLayer.add(pointGraphic);
+          });
+        });
+      });
     },
-    removeNevsstationflowLayer(){
-      if(this.nevsstationflowLayer){
-        this.nevsstationflowLayer.removeAll()
+    removeNevsstationflowLayer() {
+      if (this.nevsstationflowLayer) {
+        this.nevsstationflowLayer.removeAll();
       }
     },
     hexToRgba(hex, alpha = 1) {
-      hex = hex.replace(/^#/, '');
+      hex = hex.replace(/^#/, "");
       let bigint = parseInt(hex, 16);
       let r = (bigint >> 16) & 255;
       let g = (bigint >> 8) & 255;
       let b = bigint & 255;
       return [r, g, b, alpha]; // 返回带有alpha通道的RGBA格式颜色数组
-  }
+    },
   },
 });
 
@@ -202387,15 +202640,15 @@ class echartsLayer_EchartsglLayer {
       isCarPause: false,
       carSpeed: 1,
       layerListSql: {}, //图层Sql字典 用来判断重置的时候值重置右侧树或者获取自己添加的sql
-      organizationSql: ['opma_cliqu', 'opma_manag', 'opma_man_2'],
-    }
+      organizationSql: ["opma_cliqu", "opma_manag", "opma_man_2"],
+    };
   },
   methods: {
     // 车辆轨迹回放
     carPlayback(list) {
-      this.carPause()
-      this.closePopup()
-      this.delLayerArr(['carPlayback'], true)
+      this.carPause();
+      this.closePopup();
+      this.delLayerArr(["carPlayback"], true);
       this.carSpeed = 1;
       this.isCarPlay = false;
       this.isCarPause = false;
@@ -202411,71 +202664,87 @@ class echartsLayer_EchartsglLayer {
         },
         opts
       );
-      if (Reflect.has(list[0], 'iscloudH')) {
-        this.addTrackPlayback({
-          longitude: list[0].gaoDeLng, //初始车辆位置 经度
-          latitude: list[0].gaoDeLat, //初始车辆位置 纬度
-          icon: this.cloudHelmet_img,
-          width: '35',
-          height: '35'
-        }, {
-          width: 2,
-          color: [255, 255, 255],
-          xyArr: [list.map(item => [item.gaoDeLng, item.gaoDeLat])]
-        }, 'carPlayback', 50)
-      }else{
-        this.addTrackPlayback({
-          longitude: list[0].gaoDeLng, //初始车辆位置 经度
-          latitude: list[0].gaoDeLat, //初始车辆位置 纬度
-          icon: this.patrolAccident_img,
-          width: '35',
-          height: '35'
-        }, {
-          width: 2,
-          color: [255, 255, 255],
-          xyArr: [list.map(item => [item.gaoDeLng, item.gaoDeLat])]
-        }, 'carPlayback', 50)
+      if (Reflect.has(list[0], "iscloudH")) {
+        this.addTrackPlayback(
+          {
+            longitude: list[0].gaoDeLng, //初始车辆位置 经度
+            latitude: list[0].gaoDeLat, //初始车辆位置 纬度
+            icon: this.cloudHelmet_img,
+            width: "35",
+            height: "35",
+          },
+          {
+            width: 2,
+            color: [255, 255, 255],
+            xyArr: [list.map((item) => [item.gaoDeLng, item.gaoDeLat])],
+          },
+          "carPlayback",
+          50
+        );
+      } else {
+        this.addTrackPlayback(
+          {
+            longitude: list[0].gaoDeLng, //初始车辆位置 经度
+            latitude: list[0].gaoDeLat, //初始车辆位置 纬度
+            icon: this.patrolAccident_img,
+            width: "35",
+            height: "35",
+          },
+          {
+            width: 2,
+            color: [255, 255, 255],
+            xyArr: [list.map((item) => [item.gaoDeLng, item.gaoDeLat])],
+          },
+          "carPlayback",
+          50
+        );
       }
-      
     },
     playbackCarBtn(name) {
-      if (name == '播放') {
+      if (name == "播放") {
         this.isCarPlay = true;
-        this.carStart()
-      } else if (name == '暂停') {
+        this.carStart();
+      } else if (name == "暂停") {
         this.isCarPause = true;
-        this.carPause()
-      } else if (name == '继续') {
+        this.carPause();
+      } else if (name == "继续") {
         this.isCarPause = false;
-        this.carContinue()
+        this.carContinue();
       }
     },
-    playbackCarStart() { //车辆轨迹回放开始
+    playbackCarStart() {
+      //车辆轨迹回放开始
       this.isCarPlay = true;
       this.isCarPause = false;
-      this.sliderindex = 0
-      this.carStart()
+      this.sliderindex = 0;
+      this.carStart();
     },
-    playbackSetCarSpeed(num) { //车辆轨迹回放设置速度
-      this.setCarSpeed(num * 50)
+    playbackSetCarSpeed(num) {
+      //车辆轨迹回放设置速度
+      this.setCarSpeed(num * 50);
     },
-    carDel() { //清除车辆
-      this.carPause()
-      this.delLayerArr(['carPlayback'], true)
+    carDel() {
+      //清除车辆
+      this.carPause();
+      this.delLayerArr(["carPlayback"], true);
     },
     carBack() {
       this.patrolAccidentLayer_btn_show = false;
-      this.sliderindex = 0
-      this.carPause()
-      this.delLayerArr(['carPlayback'], true)
+      this.sliderindex = 0;
+      this.carPause();
+      this.delLayerArr(["carPlayback"], true);
     },
     /*自定义打点提示框相关*/
     showPointPopup(event) {
-      let that = this
-      let { latitude, longitude, attributes } = event
-      that.$emit('PTCoordinates', { latitude, longitude })
-      that.closeTooltip()
-      that.openPopupByattr('pointLayer', { X: longitude, Y: latitude, ...attributes })
+      let that = this;
+      let { latitude, longitude, attributes } = event;
+      that.$emit("PTCoordinates", { latitude, longitude });
+      that.closeTooltip();
+      that.openPopupByattr("pointLayer", {
+        X: longitude,
+        Y: latitude,
+        ...attributes,
+      });
     },
     /*
      * 地图工具类
@@ -202484,37 +202753,40 @@ class echartsLayer_EchartsglLayer {
       var mercator = {
         x: 0,
         y: 0,
-      }
-      var x = (lonlat.x * 20037508.34) / 180
-      var y = Math.log(Math.tan(((90 + lonlat.y) * Math.PI) / 360)) / (Math.PI / 180)
-      y = (y * 20037508.34) / 180
-      mercator.x = x
-      mercator.y = y
-      return mercator
+      };
+      var x = (lonlat.x * 20037508.34) / 180;
+      var y =
+        Math.log(Math.tan(((90 + lonlat.y) * Math.PI) / 360)) / (Math.PI / 180);
+      y = (y * 20037508.34) / 180;
+      mercator.x = x;
+      mercator.y = y;
+      return mercator;
     },
     mercator2lonlat(mercator) {
       var lonlat = {
         x: 0,
         y: 0,
-      }
-      var x = (mercator.x / 20037508.34) * 180
-      var y = (mercator.y / 20037508.34) * 180
-      y = (180 / Math.PI) * (2 * Math.atan(Math.exp((y * Math.PI) / 180)) - Math.PI / 2)
-      lonlat.x = x
-      lonlat.y = y
-      return lonlat
+      };
+      var x = (mercator.x / 20037508.34) * 180;
+      var y = (mercator.y / 20037508.34) * 180;
+      y =
+        (180 / Math.PI) *
+        (2 * Math.atan(Math.exp((y * Math.PI) / 180)) - Math.PI / 2);
+      lonlat.x = x;
+      lonlat.y = y;
+      return lonlat;
     },
     // 关闭弹窗
     closePopup() {
       // let test = document.getElementById('popupBox')
       // test.style.display = 'none'
-      this.popupBoxShow = false
-      this.$emit('closePopupBack')
+      this.popupBoxShow = false;
+      this.$emit("closePopupBack");
       // 关闭高亮线
       if (this.map) {
-        let layer = this.map.findLayerById('roadLine-HighLight')
+        let layer = this.map.findLayerById("roadLine-HighLight");
         if (layer) {
-          this.map.remove(layer)
+          this.map.remove(layer);
         }
       }
       if (this.$refs.infoWindowRef) {
@@ -202525,24 +202797,25 @@ class echartsLayer_EchartsglLayer {
           this.$refs.infoWindowRef.clearTime()
         } */
         if (this.$refs.infoWindowRef.destroyFlv) {
-          this.$refs.infoWindowRef.destroyFlv()
+          this.$refs.infoWindowRef.destroyFlv();
         }
         if (this.$refs.infoWindowRef.showImg) {
-          this.$refs.infoWindowRef.showImg()
+          this.$refs.infoWindowRef.showImg();
         }
-        this.$refs.infoWindowRef.isPTZCheck = false
+        this.$refs.infoWindowRef.isPTZCheck = false;
       }
-      if (this.popupName === 'latlonAndpile' || this.popupName === 'latlonAndpile_danao') {
+      if (
+        this.popupName === "latlonAndpile" ||
+        this.popupName === "latlonAndpile_danao"
+      ) {
         if (this.graphicsLayer_lat) {
           this.graphicsLayer_lat.removeAll();
-          let toolbar = this.toolbar.find(
-            (item) => item.id == "weight_latlon"
-          );
+          let toolbar = this.toolbar.find((item) => item.id == "weight_latlon");
           this.weight_topile_D = toolbar.imgUrl;
           this.latlon_btn_checked = !this.latlon_btn_checked;
         }
       }
-      if (this.popupName === 'roadCameraPreset') {
+      if (this.popupName === "roadCameraPreset") {
         if (this.graphicsLayer_video) {
           this.graphicsLayer_video.removeAll();
           /* let toolbar = this.toolbar.find(
@@ -202556,96 +202829,113 @@ class echartsLayer_EchartsglLayer {
     //关闭提示框
     closeTooltip() {
       if (!this.gisTooltipMouseover) {
-        let test = document.getElementById('gisTooltipBox')
-        test.style.display = 'none'
+        let test = document.getElementById("gisTooltipBox");
+        test.style.display = "none";
       }
     },
     //实时--- 高德路况用
     getLongTime() {
-      let nowDate = new Date()
-      let year = nowDate.getFullYear()
-      let month = nowDate.getMonth() + 1
-      let today = nowDate.getDate()
-      let hours = nowDate.getHours()
-      let minutes = nowDate.getMinutes()
-      let seconds = nowDate.getSeconds()
+      let nowDate = new Date();
+      let year = nowDate.getFullYear();
+      let month = nowDate.getMonth() + 1;
+      let today = nowDate.getDate();
+      let hours = nowDate.getHours();
+      let minutes = nowDate.getMinutes();
+      let seconds = nowDate.getSeconds();
       if (month >= 1 && month <= 9) {
-        month = '0' + month
+        month = "0" + month;
       }
       if (today >= 1 && today <= 9) {
-        today = '0' + today
+        today = "0" + today;
       }
-      let currentdate = year + '-' + month + '-' + today + ' ' + hours + ':' + minutes + ':' + seconds
-      let longTime = new Date(currentdate.replace(new RegExp('-', 'gm'), '/')).getTime()
-      return longTime
+      let currentdate =
+        year +
+        "-" +
+        month +
+        "-" +
+        today +
+        " " +
+        hours +
+        ":" +
+        minutes +
+        ":" +
+        seconds;
+      let longTime = new Date(
+        currentdate.replace(new RegExp("-", "gm"), "/")
+      ).getTime();
+      return longTime;
     },
     /*
      * 获取url请求前缀
      */
     getRequestPrefix() {
       // 获取网络协议
-      var protocol = window.location.protocol
+      var protocol = window.location.protocol;
       // 获取主机名+端口号
-      var domainPort = window.location.host
+      var domainPort = window.location.host;
       // 获取发布项目的名称
       // 获取路径
-      var url = window.location.pathname
-      var webApp = url.split('/')[1]
-      var urlPrefix = protocol + '//' + domainPort + '/' + webApp
-      return urlPrefix
+      var url = window.location.pathname;
+      var webApp = url.split("/")[1];
+      var urlPrefix = protocol + "//" + domainPort + "/" + webApp;
+      return urlPrefix;
     },
     /* 2X */
     // 视频2X
     videoDoubleClick(videoUrl) {
-      this.videodoubleXclick = true
-      this.imgdoubleXclick = false
+      this.videodoubleXclick = true;
+      this.imgdoubleXclick = false;
       if (flv_default.a.isSupported()) {
         if (this.doubleflvPlayer === null) {
-          const doublevideoElement = document.getElementById('doublevideoElement')
-          this.doubleflvPlayer = flv_default.a.createPlayer({
-            type: 'flv',
-            url: videoUrl,
-          }, {
-            enableWorker: false,//不启用分离线程
-            autoCleanupSourceBuffer: true, //对SourceBuffer进行自动清理缓存
-            //autoCleanupMaxBackwardDuration: 10, //当向后缓冲区持续时间超过此值（以秒为单位）时，请对SourceBuffer进行自动清理
-            //autoCleanupMinBackwardDuration: 30, //指示进行自动清除时为反向缓冲区保留的持续时间（以秒为单位）。
-            enableStashBuffer: false, //关闭IO隐藏缓冲区
-            stashInitialSize: 128, //减少首帧显示等待时长
-          })
-          this.doubleflvPlayer.attachMediaElement(doublevideoElement)
-          this.doubleflvPlayer.load()
-          this.doubleflvPlayer.play()
-          console.log('2X流已开启***')
+          const doublevideoElement =
+            document.getElementById("doublevideoElement");
+          this.doubleflvPlayer = flv_default.a.createPlayer(
+            {
+              type: "flv",
+              url: videoUrl,
+            },
+            {
+              enableWorker: false, //不启用分离线程
+              autoCleanupSourceBuffer: true, //对SourceBuffer进行自动清理缓存
+              //autoCleanupMaxBackwardDuration: 10, //当向后缓冲区持续时间超过此值（以秒为单位）时，请对SourceBuffer进行自动清理
+              //autoCleanupMinBackwardDuration: 30, //指示进行自动清除时为反向缓冲区保留的持续时间（以秒为单位）。
+              enableStashBuffer: false, //关闭IO隐藏缓冲区
+              stashInitialSize: 128, //减少首帧显示等待时长
+            }
+          );
+          this.doubleflvPlayer.attachMediaElement(doublevideoElement);
+          this.doubleflvPlayer.load();
+          this.doubleflvPlayer.play();
+          console.log("2X流已开启***");
         }
       }
     },
     //图像2X
     imgDoubleClick(imgUrl) {
-      this.imgdoubleXclick = true
-      this.closeVideodouble()
-      this.doubleImgUrl = imgUrl
+      this.imgdoubleXclick = true;
+      this.closeVideodouble();
+      this.doubleImgUrl = imgUrl;
     },
     // 关闭视频2X
     closeVideodouble() {
-      this.videodoubleXclick = false
+      this.videodoubleXclick = false;
       if (this.doubleflvPlayer) {
-        this.doubleflvPlayer.pause()
-        this.doubleflvPlayer.unload()
-		try{
-			this.doubleflvPlayer.detachMediaElement()
-		}catch(e){
-			//TODO handle the exception
-		}
-        this.doubleflvPlayer.destroy()
-        this.doubleflvPlayer = null
-        console.log('2X流已关闭***')
+        this.doubleflvPlayer.pause();
+        this.doubleflvPlayer.unload();
+        try {
+          this.doubleflvPlayer.detachMediaElement();
+        } catch (e) {
+          //TODO handle the exception
+        }
+        this.doubleflvPlayer.destroy();
+        this.doubleflvPlayer = null;
+        console.log("2X流已关闭***");
       }
     },
     // 关闭图像2x
     closeImgdouble() {
-      this.imgdoubleXclick = false
-      this.doubleImgUrl = ''
+      this.imgdoubleXclick = false;
+      this.doubleImgUrl = "";
     },
     closeAllLayer() {
       this.$GlobalConfig.jiqing.eventTopics.forEach((item) => {
@@ -202690,16 +202980,20 @@ class echartsLayer_EchartsglLayer {
         }
       });
 
-      this.$GlobalConfig.jiqing.roadTestPerceptionPublishEquipment.forEach((item) => {
-        if (this[item.layerName]) {
-          this[item.layerName].visible = false;
+      this.$GlobalConfig.jiqing.roadTestPerceptionPublishEquipment.forEach(
+        (item) => {
+          if (this[item.layerName]) {
+            this[item.layerName].visible = false;
+          }
         }
-      });
-      this.$GlobalConfig.danao.roadTestPerceptionPublishEquipment.forEach((item) => {
-        if (this[item.layerName]) {
-          this[item.layerName].visible = false;
+      );
+      this.$GlobalConfig.danao.roadTestPerceptionPublishEquipment.forEach(
+        (item) => {
+          if (this[item.layerName]) {
+            this[item.layerName].visible = false;
+          }
         }
-      });
+      );
 
       this.$GlobalConfig.jiqing.roadTestOthersEquipment.forEach((item) => {
         if (this[item.layerName]) {
@@ -202732,39 +203026,82 @@ class echartsLayer_EchartsglLayer {
     // 图层选择Tab页点击切换时返回实时高度
     handleClickTab() {
       setTimeout(() => {
-        let tabHeight = document.getElementsByClassName('checkBox')[0].clientHeight + 'px'
+        let tabHeight =
+          document.getElementsByClassName("checkBox")[0].clientHeight + "px";
         //this.tabHeight = `calc(5% + ${tabHeight} - 24px)`;
         this.tabHeight = `calc(2% + ${tabHeight})`;
-        this.$emit('fromGisCheckBox', tabHeight)
-      }, 0)
+        this.$emit("fromGisCheckBox", tabHeight);
+      }, 0);
     },
     // 图层SQL过滤组装方法
     makeRoadSql(name) {
       // if(name == 'roadlineLayer_'){
       //   name = 'roadlineLayer'
       // }
-      let layerObj = this.$GlobalConfig[this.typeNameLocal].roadTestEquipment.find((item) => item.layerName == name) ||
-        this.$GlobalConfig[this.typeNameLocal].roadTestPublishEquipment.find((item) => item.layerName == name) ||
-        this.$GlobalConfig[this.typeNameLocal].roadTestPerceptionPublishEquipment.find((item) => item.layerName == name) ||
-        this.$GlobalConfig[this.typeNameLocal].roadTestOthersEquipment.find((item) => item.layerName == name) ||
-        this.$GlobalConfig[this.typeNameLocal].roadNetworkFacilities.find((item) => item.layerName == name) ||
-        this.$GlobalConfig[this.typeNameLocal].maintenance.find((item) => item.layerName == name)||
-		this.$GlobalConfig[this.typeNameLocal].roadAndBridgeTunnel.find((item) => item.layerName == name) ||
-		this.$GlobalConfig[this.typeNameLocal].equipmentFacilities.find((item) => item.layerName == name) ||
-		this.$GlobalConfig[this.typeNameLocal].otherClass.find((item) => item.layerName == name) ;
-      let sqlText = ''
+      let layerObj =
+        this.$GlobalConfig[this.typeNameLocal].roadTestEquipment.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].roadTestPublishEquipment.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[
+          this.typeNameLocal
+        ].roadTestPerceptionPublishEquipment.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].roadTestOthersEquipment.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].roadNetworkFacilities.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].maintenance.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].roadAndBridgeTunnel.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].equipmentFacilities.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].otherClass.find(
+          (item) => item.layerName == name
+        );
+      let sqlText = "";
       if (layerObj && (layerObj.roadIdKey || layerObj.is_test)) {
-        if (layerObj.roadIdKey && this.$GlobalConfig[this.typeNameLocal].roadIDs.length) {
-          sqlText = `${layerObj.roadIdKey} in (${this.$GlobalConfig[this.typeNameLocal].roadIDs.map((item) => `'${item}'`).join(',')})`
+        if (
+          layerObj.roadIdKey &&
+          this.$GlobalConfig[this.typeNameLocal].roadIDs.length
+        ) {
+          sqlText = `${layerObj.roadIdKey} in (${this.$GlobalConfig[
+            this.typeNameLocal
+          ].roadIDs
+            .map((item) => `'${item}'`)
+            .join(",")})`;
         }
         if (layerObj.is_test || layerObj.is_test === 0) {
-          sqlText = sqlText ? `${sqlText} and is_test = ${layerObj.is_test}` : `is_test = ${layerObj.is_test}`
+          sqlText = sqlText
+            ? `${sqlText} and is_test = ${layerObj.is_test}`
+            : `is_test = ${layerObj.is_test}`;
+        }
+        if (
+          this.typeNameLocal == "danao" &&
+          [
+            "bridgeLayer",
+            "tunnelLayer",
+            "serviceLayer",
+            "stationLayer",
+            "pivotLayer",
+            "interchangeLayer",
+          ].indexOf(name) > -1
+        ) {
+          sqlText = sqlText
+            ? `${sqlText} and use_status in ('1')`
+            : `use_status in ('1')`;
         }
-		if (this.typeNameLocal == 'danao' && ['bridgeLayer', 'tunnelLayer', 'serviceLayer', 'stationLayer', 'pivotLayer', 'interchangeLayer'].indexOf(name) > -1) {
-			sqlText = sqlText ? `${sqlText} and use_status in ('1')` : `use_status in ('1')`
-		}
       }
-      let sql = ''
+      let sql = "";
       // if(Object.keys(this.querySql).length && layerObj && !layerObj.organizationSql){
       //   let arr = [];
       //   for(let i in this.querySql){
@@ -202772,118 +203109,220 @@ class echartsLayer_EchartsglLayer {
       //   }
       //   sql = `${arr.join(' and ')}`
       // }
-      if (this.organizationId && this.organizationType && layerObj && !layerObj.organizationSql) {
+      if (
+        this.organizationId &&
+        this.organizationType &&
+        layerObj &&
+        !layerObj.organizationSql
+      ) {
         // sql = `${this.organizationSql[+this.organizationType-1]} in ('${this.organizationId}')`
         // sql = `${this.organizationSql[+this.organizationType-1]} like '%${this.organizationId}%'`
-        if (name == 'pivotLayer') {
-          sql = `${this.organizationSql[+this.organizationType - 1]} like '%${this.organizationId}%'`
+        if (name == "pivotLayer") {
+          sql = `${this.organizationSql[+this.organizationType - 1]} like '%${
+            this.organizationId
+          }%'`;
         } else {
-          sql = `${this.organizationSql[+this.organizationType - 1]} in ('${this.organizationId}')`
+          sql = `${this.organizationSql[+this.organizationType - 1]} in ('${
+            this.organizationId
+          }')`;
         }
       }
       if (sqlText || sql) {
         // console.log(name)
         // console.log(`(${sqlText}${sqlText && sql?' and ' + sql:sql})`)
-        return `(${sqlText}${sqlText && sql ? ' and ' + sql : sql})`
+        return `(${sqlText}${sqlText && sql ? " and " + sql : sql})`;
       } else {
-        return ``
-      }
-    },
-	// 图层SQL过滤组装方法
-	makeRoadSqlTree(name,roadCodes) {
-		let layerObj = this.$GlobalConfig[this.typeNameLocal].roadTestEquipment.find((item) => item.layerName == name) ||
-			this.$GlobalConfig[this.typeNameLocal].roadTestPublishEquipment.find((item) => item.layerName == name) ||
-			this.$GlobalConfig[this.typeNameLocal].roadTestPerceptionPublishEquipment.find((item) => item.layerName == name) ||
-			this.$GlobalConfig[this.typeNameLocal].roadTestOthersEquipment.find((item) => item.layerName == name) ||
-			this.$GlobalConfig[this.typeNameLocal].roadNetworkFacilities.find((item) => item.layerName == name) ||
-			this.$GlobalConfig[this.typeNameLocal].maintenance.find((item) => item.layerName == name) ||
-			this.$GlobalConfig[this.typeNameLocal].roadAndBridgeTunnel.find((item) => item.layerName == name) ||
-			this.$GlobalConfig[this.typeNameLocal].equipmentFacilities.find((item) => item.layerName == name) ||
-			this.$GlobalConfig[this.typeNameLocal].otherClass.find((item) => item.layerName == name) ;
-		let sqlText = ''
-		if (layerObj && roadCodes) {
-			if (layerObj.roadIdKey && roadCodes.length) {
-				sqlText = `${layerObj.roadIdKey} in (${roadCodes.map((item) => `'${item}'`).join(',')})`
-			}
-			if (layerObj.is_test || layerObj.is_test === 0) {
-				sqlText = sqlText ? `${sqlText} and is_test = ${layerObj.is_test}` : `is_test = ${layerObj.is_test}`
-			}
-			if (this.typeNameLocal == 'danao' && ['bridgeLayer', 'tunnelLayer', 'serviceLayer', 'stationLayer', 'pivotLayer', 'interchangeLayer'].indexOf(name) > -1) {
-				sqlText = sqlText ? `${sqlText} and use_status in ('1')` : `use_status in ('1')`
-			}
-		}
-		let sql = ''
-		if (this.organizationId && this.organizationType && layerObj && !layerObj.organizationSql) {
-			if (name == 'pivotLayer') {
-				sql = `${this.organizationSql[+this.organizationType - 1]} like '%${this.organizationId}%'`
-			} else {
-				sql = `${this.organizationSql[+this.organizationType - 1]} in ('${this.organizationId}')`
-			}
-		}
-		if (sqlText || sql) {
-			return `(${sqlText}${sqlText && sql ? ' and ' + sql : sql})`
-		} else {
-			return ``
-		}
-	},
+        return ``;
+      }
+    },
+    // 图层SQL过滤组装方法
+    makeRoadSqlTree(name, roadCodes) {
+      let layerObj =
+        this.$GlobalConfig[this.typeNameLocal].roadTestEquipment.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].roadTestPublishEquipment.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[
+          this.typeNameLocal
+        ].roadTestPerceptionPublishEquipment.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].roadTestOthersEquipment.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].roadNetworkFacilities.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].maintenance.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].roadAndBridgeTunnel.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].equipmentFacilities.find(
+          (item) => item.layerName == name
+        ) ||
+        this.$GlobalConfig[this.typeNameLocal].otherClass.find(
+          (item) => item.layerName == name
+        );
+      let sqlText = "";
+      if (layerObj && roadCodes) {
+        if (layerObj.roadIdKey && roadCodes.length) {
+          sqlText = `${layerObj.roadIdKey} in (${roadCodes
+            .map((item) => `'${item}'`)
+            .join(",")})`;
+        }
+        if (layerObj.is_test || layerObj.is_test === 0) {
+          sqlText = sqlText
+            ? `${sqlText} and is_test = ${layerObj.is_test}`
+            : `is_test = ${layerObj.is_test}`;
+        }
+        if (
+          this.typeNameLocal == "danao" &&
+          [
+            "bridgeLayer",
+            "tunnelLayer",
+            "serviceLayer",
+            "stationLayer",
+            "pivotLayer",
+            "interchangeLayer",
+          ].indexOf(name) > -1
+        ) {
+          sqlText = sqlText
+            ? `${sqlText} and use_status in ('1')`
+            : `use_status in ('1')`;
+        }
+      }
+      let sql = "";
+      if (
+        this.organizationId &&
+        this.organizationType &&
+        layerObj &&
+        !layerObj.organizationSql
+      ) {
+        if (name == "pivotLayer") {
+          sql = `${this.organizationSql[+this.organizationType - 1]} like '%${
+            this.organizationId
+          }%'`;
+        } else {
+          sql = `${this.organizationSql[+this.organizationType - 1]} in ('${
+            this.organizationId
+          }')`;
+        }
+      }
+      if (sqlText || sql) {
+        return `(${sqlText}${sqlText && sql ? " and " + sql : sql})`;
+      } else {
+        return ``;
+      }
+    },
     addSql(data) {
-		console.log('addSql',data)
-      if ((data.opmaManagerCorpIds !=null && data.opmaManagerCorpIds.length) || (data.opmaManagerIds!=null && data.opmaManagerIds.length) || (data.roadCodes !=null &&data.roadCodes.length)) {
+      console.log("addSql", data);
+      if (
+        (data.opmaManagerCorpIds != null && data.opmaManagerCorpIds.length) ||
+        (data.opmaManagerIds != null && data.opmaManagerIds.length) ||
+        (data.roadCodes != null && data.roadCodes.length)
+      ) {
         this.checkList.forEach((item) => {
           // console.log(item)
           if (item.opmaManageIdKey) {
-			let roadSql;
-			if(data.roadCodes && data.roadCodes.length){
-				roadSql = this.makeRoadSqlTree(item.layerName,data.roadCodes)
-			}else{
-				roadSql = this.makeRoadSql(item.layerName)
-			}
-            let layerName = item.layerName
+            let roadSql;
+            if (data.roadCodes && data.roadCodes.length) {
+              roadSql = this.makeRoadSqlTree(item.layerName, data.roadCodes);
+            } else {
+              roadSql = this.makeRoadSql(item.layerName);
+            }
+            let layerName = item.layerName;
             // if(layerName == 'roadlineLayer'){
             //   layerName = 'roadlineLayer_'
             // }
-            let opmaManageSql = []
-			if((data.opmaManagerCorpIds !=null && data.opmaManagerCorpIds.length) || (data.opmaManagerIds!=null && data.opmaManagerIds.length) ){
-				for (let i in item.opmaManageIdKey) {
-					// console.log(i)
-					if (data[item.opmaManageIdKey[i]].length) {
-						data[item.opmaManageIdKey[i]].map((id) => {
-							//opmaManageSql.push(`${i} like '%${id}%'`)
-							opmaManageSql.push(`${i} = '${id}'`)
-						})
-					}
-				}
-			}
+            let opmaManageSql = [];
+            if (
+              (data.opmaManagerCorpIds != null &&
+                data.opmaManagerCorpIds.length) ||
+              (data.opmaManagerIds != null && data.opmaManagerIds.length)
+            ) {
+              for (let i in item.opmaManageIdKey) {
+                // console.log(i)
+                if (data[item.opmaManageIdKey[i]].length) {
+                  data[item.opmaManageIdKey[i]].map((id) => {
+                    //opmaManageSql.push(`${i} like '%${id}%'`)
+                    opmaManageSql.push(`${i} = '${id}'`);
+                  });
+                }
+              }
+            }
             if (!this.layerListSql[layerName]) {
-              this.layerListSql[layerName] = {}
+              this.layerListSql[layerName] = {};
+            }
+            let opmaManageSqlWhere = "";
+            if (opmaManageSql != null && opmaManageSql.length > 0) {
+              opmaManageSqlWhere = `(${opmaManageSql.join(" or ")})`;
+              this.layerListSql[layerName].treeSql = `(${opmaManageSql.join(
+                " or "
+              )})`;
             }
-			let opmaManageSqlWhere = '';
-			if(opmaManageSql !=null && opmaManageSql.length >0){
-				opmaManageSqlWhere = `(${opmaManageSql.join(' or ')})`
-				this.layerListSql[layerName].treeSql = `(${opmaManageSql.join(' or ')})`
-			}
             if (roadSql) {
-				//根据道路筛选-道路线高亮
-				if(data.roadCodes && data.roadCodes.length){
-					this.roadlineLayer.opacity=0;
-					this.roadlineLayer.visible = true;
-					let roadSql_tmp = roadSql.replace("and use_status in ('1')","")
-					this.roadlineLayer.definitionExpression = `(${roadSql_tmp}${this.layerListSql['roadlineLayer'].makeSql ? ' and ' + this.layerListSql['roadlineLayer'].makeSql : ''}${(this.layerListSql['roadlineLayer'].makeSql || roadSql) && opmaManageSqlWhere? ' and '+opmaManageSqlWhere : opmaManageSqlWhere})`
-					setTimeout(() => {
-						this.roadlineLayer.opacity=1;
-					}, 1000);
-				}else{
-					if (this.checkList.filter((item) => item.layerName == "roadlineLayer").length <=0) {
-						this.roadlineLayer.visible = false;
-					}
-				}
-				this[layerName].definitionExpression = `(${roadSql}${this.layerListSql[layerName].makeSql ? ' and ' + this.layerListSql[layerName].makeSql : ''}${(this.layerListSql[layerName].makeSql || roadSql) && opmaManageSqlWhere? ' and '+opmaManageSqlWhere : opmaManageSqlWhere})`
+              //根据道路筛选-道路线高亮
+              if (data.roadCodes && data.roadCodes.length) {
+                this.roadlineLayer.opacity = 0;
+                this.roadlineLayer.visible = true;
+                let roadSql_tmp = roadSql.replace(
+                  "and use_status in ('1')",
+                  ""
+                );
+                this.roadlineLayer.definitionExpression = `(${roadSql_tmp}${
+                  this.layerListSql["roadlineLayer"].makeSql
+                    ? " and " + this.layerListSql["roadlineLayer"].makeSql
+                    : ""
+                }${
+                  (this.layerListSql["roadlineLayer"].makeSql || roadSql) &&
+                  opmaManageSqlWhere
+                    ? " and " + opmaManageSqlWhere
+                    : opmaManageSqlWhere
+                })`;
+                setTimeout(() => {
+                  this.roadlineLayer.opacity = 1;
+                }, 1000);
+              } else {
+                if (
+                  this.checkList.filter(
+                    (item) => item.layerName == "roadlineLayer"
+                  ).length <= 0
+                ) {
+                  this.roadlineLayer.visible = false;
+                }
+              }
+              this[layerName].definitionExpression = `(${roadSql}${
+                this.layerListSql[layerName].makeSql
+                  ? " and " + this.layerListSql[layerName].makeSql
+                  : ""
+              }${
+                (this.layerListSql[layerName].makeSql || roadSql) &&
+                opmaManageSqlWhere
+                  ? " and " + opmaManageSqlWhere
+                  : opmaManageSqlWhere
+              })`;
             } else {
-				this[layerName].definitionExpression = `(${this.layerListSql[layerName].makeSql ? this.layerListSql[layerName].makeSql : ''}${this.layerListSql[layerName].makeSql && opmaManageSqlWhere ? ' and '+opmaManageSqlWhere : opmaManageSqlWhere})`
-				if (this.checkList.filter((item) => item.layerName == "roadlineLayer").length <=0) {
-					this.roadlineLayer.visible = false;
-				}
-			}
+              this[layerName].definitionExpression = `(${
+                this.layerListSql[layerName].makeSql
+                  ? this.layerListSql[layerName].makeSql
+                  : ""
+              }${
+                this.layerListSql[layerName].makeSql && opmaManageSqlWhere
+                  ? " and " + opmaManageSqlWhere
+                  : opmaManageSqlWhere
+              })`;
+              if (
+                this.checkList.filter(
+                  (item) => item.layerName == "roadlineLayer"
+                ).length <= 0
+              ) {
+                this.roadlineLayer.visible = false;
+              }
+            }
             // if (layerName == 'roadlineLayer_') {
             //   setTimeout(() => {
             //     this.roadlineLayer_.visible = true
@@ -202892,12 +203331,16 @@ class echartsLayer_EchartsglLayer {
             // console.log(layerName)
             // console.log(this[layerName].definitionExpression)
           }
-          this.reloadQueryFeatureCount(item.layerName)
-        })
+          this.reloadQueryFeatureCount(item.layerName);
+        });
       } else {
-		if (this.checkList.filter((item) => item.layerName == "roadlineLayer").length <=0 || data.isTreeRoad) {
-			this.roadlineLayer.visible = false;
-		}
+        if (
+          this.checkList.filter((item) => item.layerName == "roadlineLayer")
+            .length <= 0 ||
+          data.isTreeRoad
+        ) {
+          this.roadlineLayer.visible = false;
+        }
         // console.log(this.roadlineLayer_,this.roadlineLayer_.definitionExpression)
         // if (this.roadlineLayer_ && this.roadlineLayer_.definitionExpression) {
         //   if(!this.layerListSql.roadlineLayer_){
@@ -202911,186 +203354,379 @@ class echartsLayer_EchartsglLayer {
         //   }
         //   this.roadlineLayer_.visible = false
         // }
-        this.$GlobalConfig[this.typeNameLocal].roadTestEquipment.forEach((item) => {
-          if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
-            if (!this.layerListSql[item.layerName]) {
-              this.layerListSql[item.layerName] = {}
-            }
-            let sql = this.makeRoadSql(item.layerName);
-            if (sql) {
-              this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
-            } else {
-              this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
+        this.$GlobalConfig[this.typeNameLocal].roadTestEquipment.forEach(
+          (item) => {
+            if (
+              item[item.layerName] &&
+              this[item.layerName] &&
+              (this[item.layerName].definitionExpression ||
+                this[item.layerName].definitionExpression === "")
+            ) {
+              if (!this.layerListSql[item.layerName]) {
+                this.layerListSql[item.layerName] = {};
+              }
+              let sql = this.makeRoadSql(item.layerName);
+              if (sql) {
+                this[item.layerName].definitionExpression = `(${sql.slice(
+                  1,
+                  sql.length - 1
+                )}${
+                  this.layerListSql[item.layerName].makeSql
+                    ? " and " + this.layerListSql[item.layerName].makeSql
+                    : ""
+                })`;
+              } else {
+                this[item.layerName].definitionExpression = this.layerListSql[
+                  item.layerName
+                ].makeSql
+                  ? `(${this.layerListSql[item.layerName].makeSql})`
+                  : "";
+              }
+              this.reloadQueryFeatureCount(item.layerName);
             }
-            this.reloadQueryFeatureCount(item.layerName)
           }
-        })
-        this.$GlobalConfig[this.typeNameLocal].roadTestPublishEquipment.forEach((item) => {
-          if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
-            if (!this.layerListSql[item.layerName]) {
-              this.layerListSql[item.layerName] = {}
-            }
-            let sql = this.makeRoadSql(item.layerName);
-            if (sql) {
-              this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
-            } else {
-              this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
+        );
+        this.$GlobalConfig[this.typeNameLocal].roadTestPublishEquipment.forEach(
+          (item) => {
+            if (
+              item[item.layerName] &&
+              this[item.layerName] &&
+              (this[item.layerName].definitionExpression ||
+                this[item.layerName].definitionExpression === "")
+            ) {
+              if (!this.layerListSql[item.layerName]) {
+                this.layerListSql[item.layerName] = {};
+              }
+              let sql = this.makeRoadSql(item.layerName);
+              if (sql) {
+                this[item.layerName].definitionExpression = `(${sql.slice(
+                  1,
+                  sql.length - 1
+                )}${
+                  this.layerListSql[item.layerName].makeSql
+                    ? " and " + this.layerListSql[item.layerName].makeSql
+                    : ""
+                })`;
+              } else {
+                this[item.layerName].definitionExpression = this.layerListSql[
+                  item.layerName
+                ].makeSql
+                  ? `(${this.layerListSql[item.layerName].makeSql})`
+                  : "";
+              }
+              this.reloadQueryFeatureCount(item.layerName);
             }
-            this.reloadQueryFeatureCount(item.layerName)
           }
-        })
-        this.$GlobalConfig[this.typeNameLocal].roadTestPerceptionPublishEquipment.forEach((item) => {
-          if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
+        );
+        this.$GlobalConfig[
+          this.typeNameLocal
+        ].roadTestPerceptionPublishEquipment.forEach((item) => {
+          if (
+            item[item.layerName] &&
+            this[item.layerName] &&
+            (this[item.layerName].definitionExpression ||
+              this[item.layerName].definitionExpression === "")
+          ) {
             if (!this.layerListSql[item.layerName]) {
-              this.layerListSql[item.layerName] = {}
+              this.layerListSql[item.layerName] = {};
             }
             let sql = this.makeRoadSql(item.layerName);
             if (sql) {
-              this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
+              this[item.layerName].definitionExpression = `(${sql.slice(
+                1,
+                sql.length - 1
+              )}${
+                this.layerListSql[item.layerName].makeSql
+                  ? " and " + this.layerListSql[item.layerName].makeSql
+                  : ""
+              })`;
             } else {
-              this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
+              this[item.layerName].definitionExpression = this.layerListSql[
+                item.layerName
+              ].makeSql
+                ? `(${this.layerListSql[item.layerName].makeSql})`
+                : "";
             }
-            this.reloadQueryFeatureCount(item.layerName)
+            this.reloadQueryFeatureCount(item.layerName);
           }
-        })
-        this.$GlobalConfig[this.typeNameLocal].roadTestOthersEquipment.forEach((item) => {
-          if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
-            if (!this.layerListSql[item.layerName]) {
-              this.layerListSql[item.layerName] = {}
-            }
-            let sql = this.makeRoadSql(item.layerName);
-            if (sql) {
-              this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
-            } else {
-              this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
+        });
+        this.$GlobalConfig[this.typeNameLocal].roadTestOthersEquipment.forEach(
+          (item) => {
+            if (
+              item[item.layerName] &&
+              this[item.layerName] &&
+              (this[item.layerName].definitionExpression ||
+                this[item.layerName].definitionExpression === "")
+            ) {
+              if (!this.layerListSql[item.layerName]) {
+                this.layerListSql[item.layerName] = {};
+              }
+              let sql = this.makeRoadSql(item.layerName);
+              if (sql) {
+                this[item.layerName].definitionExpression = `(${sql.slice(
+                  1,
+                  sql.length - 1
+                )}${
+                  this.layerListSql[item.layerName].makeSql
+                    ? " and " + this.layerListSql[item.layerName].makeSql
+                    : ""
+                })`;
+              } else {
+                this[item.layerName].definitionExpression = this.layerListSql[
+                  item.layerName
+                ].makeSql
+                  ? `(${this.layerListSql[item.layerName].makeSql})`
+                  : "";
+              }
+              this.reloadQueryFeatureCount(item.layerName);
             }
-            this.reloadQueryFeatureCount(item.layerName)
           }
-        })
-        this.$GlobalConfig[this.typeNameLocal].roadNetworkFacilities.forEach((item) => {
-          if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
-            if (!this.layerListSql[item.layerName]) {
-              this.layerListSql[item.layerName] = {}
-            }
-            let sql = this.makeRoadSql(item.layerName);
-            if (sql) {
-              this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
-            } else {
-              this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
+        );
+        this.$GlobalConfig[this.typeNameLocal].roadNetworkFacilities.forEach(
+          (item) => {
+            if (
+              item[item.layerName] &&
+              this[item.layerName] &&
+              (this[item.layerName].definitionExpression ||
+                this[item.layerName].definitionExpression === "")
+            ) {
+              if (!this.layerListSql[item.layerName]) {
+                this.layerListSql[item.layerName] = {};
+              }
+              let sql = this.makeRoadSql(item.layerName);
+              if (sql) {
+                this[item.layerName].definitionExpression = `(${sql.slice(
+                  1,
+                  sql.length - 1
+                )}${
+                  this.layerListSql[item.layerName].makeSql
+                    ? " and " + this.layerListSql[item.layerName].makeSql
+                    : ""
+                })`;
+              } else {
+                this[item.layerName].definitionExpression = this.layerListSql[
+                  item.layerName
+                ].makeSql
+                  ? `(${this.layerListSql[item.layerName].makeSql})`
+                  : "";
+              }
+              // console.log(item.layerName)
+              // console.log(this[item.layerName].definitionExpression)
+              this.reloadQueryFeatureCount(item.layerName);
             }
-            // console.log(item.layerName)
-            // console.log(this[item.layerName].definitionExpression)
-            this.reloadQueryFeatureCount(item.layerName)
           }
-        })
+        );
         this.$GlobalConfig[this.typeNameLocal].maintenance.forEach((item) => {
-          if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
+          if (
+            item[item.layerName] &&
+            this[item.layerName] &&
+            (this[item.layerName].definitionExpression ||
+              this[item.layerName].definitionExpression === "")
+          ) {
             if (!this.layerListSql[item.layerName]) {
-              this.layerListSql[item.layerName] = {}
+              this.layerListSql[item.layerName] = {};
             }
             let sql = this.makeRoadSql(item.layerName);
             if (sql) {
-              this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
+              this[item.layerName].definitionExpression = `(${sql.slice(
+                1,
+                sql.length - 1
+              )}${
+                this.layerListSql[item.layerName].makeSql
+                  ? " and " + this.layerListSql[item.layerName].makeSql
+                  : ""
+              })`;
             } else {
-              this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
+              this[item.layerName].definitionExpression = this.layerListSql[
+                item.layerName
+              ].makeSql
+                ? `(${this.layerListSql[item.layerName].makeSql})`
+                : "";
             }
-            this.reloadQueryFeatureCount(item.layerName)
+            this.reloadQueryFeatureCount(item.layerName);
           }
-        })
+        });
         this.$GlobalConfig[this.typeNameLocal].otherClass.forEach((item) => {
-          if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
+          if (
+            item[item.layerName] &&
+            this[item.layerName] &&
+            (this[item.layerName].definitionExpression ||
+              this[item.layerName].definitionExpression === "")
+          ) {
             if (!this.layerListSql[item.layerName]) {
-              this.layerListSql[item.layerName] = {}
+              this.layerListSql[item.layerName] = {};
             }
             let sql = this.makeRoadSql(item.layerName);
             if (sql) {
-              this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
+              this[item.layerName].definitionExpression = `(${sql.slice(
+                1,
+                sql.length - 1
+              )}${
+                this.layerListSql[item.layerName].makeSql
+                  ? " and " + this.layerListSql[item.layerName].makeSql
+                  : ""
+              })`;
             } else {
-              this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
+              this[item.layerName].definitionExpression = this.layerListSql[
+                item.layerName
+              ].makeSql
+                ? `(${this.layerListSql[item.layerName].makeSql})`
+                : "";
             }
-            this.reloadQueryFeatureCount(item.layerName)
+            this.reloadQueryFeatureCount(item.layerName);
           }
-        })
-		this.$GlobalConfig[this.typeNameLocal].equipmentFacilities.forEach((item) => {
-			if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
-				if (!this.layerListSql[item.layerName]) {
-					this.layerListSql[item.layerName] = {}
-				}
-				let sql = this.makeRoadSql(item.layerName);
-				if (sql) {
-					this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
-				} else {
-					this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
-				}
-				this.reloadQueryFeatureCount(item.layerName)
-			}
-		})
-		this.$GlobalConfig[this.typeNameLocal].roadAndBridgeTunnel.forEach((item) => {
-			if (item[item.layerName] && this[item.layerName] && (this[item.layerName].definitionExpression || this[item.layerName].definitionExpression === '')) {
-				if (!this.layerListSql[item.layerName]) {
-					this.layerListSql[item.layerName] = {}
-				}
-				let sql = this.makeRoadSql(item.layerName);
-				if (sql) {
-					this[item.layerName].definitionExpression = `(${sql.slice(1, sql.length - 1)}${this.layerListSql[item.layerName].makeSql ? ' and ' + this.layerListSql[item.layerName].makeSql : ''})`
-				} else {
-					this[item.layerName].definitionExpression = this.layerListSql[item.layerName].makeSql ? `(${this.layerListSql[item.layerName].makeSql})` : ''
-				}
-				this.reloadQueryFeatureCount(item.layerName)
-			}
-		})
+        });
+        this.$GlobalConfig[this.typeNameLocal].equipmentFacilities.forEach(
+          (item) => {
+            if (
+              item[item.layerName] &&
+              this[item.layerName] &&
+              (this[item.layerName].definitionExpression ||
+                this[item.layerName].definitionExpression === "")
+            ) {
+              if (!this.layerListSql[item.layerName]) {
+                this.layerListSql[item.layerName] = {};
+              }
+              let sql = this.makeRoadSql(item.layerName);
+              if (sql) {
+                this[item.layerName].definitionExpression = `(${sql.slice(
+                  1,
+                  sql.length - 1
+                )}${
+                  this.layerListSql[item.layerName].makeSql
+                    ? " and " + this.layerListSql[item.layerName].makeSql
+                    : ""
+                })`;
+              } else {
+                this[item.layerName].definitionExpression = this.layerListSql[
+                  item.layerName
+                ].makeSql
+                  ? `(${this.layerListSql[item.layerName].makeSql})`
+                  : "";
+              }
+              this.reloadQueryFeatureCount(item.layerName);
+            }
+          }
+        );
+        this.$GlobalConfig[this.typeNameLocal].roadAndBridgeTunnel.forEach(
+          (item) => {
+            if (
+              item[item.layerName] &&
+              this[item.layerName] &&
+              (this[item.layerName].definitionExpression ||
+                this[item.layerName].definitionExpression === "")
+            ) {
+              if (!this.layerListSql[item.layerName]) {
+                this.layerListSql[item.layerName] = {};
+              }
+              let sql = this.makeRoadSql(item.layerName);
+              if (sql) {
+                this[item.layerName].definitionExpression = `(${sql.slice(
+                  1,
+                  sql.length - 1
+                )}${
+                  this.layerListSql[item.layerName].makeSql
+                    ? " and " + this.layerListSql[item.layerName].makeSql
+                    : ""
+                })`;
+              } else {
+                this[item.layerName].definitionExpression = this.layerListSql[
+                  item.layerName
+                ].makeSql
+                  ? `(${this.layerListSql[item.layerName].makeSql})`
+                  : "";
+              }
+              this.reloadQueryFeatureCount(item.layerName);
+            }
+          }
+        );
       }
     },
     reloadQueryFeatureCount(layerName) {
       if (this[layerName] && this[layerName].queryFeatureCount) {
         this[layerName].queryFeatureCount().then((res) => {
-          let layerNameArr = ['roadlineLayer', 'shareRoadLayer', 'engineeringBuild', 'roadDamageLayer', 'roadConsumeLayer', 'asphaltRoadDamageLayer', 'roadBumpLayer', 'roadSkidLayer', 'roadSmoothLayer', 'roadTrackLayer'];
-          this.$set(this.tabListNumber, layerName, layerNameArr.indexOf(layerName) != -1 ? '无' : res)
-        })
+          let layerNameArr = [
+            "roadlineLayer",
+            "shareRoadLayer",
+            "engineeringBuild",
+            "roadDamageLayer",
+            "roadConsumeLayer",
+            "asphaltRoadDamageLayer",
+            "roadBumpLayer",
+            "roadSkidLayer",
+            "roadSmoothLayer",
+            "roadTrackLayer",
+          ];
+          this.$set(
+            this.tabListNumber,
+            layerName,
+            layerNameArr.indexOf(layerName) != -1 ? "无" : res
+          );
+        });
       }
     },
     //根据传参进行过滤
     makeSql(layerName, keys) {
       // if(layerName == 'roadlineLayer'){
       //   layerName = 'roadlineLayer_'
-      // }   
-      if (this[layerName] && (this[layerName].definitionExpression || this[layerName].definitionExpression === '')) {
+      // }
+      if (
+        this[layerName] &&
+        (this[layerName].definitionExpression ||
+          this[layerName].definitionExpression === "")
+      ) {
         // this.setReduction(layerName, false)
         let sql = [];
-        if (layerName == 'pivotLayer') {
+        if (layerName == "pivotLayer") {
           for (let i in keys) {
-            let sql_text = []
-            keys[i].map(item => {
-              sql_text.push(`${i} like '%${item}%'`)
-            })
-            sql.push(`(${sql_text.map(item => item).join(' or ')})`)
+            let sql_text = [];
+            keys[i].map((item) => {
+              sql_text.push(`${i} like '%${item}%'`);
+            });
+            sql.push(`(${sql_text.map((item) => item).join(" or ")})`);
           }
         } else {
           for (let i in keys) {
-            sql.push(i + ' in (' + keys[i].map(item => `'${item}'`).join(', ') + ')');
+            sql.push(
+              i + " in (" + keys[i].map((item) => `'${item}'`).join(", ") + ")"
+            );
           }
         }
         let sqlText = this.makeRoadSql(layerName);
         if (!this.layerListSql[layerName]) {
-          this.layerListSql[layerName] = {}
+          this.layerListSql[layerName] = {};
         }
-        this.layerListSql[layerName].makeSql = `${sql.join(' and ')}`
+        this.layerListSql[layerName].makeSql = `${sql.join(" and ")}`;
         if (sqlText) {
-          this[layerName].definitionExpression = `(${sqlText} and ${sql.join(' and ')}${this.layerListSql[layerName].treeSql ? ' and ' + this.layerListSql[layerName].treeSql : ''})`
+          this[layerName].definitionExpression = `(${sqlText} and ${sql.join(
+            " and "
+          )}${
+            this.layerListSql[layerName].treeSql
+              ? " and " + this.layerListSql[layerName].treeSql
+              : ""
+          })`;
         } else {
-          this[layerName].definitionExpression = `(${sql.join(' and ')}${this.layerListSql[layerName].treeSql ? ' and ' + this.layerListSql[layerName].treeSql : ''})`
-        }
-        console.log('******', this[layerName].definitionExpression);
-        this.reloadQueryFeatureCount(layerName)
-        // this.setReduction(layerName, true) 
+          this[layerName].definitionExpression = `(${sql.join(" and ")}${
+            this.layerListSql[layerName].treeSql
+              ? " and " + this.layerListSql[layerName].treeSql
+              : ""
+          })`;
+        }
+        console.log("******", this[layerName].definitionExpression);
+        this.reloadQueryFeatureCount(layerName);
+        // this.setReduction(layerName, true)
       }
     },
     //重置过滤的方法
     ResetSql(layerName) {
-      if (this[layerName] && (this[layerName].definitionExpression || this[layerName].definitionExpression === '')) {
+      if (
+        this[layerName] &&
+        (this[layerName].definitionExpression ||
+          this[layerName].definitionExpression === "")
+      ) {
         // this.setReduction(layerName, false);
-        this[layerName].definitionExpression = this.makeRoadSql(layerName)
-        this.reloadQueryFeatureCount(layerName)
+        this[layerName].definitionExpression = this.makeRoadSql(layerName);
+        this.reloadQueryFeatureCount(layerName);
         // this.setReduction(layerName, true)
       }
     },
@@ -203113,18 +203749,20 @@ class echartsLayer_EchartsglLayer {
       }
     },
     onoffGaodeLayer() {
-		if(this.congestionSectionLayer){
-			this.congestionSectionLayer.visible = !this.congestionSectionLayer.visible
-		}
-		if(this.allGreenLayer){
-			this.allGreenLayer.visible = !this.allGreenLayer.visible
-		}
-		this.closePopup();
+      if (this.congestionSectionLayer) {
+        this.congestionSectionLayer.visible =
+          !this.congestionSectionLayer.visible;
+      }
+      if (this.allGreenLayer) {
+        this.allGreenLayer.visible = !this.allGreenLayer.visible;
+      }
+      this.closePopup();
     },
     //获取两个经纬度之间中心点的经纬度
     getCenterLonLat(oneLon, oneLat, twoLon, twoLat) {
       //oneLon：第一个点的经度；oneLat：第一个点的纬度；twoLon：第二个点的经度；twoLat：第二个点的纬度；
-      let aLon = 0, aLat = 0;
+      let aLon = 0,
+        aLat = 0;
       let bLon = Number(oneLon) - Number(twoLon);
       let bLat = Number(oneLat) - Number(twoLat);
       //Math.abs()绝对值
@@ -203138,12 +203776,10 @@ class echartsLayer_EchartsglLayer {
       } else {
         aLat = Number(twoLat) - Math.abs(bLat) / 2;
       }
-      Object(esri_loader["loadModules"])([
-        "esri/geometry/Point",
-      ]).then(([Point]) => {
+      Object(esri_loader["loadModules"])(["esri/geometry/Point"]).then(([Point]) => {
         let pt = new Point({
           latitude: aLat,
-          longitude: aLon
+          longitude: aLon,
         });
         let opts = {
           duration: 1000,
@@ -203153,52 +203789,55 @@ class echartsLayer_EchartsglLayer {
             target: pt,
             scale: this.view.scale / 6,
             // zoom: 15
-          }, opts);
-      })
+          },
+          opts
+        );
+      });
       return [aLon, aLat];
     },
     // 在经纬度附近5公里添加摄像机
-    addVideoPoint(longitude, latitude,roadId,stakeNumber,facilitiesType) { //isCustom
+    addVideoPoint(longitude, latitude, roadId, stakeNumber, facilitiesType) {
+      //isCustom
       let timefor = setInterval(() => {
         if (this.view) {
-          clearInterval(timefor)
-			if(stakeNumber && roadId){
-				stakeNumber = stakeNumber.replace('K','').replace('+','.');
-				if(roadId ==null){
-					roadId = '';
-				}
-				longitude = '';
-				latitude = '';
-			}else{
-				roadId = '';
-				stakeNumber = '';
-			}
-			const params = {
-				devCategory: '003',
-				gatewayNetstatus: '1',
-				distanceRange: 5000,
-				facilitiesType: facilitiesType,
-				lat: latitude,
-				lng: longitude,
-				roadId: roadId,
-				stakeNo: stakeNumber
-			}
+          clearInterval(timefor);
+          if (stakeNumber && roadId) {
+            stakeNumber = stakeNumber.replace("K", "").replace("+", ".");
+            if (roadId == null) {
+              roadId = "";
+            }
+            longitude = "";
+            latitude = "";
+          } else {
+            roadId = "";
+            stakeNumber = "";
+          }
+          const params = {
+            devCategory: "003",
+            gatewayNetstatus: "1",
+            distanceRange: 5000,
+            facilitiesType: facilitiesType,
+            lat: latitude,
+            lng: longitude,
+            roadId: roadId,
+            stakeNo: stakeNumber,
+          };
           Object(api["a" /* addVideoPointData */])(params).then((res) => {
             Object(esri_loader["loadModules"])(["esri/Graphic", "esri/layers/GraphicsLayer"]).then(
               ([Graphic, GraphicsLayer]) => {
                 if (!this.newVideoPoint) {
                   if (this.newVideoPointLayer) {
-                    this.newVideoPointLayer.removeAll()
-                    this.map.remove(this.newVideoPointLayer)
-                    this.newVideoPointLayer = null
+                    this.newVideoPointLayer.removeAll();
+                    this.map.remove(this.newVideoPointLayer);
+                    this.newVideoPointLayer = null;
                   }
                   this.newVideoPointLayer = new GraphicsLayer({
-                    id: 'newVideoPointLayer',
+                    id: "newVideoPointLayer",
                   });
                   this.map.add(this.newVideoPointLayer, 33);
                 }
-                res.data.forEach(item => {
-                  if (item.gatewayNetstatus == '1') {
+                res.data.forEach((item) => {
+                  if (item.gatewayNetstatus == "1") {
                     item.lng = Number(item.lng);
                     item.lat = Number(item.lat);
                     item.road_id = item.roadId;
@@ -203220,8 +203859,8 @@ class echartsLayer_EchartsglLayer {
                       //点符号设置
                       type: "picture-marker",
                       url: this.videoLayer_img,
-                      width: 35 * this.styleZoom + 'px',
-                      height: 35 * this.styleZoom + 'px',
+                      width: 35 * this.styleZoom + "px",
+                      height: 35 * this.styleZoom + "px",
                     };
                     let pointGraphic = new Graphic({
                       attributes: {
@@ -203233,34 +203872,35 @@ class echartsLayer_EchartsglLayer {
                       geometry: point,
                       symbol: simpleMarkerSymbol,
                     });
-                    this.newVideoPointLayer.add(pointGraphic)
+                    this.newVideoPointLayer.add(pointGraphic);
                   }
-                })
-                console.log(this.newVideoPointLayer)
-              })
-          })
+                });
+                console.log(this.newVideoPointLayer);
+              }
+            );
+          });
         }
-      }, 50)
+      }, 50);
     },
     removeAllVideoPoint() {
       if (this.newVideoPointLayer) {
-        this.newVideoPointLayer.removeAll()
-        this.map.remove(this.newVideoPointLayer)
-        this.newVideoPointLayer = null
+        this.newVideoPointLayer.removeAll();
+        this.map.remove(this.newVideoPointLayer);
+        this.newVideoPointLayer = null;
       }
     },
     //添加不同图层的点
     addTypePoint(data, layerName, icon) {
       Object(esri_loader["loadModules"])(["esri/Graphic", "esri/layers/GraphicsLayer"]).then(
         ([Graphic, GraphicsLayer]) => {
-          let name = layerName + '_newlistpoint'
+          let name = layerName + "_newlistpoint";
           if (!this[name]) {
             this[name] = new GraphicsLayer({
               id: name,
             });
             this.map.add(this[name], 15);
           }
-          data.forEach(item => {
+          data.forEach((item) => {
             const point = {
               //点设置
               type: "point", //类型：点、线、面
@@ -203271,8 +203911,8 @@ class echartsLayer_EchartsglLayer {
               //点符号设置
               type: "picture-marker",
               url: icon,
-              width: 35 * this.styleZoom + 'px',
-              height: 35 * this.styleZoom + 'px',
+              width: 35 * this.styleZoom + "px",
+              height: 35 * this.styleZoom + "px",
             };
             let pointGraphic = new Graphic({
               attributes: {
@@ -203284,41 +203924,41 @@ class echartsLayer_EchartsglLayer {
               geometry: point,
               symbol: simpleMarkerSymbol,
             });
-            this[name].add(pointGraphic)
-          })
-        })
+            this[name].add(pointGraphic);
+          });
+        }
+      );
     },
     removeTypePoint(layerName) {
-      let name = layerName + '_newlistpoint'
+      let name = layerName + "_newlistpoint";
       if (this[name]) {
-        this[name].removeAll()
+        this[name].removeAll();
       }
     },
     // 设备联动打点
     addDevLinkagePoint(devId) {
       if (this.view) {
-        this.removeDevLinkagePoint()
-        getDevjointaction(
-          {
-            triggerDevNo: devId
-          }
-        ).then((res) => {
-          Object(esri_loader["loadModules"])(["esri/Graphic", "esri/layers/GraphicsLayer"]).then(  // 005情报板  018、012、220诱导灯  015广播
+        this.removeDevLinkagePoint();
+        getDevjointaction({
+          triggerDevNo: devId,
+        }).then((res) => {
+          Object(esri_loader["loadModules"])(["esri/Graphic", "esri/layers/GraphicsLayer"]).then(
+            // 005情报板  018、012、220诱导灯  015广播
             ([Graphic, GraphicsLayer]) => {
               this.newQBBPointLayer = new GraphicsLayer({
-                id: 'newQBBPointLayer',
+                id: "newQBBPointLayer",
               });
               this.newYDDPointLayer = new GraphicsLayer({
-                id: 'newYDDPointLayer',
+                id: "newYDDPointLayer",
               });
               this.newGBPointLayer = new GraphicsLayer({
-                id: 'newGBPointLayer',
+                id: "newGBPointLayer",
               });
               this.map.add(this.newQBBPointLayer, 15);
               this.map.add(this.newYDDPointLayer, 15);
               this.map.add(this.newGBPointLayer, 15);
               if (res.data) {
-                res.data[0].triggerByDev.forEach(item => {
+                res.data[0].triggerByDev.forEach((item) => {
                   item.lng = Number(item.lng);
                   item.lat = Number(item.lat);
                   item.road_id = item.roadId;
@@ -203331,13 +203971,13 @@ class echartsLayer_EchartsglLayer {
                     type: "point",
                     longitude: item.lng,
                     latitude: item.lat,
-                  }
-                  if (item.devCategory == '005') {
+                  };
+                  if (item.devCategory == "005") {
                     let simpleMarkerSymbol = {
                       type: "picture-marker",
                       url: this.newQBBPointLayer_img,
-                      width: 35 * this.styleZoom + 'px',
-                      height: 35 * this.styleZoom + 'px',
+                      width: 35 * this.styleZoom + "px",
+                      height: 35 * this.styleZoom + "px",
                     };
                     let pointGraphic = new Graphic({
                       attributes: {
@@ -203348,13 +203988,17 @@ class echartsLayer_EchartsglLayer {
                       geometry: point,
                       symbol: simpleMarkerSymbol,
                     });
-                    this.newQBBPointLayer.add(pointGraphic)
-                  } else if (item.devCategory == '018' || item.devCategory == '012' || item.devCategory == '220') {
+                    this.newQBBPointLayer.add(pointGraphic);
+                  } else if (
+                    item.devCategory == "018" ||
+                    item.devCategory == "012" ||
+                    item.devCategory == "220"
+                  ) {
                     let simpleMarkerSymbol = {
                       type: "picture-marker",
                       url: this.newYDDPointLayer_img,
-                      width: 35 * this.styleZoom + 'px',
-                      height: 35 * this.styleZoom + 'px',
+                      width: 35 * this.styleZoom + "px",
+                      height: 35 * this.styleZoom + "px",
                     };
                     let pointGraphic = new Graphic({
                       attributes: {
@@ -203365,13 +204009,13 @@ class echartsLayer_EchartsglLayer {
                       geometry: point,
                       symbol: simpleMarkerSymbol,
                     });
-                    this.newYDDPointLayer.add(pointGraphic)
-                  } else if (item.devCategory == '015') {
+                    this.newYDDPointLayer.add(pointGraphic);
+                  } else if (item.devCategory == "015") {
                     let simpleMarkerSymbol = {
                       type: "picture-marker",
                       url: this.newGBPointLayer_img,
-                      width: 35 * this.styleZoom + 'px',
-                      height: 35 * this.styleZoom + 'px',
+                      width: 35 * this.styleZoom + "px",
+                      height: 35 * this.styleZoom + "px",
                     };
                     let pointGraphic = new Graphic({
                       attributes: {
@@ -203382,82 +204026,80 @@ class echartsLayer_EchartsglLayer {
                       geometry: point,
                       symbol: simpleMarkerSymbol,
                     });
-                    this.newGBPointLayer.add(pointGraphic)
+                    this.newGBPointLayer.add(pointGraphic);
                   }
-                })
+                });
               }
               // console.log('this.newQBBPointLayer',this.newQBBPointLayer);
               // console.log('this.newYDDPointLayer',this.newYDDPointLayer);
               // console.log('this.newGBPointLayer',this.newGBPointLayer);
-            })
-        })
+            }
+          );
+        });
       }
     },
     // 清除设备联动打点
     removeDevLinkagePoint() {
       if (this.newQBBPointLayer) {
-        this.newQBBPointLayer.removeAll()
+        this.newQBBPointLayer.removeAll();
       }
       if (this.newYDDPointLayer) {
-        this.newYDDPointLayer.removeAll()
+        this.newYDDPointLayer.removeAll();
       }
       if (this.newGBPointLayer) {
-        this.newGBPointLayer.removeAll()
+        this.newGBPointLayer.removeAll();
       }
     },
     openTrafficLayer() {
-      
       if (this.allGreenLayer) {
-        this.allGreenLayer.visible = true
+        this.allGreenLayer.visible = true;
       } else {
-        this.initAllGreenLayer('1')
+        this.initAllGreenLayer("1");
+      }
+      if (this.congestionSectionLayer) {
+        this.congestionSectionLayer.visible = true;
+      } else {
+        let this_ = this;
+        setTimeout(function () {
+          this_.initTrafficLayer("1");
+        }, 3000);
       }
-		if (this.congestionSectionLayer) {
-			this.congestionSectionLayer.visible = true
-		} else {
-			let this_ = this;
-			setTimeout(function () {
-				this_.initTrafficLayer('1')
-			}, 3000)
-		}
       let toolbar_c = this.toolbar_c.find(
         (item) => item.id == "weight_traffic"
       );
       this.weight_traffic_D = toolbar_c.imgUrl;
       if (!this.trafficLayerInterval) {
         this.trafficLayerInterval = setInterval(() => {
-          this.initTrafficLayer()
+          this.initTrafficLayer();
           //console.log(this.congestionSectionLayer.visible);
-        }, 60000)
+        }, 60000);
       }
     },
     closeTrafficLayer() {
-		if (this.congestionSectionLayer) {
-			this.congestionSectionLayer.visible = false
-		}
-		if(this.allGreenLayer.visible){
-			this.allGreenLayer.visible = false
-		}
-      let toolbar = this.toolbar.find(
-        (item) => item.id == "weight_traffic"
-      );
+      if (this.congestionSectionLayer) {
+        this.congestionSectionLayer.visible = false;
+      }
+      if (this.allGreenLayer.visible) {
+        this.allGreenLayer.visible = false;
+      }
+      let toolbar = this.toolbar.find((item) => item.id == "weight_traffic");
       this.weight_traffic_D = toolbar.imgUrl;
       if (this.trafficLayerInterval) {
-        clearInterval(this.trafficLayerInterval)
-        this.trafficLayerInterval = null
+        clearInterval(this.trafficLayerInterval);
+        this.trafficLayerInterval = null;
       }
     },
-	initClearScreen(){
-		this.clearScreen(1);
-	},
+    initClearScreen() {
+      this.clearScreen(1);
+    },
     // 一键清屏
     clearScreen(val) {
       this.getEquipList();
       this.closePopup();
-		if(val !=1){
-			this.closeTrafficLayer();
-			this.$emit('clearScreen');
-		}
+      if (val != 1) {
+        this.closeTrafficLayer();
+        this.$emit("clearScreen");
+      }
       this.cameraTreeShow = false;
       this.addSql({ opmaManagerCorpIds: [], opmaManagerIds: [] });
       //清空树勾选项
@@ -203469,116 +204111,118 @@ class echartsLayer_EchartsglLayer {
         };
         cTree.getTreeNode();
       }
-      this.$GlobalConfig['jiqing'].roadAndBridgeTunnel.forEach((item) => {
+      this.$GlobalConfig["jiqing"].roadAndBridgeTunnel.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].equipmentFacilities.forEach((item) => {
+      this.$GlobalConfig["jiqing"].equipmentFacilities.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].otherClass.forEach((item) => {
+      this.$GlobalConfig["jiqing"].otherClass.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].eventTopics.forEach((item) => {
+      this.$GlobalConfig["jiqing"].eventTopics.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].perceptionEvent.forEach((item) => {
+      this.$GlobalConfig["jiqing"].perceptionEvent.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].roadTestEquipment.forEach((item) => {
+      this.$GlobalConfig["jiqing"].roadTestEquipment.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].roadTestPublishEquipment.forEach((item) => {
+      this.$GlobalConfig["jiqing"].roadTestPublishEquipment.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].roadTestPerceptionPublishEquipment.forEach((item) => {
-        if (this[item.layerName]) {
-          this[item.layerName].visible = false;
+      this.$GlobalConfig["jiqing"].roadTestPerceptionPublishEquipment.forEach(
+        (item) => {
+          if (this[item.layerName]) {
+            this[item.layerName].visible = false;
+          }
         }
-      });
-      this.$GlobalConfig['jiqing'].roadTestOthersEquipment.forEach((item) => {
+      );
+      this.$GlobalConfig["jiqing"].roadTestOthersEquipment.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].roadNetworkFacilities.forEach((item) => {
+      this.$GlobalConfig["jiqing"].roadNetworkFacilities.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['jiqing'].maintenance.forEach((item) => {
+      this.$GlobalConfig["jiqing"].maintenance.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
 
-
-      this.$GlobalConfig['danao'].roadAndBridgeTunnel.forEach((item) => {
+      this.$GlobalConfig["danao"].roadAndBridgeTunnel.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['danao'].equipmentFacilities.forEach((item) => {
+      this.$GlobalConfig["danao"].equipmentFacilities.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['danao'].roadTestPublishEquipment.forEach((item) => {
+      this.$GlobalConfig["danao"].roadTestPublishEquipment.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['danao'].roadTestPerceptionPublishEquipment.forEach((item) => {
-        if (this[item.layerName]) {
-          this[item.layerName].visible = false;
+      this.$GlobalConfig["danao"].roadTestPerceptionPublishEquipment.forEach(
+        (item) => {
+          if (this[item.layerName]) {
+            this[item.layerName].visible = false;
+          }
         }
-      });
-      this.$GlobalConfig['danao'].otherClass.forEach((item) => {
+      );
+      this.$GlobalConfig["danao"].otherClass.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['danao'].eventTopics.forEach((item) => {
+      this.$GlobalConfig["danao"].eventTopics.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['danao'].perceptionEvent.forEach((item) => {
+      this.$GlobalConfig["danao"].perceptionEvent.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['danao'].roadTestEquipment.forEach((item) => {
+      this.$GlobalConfig["danao"].roadTestEquipment.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['danao'].roadNetworkFacilities.forEach((item) => {
+      this.$GlobalConfig["danao"].roadNetworkFacilities.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
-      this.$GlobalConfig['danao'].maintenance.forEach((item) => {
+      this.$GlobalConfig["danao"].maintenance.forEach((item) => {
         if (this[item.layerName]) {
           this[item.layerName].visible = false;
         }
       });
 
-
-      this.removeAllVideoPoint()
+      this.removeAllVideoPoint();
       //清除搜索单点
       if (this.searchPointTop) {
         this.removeTypePoint(this.searchPointTop);
@@ -203586,9 +204230,9 @@ class echartsLayer_EchartsglLayer {
       this.checkList = [];
     },
     defaultInitCrossLayer() {
-      this.showLayerById("CrossSectionLayer")
-      this.CrossSectionLayer_show = 1
-    }
+      this.showLayerById("CrossSectionLayer");
+      this.CrossSectionLayer_show = 1;
+    },
   },
 });
 
@@ -206447,7 +207091,7 @@ files.keys().forEach((key) => {
       this.closesingleMes = "";
     },
     getRoadList() {
-      Object(api["m" /* getRoadData */])().then((res) => {
+      Object(api["n" /* getRoadData */])().then((res) => {
         this.roadList = res.data;
       });
     },
@@ -207644,7 +208288,7 @@ files.keys().forEach((key) => {
                 lon: latlon.x,
                 lat: latlon.y,
               };
-              Object(api["s" /* lonandlatTopile */])(params)
+              Object(api["t" /* lonandlatTopile */])(params)
                 .then((res) => {
                   if (res.data) {
                     let mercator = that.lonlat2mercator({
@@ -207773,7 +208417,7 @@ files.keys().forEach((key) => {
                   roadId: this.form.roadId,
                   stakeNo: this.form.stakeNo,
                 };
-                Object(api["n" /* getStationData */])(data).then((res) => {
+                Object(api["o" /* getStationData */])(data).then((res) => {
                   if (res.data && res.data.length > 0) {
                     this.dialogToPileVisible = false;
                     let stationData = res.data[0];
@@ -210082,7 +210726,7 @@ files.keys().forEach((key) => {
         this.$emit("fromGisCheckBox", tabHeight);
       }
       //济青单切换时通知mqtt重新下发消息
-      Object(api["A" /* sendMqttMessage */])().then(() => {
+      Object(api["B" /* sendMqttMessage */])().then(() => {
         //console.log('gisMap.sendMqttMessage.res',res)
         //this.mqttData(res);
       });
@@ -222708,7 +223352,7 @@ var VideoPlay = __webpack_require__("5f91");
 	goTo(){
 		let _this = this;
 		//获取authCode
-		Object(api["c" /* getAuthCode */])(sessionStorage.getItem('sdhsg_its_app-1.6.12-uuid')).then((res) => {
+		Object(api["d" /* getAuthCode */])(sessionStorage.getItem('sdhsg_its_app-1.6.12-uuid')).then((res) => {
 			if(res.code == 0){
 				window.open(_this.jumpUrl.replace('{authCode}',res.data));
 			}else{