gis-map-universal 1.1.2 → 1.1.4

package/gismap.umd.js

@@ -260707,6 +260707,89 @@ ol_echarts_esm_EChartsLayer.isObject = ol_echarts_esm_isObject;
 /* harmony default export */ var ol_echarts_esm = (ol_echarts_esm_EChartsLayer);
 //# sourceMappingURL=ol-echarts.esm.js.map
 
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0e2c32fd-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gisMapTianditu/src/component/customPointLayer.vue?vue&type=template&id=357f70a2&scoped=true
+var customPointLayervue_type_template_id_357f70a2_scoped_true_render = function render() {
+  var _vm = this,
+    _c = _vm._self._c;
+  return _vm.isshow ? _c('div', {
+    style: {
+      height: _vm.height,
+      width: _vm.width
+    }
+  }, [_c('iframe', {
+    staticStyle: {
+      "width": "100%",
+      "height": "100%",
+      "border": "none"
+    },
+    attrs: {
+      "src": _vm.popupAttr.popupUrl
+    }
+  })]) : _vm._e();
+};
+var customPointLayervue_type_template_id_357f70a2_scoped_true_staticRenderFns = [];
+
+// CONCATENATED MODULE: ./packages/gisMapTianditu/src/component/customPointLayer.vue?vue&type=template&id=357f70a2&scoped=true
+
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gisMapTianditu/src/component/customPointLayer.vue?vue&type=script&lang=js
+/* harmony default export */ var customPointLayervue_type_script_lang_js = ({
+  name: '',
+  components: {},
+  created() {},
+  mounted() {},
+  props: {
+    popupAttr: Object
+  },
+  data() {
+    return {
+      isshow: false,
+      height: 0,
+      width: 0
+    };
+  },
+  methods: {
+    _show() {
+      this.isshow = false;
+      this.$nextTick(() => {
+        let fontSize = Number(document.getElementsByTagName('html')[0].style.fontSize.split('px')[0]);
+        let frameHeight = (this.popupAttr.popupHeight - 110) / 192 * fontSize;
+        let frameWidth = (this.popupAttr.popupWidth - 30) / 192 * fontSize;
+        this.height = frameHeight + 'px';
+        this.width = frameWidth + 'px';
+        this.isshow = true;
+      });
+    },
+    destroyFlv() {
+      this.isshow = false;
+    }
+  },
+  computed: {},
+  mounted() {
+    this._show();
+  }
+});
+// CONCATENATED MODULE: ./packages/gisMapTianditu/src/component/customPointLayer.vue?vue&type=script&lang=js
+ /* harmony default export */ var component_customPointLayervue_type_script_lang_js = (customPointLayervue_type_script_lang_js); 
+// CONCATENATED MODULE: ./packages/gisMapTianditu/src/component/customPointLayer.vue
+
+
+
+
+
+/* normalize component */
+
+var customPointLayer_component = normalizeComponent(
+  component_customPointLayervue_type_script_lang_js,
+  customPointLayervue_type_template_id_357f70a2_scoped_true_render,
+  customPointLayervue_type_template_id_357f70a2_scoped_true_staticRenderFns,
+  false,
+  null,
+  "357f70a2",
+  null
+  
+)
+
+/* harmony default export */ var customPointLayer = (customPointLayer_component.exports);
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0e2c32fd-vue-loader-template"}!./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/vue-loader/lib/loaders/templateLoader.js??ref--6!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/gisMapTianditu/src/component/trafficEventLayers/EmergencyLayer.vue?vue&type=template&id=c96d8022&scoped=true
 var EmergencyLayervue_type_template_id_c96d8022_scoped_true_render = function render() {
   var _vm = this,
@@ -264383,6 +264466,7 @@ function layersApi_getCongestionEventLayerData() {
   });
 }
 // CONCATENATED MODULE: ./packages/gisMapTianditu/src/js/initBaseLayers.js
+// 自定义打点
 // 交通事件--事件通用
 // 交通事件--拥堵事件
 // 交通事件--服务区异常
@@ -264456,7 +264540,7 @@ style:function(feature){return new Style["default"]({fill:new Fill["default"]({c
 width:1// 边界线宽度
 })});}});this.map.addLayer(this.china_full_Layer);});//监听点击事件
 let elPopup=this.$refs.popup;this.overlayPopup=new Overlay["a" /* default */]({element:elPopup,positioning:"bottom-right",stopEvent:true,autoPan:false});this.map.addOverlay(this.overlayPopup);this.map.on("click",e=>{// 检查是否正在进行区域分析绘制
-const isAreaAnalysisDrawing=this.map.getProperties().isAreaAnalysisDrawing||false;if(!isAreaAnalysisDrawing){let mousePoint=e.coordinate;this.initialPoint=mousePoint;let popupHeaderTitle=document.getElementById("popupHeaderTitle");let feature=this.map.forEachFeatureAtPixel(e.pixel,feature=>{return feature;});if(feature){if(feature.getProperties().features){if(feature.getProperties().features.length>1){const features=feature.getProperties().features;if(this.map.getView().getZoom()>=18){this.popupHeight=350;this.popupWidth=430;this.currentTabComponent=component_ClusterList;this.popupAttributes=features;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="点位列表";this.showPopup();let fontSize=Number(document.getElementsByTagName("html")[0].style.fontSize.split("px")[0]);let popupHeight=this.popupHeight/153.6*fontSize;let popupWidth=this.popupWidth/153.6*fontSize;this.overlayPopup.setPosition(mousePoint);this.overlayPopup.setOffset([-popupWidth/2,-popupHeight]);let pixelPoint=this.map.getPixelFromCoordinate(mousePoint);let newpixelPoint=[pixelPoint[0],pixelPoint[1]-150];let newCenterPoint=this.map.getCoordinateFromPixel(newpixelPoint);// this.map.getView().animate({
+const isAreaAnalysisDrawing=this.map.getProperties().isAreaAnalysisDrawing||false;if(!isAreaAnalysisDrawing){let mousePoint=e.coordinate;this.initialPoint=mousePoint;let popupHeaderTitle=document.getElementById("popupHeaderTitle");let feature=this.map.forEachFeatureAtPixel(e.pixel,feature=>{return feature;});if(feature){debugger;if(feature.getProperties().features){if(feature.getProperties().features.length>1){const features=feature.getProperties().features;if(this.map.getView().getZoom()>=18){this.popupHeight=350;this.popupWidth=430;this.currentTabComponent=component_ClusterList;this.popupAttributes=features;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="点位列表";this.showPopup();let fontSize=Number(document.getElementsByTagName("html")[0].style.fontSize.split("px")[0]);let popupHeight=this.popupHeight/153.6*fontSize;let popupWidth=this.popupWidth/153.6*fontSize;this.overlayPopup.setPosition(mousePoint);this.overlayPopup.setOffset([-popupWidth/2,-popupHeight]);let pixelPoint=this.map.getPixelFromCoordinate(mousePoint);let newpixelPoint=[pixelPoint[0],pixelPoint[1]-150];let newCenterPoint=this.map.getCoordinateFromPixel(newpixelPoint);// this.map.getView().animate({
 //   center: newCenterPoint,
 //   duration: 800,
 // });
@@ -264465,7 +264549,7 @@ this.overlayPopup.set("popupBS","clusterList");}else{// this.map.getView().anima
 //   zoom: this.map.getView().getZoom() * 2,
 //   duration: 1200,
 // });
-}}else{let properties=feature.getProperties().features[0].getProperties();if(properties){if(properties.isDrawn)return;if(properties.popoup===false){let pixelPoint=null;if(mousePoint){pixelPoint=this.map.getPixelFromCoordinate(mousePoint);}that.$emit("clickPointEvent",properties,pixelPoint);return;}const type=properties.type;const data=properties;if(type){switch(type){case"emergency":this.popupHeight=350;this.popupWidth=560;this.currentTabComponent=EmergencyLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="突发事件";break;case"otherEvents":this.popupHeight=170;this.popupWidth=430;this.currentTabComponent=otherLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="其它事件";break;case"construction":this.popupHeight=200;this.popupWidth=430;this.currentTabComponent=otherLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="养护施工";break;case"tollAbnormal":this.popupHeight=330;this.popupWidth=560;this.currentTabComponent=EmergencyLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="收费站异常";break;case"weatherAbnormal":this.popupHeight=250;this.popupWidth=470;this.currentTabComponent=Weatherevent;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="异常天气";break;case"serviceAreaAbnormal":this.popupHeight=200;this.popupWidth=430;this.currentTabComponent=ServiceAreaAbnormalLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="服务区异常";break;case"aiEvent":this.popupHeight=390;this.popupWidth=570;this.currentTabComponent=AIeventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="AI告警事件";break;case"congestionEvent":this.popupHeight=180;this.popupWidth=560;this.currentTabComponent=CongestionEventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="拥堵事件";break;case"tollStation":this.popupHeight=350;this.popupWidth=330;this.currentTabComponent=TollStationLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="收费站";break;case"serviceArea":this.popupHeight=350;this.popupWidth=330;this.currentTabComponent=ServiceAreaLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="服务区";break;case"trainStation":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=TrainStationLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="客运站";break;case"port":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=PortLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="港口";break;case"majorEvent":this.popupHeight=255;this.popupWidth=330;this.currentTabComponent=MajorEventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="活动地点";break;case"airPort":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=AirportLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="机场";break;case"HSRoadCamera":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=HSRoadCameraLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="高速相机";break;case"SYRoadCamera":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=SYRoadCameraLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="水运相机";break;case"throughCulver":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=ThroughCulvertLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="下穿涵洞";break;case"lonandlatTopile":this.popupHeight=85;this.popupWidth=360;this.currentTabComponent=component_LonlatTopile;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="经纬度转桩号";break;case"latlonPick":this.popupHeight=55;this.popupWidth=360;this.currentTabComponent=component_LatlonPick;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="坐标拾取";break;case"travelPoint":this.popupHeight=500;this.popupWidth=730;this.currentTabComponent=TravelPointLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.name;break;case"inRiverCapacity":this.popupHeight=350;this.popupWidth=420;this.currentTabComponent=InRiverCapacityLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.portName;break;case"inRiverUPCapacity":this.popupHeight=350;this.popupWidth=420;this.currentTabComponent=InRiverUPCapacityLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.portName;break;}this.showPopup();}}else{this.closePopup();}// this.overlayPopup.setPosition(mousePoint);
+}}else{let properties=feature.getProperties().features[0].getProperties();if(properties){if(properties.isDrawn)return;if(properties.popoup===false){let pixelPoint=null;if(mousePoint){pixelPoint=this.map.getPixelFromCoordinate(mousePoint);}that.$emit("clickPointEvent",properties,pixelPoint);return;}const type=properties.type;const data=properties;if(type){switch(type){case"customPoint":this.popupHeight=data.popupHeight-50;this.popupWidth=data.popupWidth-20;this.currentTabComponent=customPointLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.popupTitle;this.zoomInBylatlon([data.longitude,data.latitude],this.map.getView().getZoom());break;case"emergency":this.popupHeight=350;this.popupWidth=560;this.currentTabComponent=EmergencyLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="突发事件";break;case"otherEvents":this.popupHeight=170;this.popupWidth=430;this.currentTabComponent=otherLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="其它事件";break;case"construction":this.popupHeight=200;this.popupWidth=430;this.currentTabComponent=otherLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="养护施工";break;case"tollAbnormal":this.popupHeight=330;this.popupWidth=560;this.currentTabComponent=EmergencyLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="收费站异常";break;case"weatherAbnormal":this.popupHeight=250;this.popupWidth=470;this.currentTabComponent=Weatherevent;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="异常天气";break;case"serviceAreaAbnormal":this.popupHeight=200;this.popupWidth=430;this.currentTabComponent=ServiceAreaAbnormalLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="服务区异常";break;case"aiEvent":this.popupHeight=390;this.popupWidth=570;this.currentTabComponent=AIeventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="AI告警事件";break;case"congestionEvent":this.popupHeight=180;this.popupWidth=560;this.currentTabComponent=CongestionEventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="拥堵事件";break;case"tollStation":this.popupHeight=350;this.popupWidth=330;this.currentTabComponent=TollStationLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="收费站";break;case"serviceArea":this.popupHeight=350;this.popupWidth=330;this.currentTabComponent=ServiceAreaLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="服务区";break;case"trainStation":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=TrainStationLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="客运站";break;case"port":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=PortLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="港口";break;case"majorEvent":this.popupHeight=255;this.popupWidth=330;this.currentTabComponent=MajorEventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="活动地点";break;case"airPort":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=AirportLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="机场";break;case"HSRoadCamera":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=HSRoadCameraLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="高速相机";break;case"SYRoadCamera":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=SYRoadCameraLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="水运相机";break;case"throughCulver":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=ThroughCulvertLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="下穿涵洞";break;case"lonandlatTopile":this.popupHeight=85;this.popupWidth=360;this.currentTabComponent=component_LonlatTopile;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="经纬度转桩号";break;case"latlonPick":this.popupHeight=55;this.popupWidth=360;this.currentTabComponent=component_LatlonPick;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="坐标拾取";break;case"travelPoint":this.popupHeight=500;this.popupWidth=730;this.currentTabComponent=TravelPointLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.name;break;case"inRiverCapacity":this.popupHeight=350;this.popupWidth=420;this.currentTabComponent=InRiverCapacityLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.portName;break;case"inRiverUPCapacity":this.popupHeight=350;this.popupWidth=420;this.currentTabComponent=InRiverUPCapacityLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.portName;break;}this.showPopup();}}else{this.closePopup();}// this.overlayPopup.setPosition(mousePoint);
 // this.overlayPopup.setOffset([
 //   -this.popupWidth / 2,
 //   -this.popupHeight,
@@ -264474,7 +264558,7 @@ let fontSize=Number(document.getElementsByTagName("html")[0].style.fontSize.spli
 //   center: newCenterPoint,
 //   duration: 800,
 // });
-}}else{let properties=feature.getProperties();if(properties){if(properties.isDrawn)return;if(properties.popoup===false){let pixelPoint=null;if(mousePoint){pixelPoint=this.map.getPixelFromCoordinate(mousePoint);}that.$emit("clickPointEvent",properties,pixelPoint);return;}const type=properties.type;const data=properties;if(type){switch(type){case"emergency":this.popupHeight=350;this.popupWidth=560;this.currentTabComponent=EmergencyLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="突发事件";break;case"otherEvents":this.popupHeight=170;this.popupWidth=430;this.currentTabComponent=otherLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="其它事件";break;case"construction":this.popupHeight=200;this.popupWidth=430;this.currentTabComponent=otherLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="养护施工";break;case"tollAbnormal":this.popupHeight=330;this.popupWidth=560;this.currentTabComponent=EmergencyLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="收费站异常";break;case"weatherAbnormal":this.popupHeight=250;this.popupWidth=470;this.currentTabComponent=Weatherevent;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="异常天气";break;case"serviceAreaAbnormal":this.popupHeight=200;this.popupWidth=430;this.currentTabComponent=ServiceAreaAbnormalLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="服务区异常";break;case"aiEvent":this.popupHeight=390;this.popupWidth=570;this.currentTabComponent=AIeventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="AI告警事件";break;case"congestionEvent":this.popupHeight=180;this.popupWidth=560;this.currentTabComponent=CongestionEventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="拥堵事件";break;case"tollStation":this.popupHeight=350;this.popupWidth=330;this.currentTabComponent=TollStationLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="收费站";break;case"serviceArea":this.popupHeight=350;this.popupWidth=330;this.currentTabComponent=ServiceAreaLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="服务区";break;case"trainStation":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=TrainStationLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="客运站";break;case"port":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=PortLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="港口";break;case"majorEvent":this.popupHeight=255;this.popupWidth=330;this.currentTabComponent=MajorEventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="活动地点";break;case"airPort":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=AirportLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="机场";break;case"HSRoadCamera":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=HSRoadCameraLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="高速相机";break;case"SYRoadCamera":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=SYRoadCameraLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="水运相机";break;case"throughCulver":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=ThroughCulvertLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="下穿涵洞";break;case"lonandlatTopile":this.popupHeight=85;this.popupWidth=360;this.currentTabComponent=component_LonlatTopile;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="经纬度转桩号";break;case"latlonPick":this.popupHeight=55;this.popupWidth=360;this.currentTabComponent=component_LatlonPick;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="坐标拾取";break;case"travelPoint":this.popupHeight=500;this.popupWidth=730;this.currentTabComponent=TravelPointLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.name;break;case"inRiverCapacity":this.popupHeight=350;this.popupWidth=420;this.currentTabComponent=InRiverCapacityLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.portName;break;case"inRiverUPCapacity":this.popupHeight=350;this.popupWidth=420;this.currentTabComponent=InRiverUPCapacityLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.portName;break;}this.showPopup();}else{this.closePopup();}}else{this.closePopup();}// this.overlayPopup.setPosition(mousePoint);
+}}else{let properties=feature.getProperties();if(properties){if(properties.isDrawn)return;if(properties.popoup===false){let pixelPoint=null;if(mousePoint){pixelPoint=this.map.getPixelFromCoordinate(mousePoint);}that.$emit("clickPointEvent",properties,pixelPoint);return;}const type=properties.type;const data=properties;if(type){switch(type){case"customPoint":this.popupHeight=data.popupHeight-50;this.popupWidth=data.popupWidth-20;this.currentTabComponent=customPointLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.popupTitle;this.zoomInBylatlon([data.longitude,data.latitude],this.map.getView().getZoom());break;case"emergency":this.popupHeight=350;this.popupWidth=560;this.currentTabComponent=EmergencyLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="突发事件";break;case"otherEvents":this.popupHeight=170;this.popupWidth=430;this.currentTabComponent=otherLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="其它事件";break;case"construction":this.popupHeight=200;this.popupWidth=430;this.currentTabComponent=otherLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="养护施工";break;case"tollAbnormal":this.popupHeight=330;this.popupWidth=560;this.currentTabComponent=EmergencyLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="收费站异常";break;case"weatherAbnormal":this.popupHeight=250;this.popupWidth=470;this.currentTabComponent=Weatherevent;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="异常天气";break;case"serviceAreaAbnormal":this.popupHeight=200;this.popupWidth=430;this.currentTabComponent=ServiceAreaAbnormalLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="服务区异常";break;case"aiEvent":this.popupHeight=390;this.popupWidth=570;this.currentTabComponent=AIeventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="AI告警事件";break;case"congestionEvent":this.popupHeight=180;this.popupWidth=560;this.currentTabComponent=CongestionEventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="拥堵事件";break;case"tollStation":this.popupHeight=350;this.popupWidth=330;this.currentTabComponent=TollStationLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="收费站";break;case"serviceArea":this.popupHeight=350;this.popupWidth=330;this.currentTabComponent=ServiceAreaLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="服务区";break;case"trainStation":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=TrainStationLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="客运站";break;case"port":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=PortLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="港口";break;case"majorEvent":this.popupHeight=255;this.popupWidth=330;this.currentTabComponent=MajorEventLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="活动地点";break;case"airPort":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=AirportLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="机场";break;case"HSRoadCamera":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=HSRoadCameraLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="高速相机";break;case"SYRoadCamera":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=SYRoadCameraLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="水运相机";break;case"throughCulver":this.popupHeight=315;this.popupWidth=330;this.currentTabComponent=ThroughCulvertLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="下穿涵洞";break;case"lonandlatTopile":this.popupHeight=85;this.popupWidth=360;this.currentTabComponent=component_LonlatTopile;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="经纬度转桩号";break;case"latlonPick":this.popupHeight=55;this.popupWidth=360;this.currentTabComponent=component_LatlonPick;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML="坐标拾取";break;case"travelPoint":this.popupHeight=500;this.popupWidth=730;this.currentTabComponent=TravelPointLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.name;break;case"inRiverCapacity":this.popupHeight=350;this.popupWidth=420;this.currentTabComponent=InRiverCapacityLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.portName;break;case"inRiverUPCapacity":this.popupHeight=350;this.popupWidth=420;this.currentTabComponent=InRiverUPCapacityLayer;this.popupAttributes=data;popupHeaderTitle.innerHTML="";popupHeaderTitle.innerHTML=data.otherInfo.portName;break;}this.showPopup();}else{this.closePopup();}}else{this.closePopup();}// this.overlayPopup.setPosition(mousePoint);
 // this.overlayPopup.setOffset([
 //   -this.popupWidth / 2,
 //   -this.popupHeight - 20,
@@ -266137,6 +266221,7 @@ var CityAreaLayer_component = normalizeComponent(
 
 
 
+ // 自定义打点
  // 交通事件--突发事件
  // 交通事件--拥堵事件
  // 交通事件--服务区异常
@@ -266236,6 +266321,15 @@ var CityAreaLayer_component = normalizeComponent(
       let popupHeaderTitle = document.getElementById("popupHeaderTitle");
       this.showPopup();
       switch (LayerType) {
+        case "customPoint":
+          this.popupHeight = data.popupHeight - 50;
+          this.popupWidth = data.popupWidth - 20;
+          this.currentTabComponent = customPointLayer;
+          this.popupAttributes = data;
+          popupHeaderTitle.innerHTML = "";
+          popupHeaderTitle.innerHTML = data.title;
+          this.zoomInBylatlon([data.longitude, data.latitude], this.map.getView().getZoom());
+          break;
         case "emergency":
           this.popupHeight = 350;
           this.popupWidth = 560;
@@ -266559,6 +266653,10 @@ var CityAreaLayer_component = normalizeComponent(
         feature.set("type", data.type);
         feature.set("iconUrl", data.iconUrl);
         feature.set("popoup", data.popoup);
+        feature.set("popupTitle", data.popupTitle);
+        feature.set("popupUrl", data.popupUrl);
+        feature.set("popupWidth", data.popupWidth);
+        feature.set("popupHeight", data.popupHeight);
         feature.set("otherInfo", data.otherInfo);
         feature.set("longitude", data.longitude);
         feature.set("latitude", data.latitude);
@@ -266740,7 +266838,8 @@ var CityAreaLayer_component = normalizeComponent(
           stroke: new Stroke["default"]({
             color: lineItem.color,
             width: lineItem.width,
-            lineDash: lineItem.lineDash ? [10, 10] : undefined
+            lineDash: lineItem.lineDash ? [10, 10] : undefined,
+            lineCap: lineItem.lineCap || "butt"
           })
         }));
         lineFeature.set("popoup", lineItem.popoup);
@@ -266769,7 +266868,7 @@ var CityAreaLayer_component = normalizeComponent(
       });
       this.map.addLayer(this.lineLayer);
     },
-    // 高亮指定的线
+    // 高亮指定的线（支持单条线或多条线）
     highlightLine(layerId, lineData, highlightColor = "#54f6ffff", highlightWidth = null) {
       // 首先清除之前的高亮
       this.clearLineHighlight(layerId);
@@ -266780,27 +266879,125 @@ var CityAreaLayer_component = normalizeComponent(
       // 查找对应的线要素
       const source = lineLayer.getSource();
       const features = source.getFeatures();
-      features.forEach(feature => {
-        const lineItemData = feature.get("lineItemData");
-        // 根据线数据的唯一标识或坐标匹配
-        if (this.isLineDataMatch(lineItemData, lineData)) {
-          // 应用高亮样式
-          const lineWidth = highlightWidth || lineItemData.originalWidth + 3;
-          feature.setStyle(new Style["default"]({
-            stroke: new Stroke["default"]({
-              color: highlightColor,
-              // 使用自定义高亮颜色
-              width: lineWidth,
-              // 使用自定义或默认高亮线宽
-              lineDash: lineItemData.lineDash ? [10, 10] : undefined
-            })
-          }));
-          // 保存高亮状态
-          feature.set("isHighlighted", true);
-          // 保存当前高亮样式信息
-          feature.set("highlightColor", highlightColor);
-          feature.set("highlightWidth", lineWidth);
-        }
+
+      // 将线数据转换为数组格式，以便统一处理
+      const lineDataArray = Array.isArray(lineData) ? lineData : [lineData];
+
+      // 遍历所有线数据
+      lineDataArray.forEach(currentLineData => {
+        // 遍历所有线要素
+        features.forEach(feature => {
+          const lineItemData = feature.get("lineItemData");
+          // 根据线数据的唯一标识或坐标匹配
+          if (this.isLineDataMatch(lineItemData, currentLineData)) {
+            // 获取当前要素的样式
+            let currentStyle = feature.getStyle();
+
+            // 如果没有样式，使用默认样式（保持现有行为）
+            if (!currentStyle) {
+              // 应用默认高亮样式
+              const lineWidth = highlightWidth || lineItemData.originalWidth + 3;
+              feature.setStyle(new Style["default"]({
+                stroke: new Stroke["default"]({
+                  color: highlightColor,
+                  // 使用自定义高亮颜色
+                  width: lineWidth,
+                  // 使用自定义或默认高亮线宽
+                  lineDash: lineItemData.lineDash ? [10, 10] : undefined
+                })
+              }));
+            } else {
+              // 复制当前样式并只修改线宽
+              let newStyle;
+
+              // 处理多样式情况
+              if (Array.isArray(currentStyle)) {
+                // 找到包含stroke的样式
+                const strokeStyleIndex = currentStyle.findIndex(style => style.getStroke() !== null);
+                if (strokeStyleIndex !== -1) {
+                  // 复制样式数组
+                  newStyle = [...currentStyle];
+                  // 复制当前的stroke样式
+                  const currentStroke = currentStyle[strokeStyleIndex].getStroke();
+                  // 计算新的线宽
+                  const lineWidth = highlightWidth || lineItemData.originalWidth + 3;
+
+                  // 创建新的stroke对象，保持原有颜色和其他属性，只修改宽度
+                  newStyle[strokeStyleIndex] = new Style["default"]({
+                    stroke: new Stroke["default"]({
+                      color: currentStroke.getColor(),
+                      // 保持原有颜色
+                      width: lineWidth,
+                      // 只修改线宽
+                      lineDash: currentStroke.getLineDash(),
+                      // 保持原有虚线样式
+                      lineCap: currentStroke.getLineCap(),
+                      // 保持原有线帽
+                      lineJoin: currentStroke.getLineJoin(),
+                      // 保持原有线连接
+                      miterLimit: currentStroke.getMiterLimit() // 保持原有斜接限制
+                    })
+                  });
+                } else {
+                  // 如果没有找到stroke样式，使用默认行为
+                  const lineWidth = highlightWidth || lineItemData.originalWidth + 3;
+                  feature.setStyle(new Style["default"]({
+                    stroke: new Stroke["default"]({
+                      color: highlightColor,
+                      width: lineWidth,
+                      lineDash: lineItemData.lineDash ? [10, 10] : undefined
+                    })
+                  }));
+                }
+              } else {
+                // 单样式情况
+                const currentStroke = currentStyle.getStroke();
+                if (currentStroke) {
+                  // 计算新的线宽
+                  const lineWidth = highlightWidth || lineItemData.originalWidth + 3;
+
+                  // 创建新的样式，保持原有颜色和其他属性，只修改宽度
+                  newStyle = new Style["default"]({
+                    stroke: new Stroke["default"]({
+                      color: currentStroke.getColor(),
+                      // 保持原有颜色
+                      width: lineWidth,
+                      // 只修改线宽
+                      lineDash: currentStroke.getLineDash(),
+                      // 保持原有虚线样式
+                      lineCap: currentStroke.getLineCap(),
+                      // 保持原有线帽
+                      lineJoin: currentStroke.getLineJoin(),
+                      // 保持原有线连接
+                      miterLimit: currentStroke.getMiterLimit() // 保持原有斜接限制
+                    })
+                  });
+                } else {
+                  // 如果没有stroke样式，使用默认行为
+                  const lineWidth = highlightWidth || lineItemData.originalWidth + 3;
+                  feature.setStyle(new Style["default"]({
+                    stroke: new Stroke["default"]({
+                      color: highlightColor,
+                      width: lineWidth,
+                      lineDash: lineItemData.lineDash ? [10, 10] : undefined
+                    })
+                  }));
+                }
+              }
+
+              // 应用新样式
+              if (newStyle) {
+                feature.setStyle(newStyle);
+              }
+            }
+
+            // 保存高亮状态
+            feature.set("isHighlighted", true);
+            // 保存当前高亮样式信息
+            feature.set("highlightColor", highlightColor);
+            feature.set("highlightWidth", highlightWidth || lineItemData.originalWidth + 3);
+          }
+        });
       });
     },
     // 清除线图层的所有高亮
@@ -267163,6 +267360,10 @@ var CityAreaLayer_component = normalizeComponent(
         feature.set("type", data.type);
         feature.set("iconUrl", data.iconUrl);
         feature.set("popoup", data.popoup);
+        feature.set("popupTitle", data.popupTitle);
+        feature.set("popupUrl", data.popupUrl);
+        feature.set("popupWidth", data.popupWidth);
+        feature.set("popupHeight", data.popupHeight);
         feature.set("otherInfo", data.otherInfo);
         feature.set("longitude", data.longitude);
         feature.set("latitude", data.latitude);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gis-map-universal",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "GIS通用组件",
   "main": "gismap.umd.js",
   "private": false,