Merge remote-tracking branch 'origin/visu_resources_01_siping_2.5d' into visu_resources_01_siping_2.5d

# Conflicts:
#	src/api/forest.js

src/api/components/supermap.js

@@ -59,5 +59,17 @@ export const iconList = {
   'sj-icon-map-centerdata_atmospheric_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_atmospheric_sensor.png'),//大气传感器
   'sj-icon-map-centerdata_water_pressure_sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata_water_pressure_sensor.png'),//水压传感器
 
-
+  //云图图标
+//   'sj-icon-map-centerdata-t-forest-waterintake': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-waterintake.png'),//取水口
+//   'sj-icon-map-centerdata-t-forest-watercrane': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-watercrane.png'),//水鹤
+  'sj-icon-map-centerdata-t-forest-firehydrant@1': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@1.png'),//地上消防栓
+  'sj-icon-map-centerdata-t-forest-firehydrant@2': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@2.png'),//地下消防栓
+  'sj-icon-map-centerdata-t-forest-firehydrant@3': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-forest-firehydrant@3.png'),//室内消防栓
+  'sj-icon-map-centerdata-t-firecontrol-fire-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-force.png'),//消防力量
+  'sj-icon-map-centerdata-t-firecontrol-fire-key-places': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-key-places.png'),//重点场所
+  'sj-icon-map-centerdata-t-firecontrol-fire-pressure-sensor': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fire-pressure-sensor.png'),//压力传感器
+  'sj-icon-map-centerdata-t-firecontrol-basic-linkage-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-basic-linkage-force.png'),//基本联动力量
+  'sj-icon-map-centerdata-t-firecontrol-other-linkage-force': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-other-linkage-force.png'),//其他消防力量
+  'sj-icon-map-centerdata-t-firecontrol-foam-liquid': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-foam-liquid.png'),//泡沫液
+  'sj-icon-map-centerdata-t-firecontrol-fulltime-station': require('@/assets/icons/sj-icon-map/centerdata/sj-icon-map-centerdata-t-firecontrol-fulltime-station.png'),//专职站
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,230 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "12770896",
+      "name": "垃圾桶",
+      "font_class": "centerdata-t-hydraulic-garbage-station",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "35584502",
+      "name": "河道蓝线资源",
+      "font_class": "centerdata-t-hydraulic-channel-blueline",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "2116699",
+      "name": "河流面",
+      "font_class": "centerdata-t-hydraulic-river",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "2777434",
+      "name": "桥梁工程",
+      "font_class": "centerdata-t-hydraulic-wade-bridge-culvert",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "4274470",
+      "name": "闸门信息",
+      "font_class": "centerdata-t-hydraulic-water-gate",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "9400975",
+      "name": "推土机",
+      "font_class": "centerdata-t-hydraulic-battlefield",
+      "unicode": "e703",
+      "unicode_decimal": 59139
+    },
+    {
+      "icon_id": "9466856",
+      "name": "河长制河段",
+      "font_class": "centerdata-t-hydraulic-reach",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "11858519",
+      "name": "排污口",
+      "font_class": "centerdata-t-hydraulic-outlet-sewage",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "13956683",
+      "name": "水库",
+      "font_class": "centerdata-t-hydraulic-reservoir",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "6850817",
+      "name": "三角警示",
+      "font_class": "centerdata-t-traffic-warning-sign",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "11858521",
+      "name": "桥梁",
+      "font_class": "centerdata-t-traffic-bridge",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "35253155",
+      "name": "-_新建斜交涵洞",
+      "font_class": "centerdata-t-traffic-culvert",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "1287678",
+      "name": "企业认证",
+      "font_class": "centerdata-t-emergency-enterprise",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "11441202",
+      "name": "仓库库存",
+      "font_class": "centerdata-t-emergency-warehouse",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "26800916",
+      "name": "防汛抗旱应急队伍",
+      "font_class": "centerdata-t-emergency-team",
+      "unicode": "e7df",
+      "unicode_decimal": 59359
+    },
+    {
+      "icon_id": "35532604",
+      "name": "水鹤",
+      "font_class": "centerdata-t-forest-watercrane",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "35530153",
+      "name": "储水池",
+      "font_class": "chushuichi",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "35530154",
+      "name": "水井",
+      "font_class": "shuijing",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "35530155",
+      "name": "室内消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-3",
+      "unicode": "e640",
+      "unicode_decimal": 58944
+    },
+    {
+      "icon_id": "35530156",
+      "name": "污水池",
+      "font_class": "wushuichi",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "35530157",
+      "name": "消防水池",
+      "font_class": "xiaofangshuichi",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "35530158",
+      "name": "河流",
+      "font_class": "heliu",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "35530159",
+      "name": "地上消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-1",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "35530160",
+      "name": "湖泊",
+      "font_class": "hubo",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "35530161",
+      "name": "消防水鹤",
+      "font_class": "xiaofangshuihe",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "35530162",
+      "name": "地下消火栓",
+      "font_class": "centerdata-t-forest-firehydrant-2",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "35530163",
+      "name": "消火栓井",
+      "font_class": "xiaohuoshuanjing",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "2761284",
+      "name": "水质监测站",
+      "font_class": "shuizhijiancezhan",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "7335552",
+      "name": "水压",
+      "font_class": "shuiya",
+      "unicode": "eb33",
+      "unicode_decimal": 60211
+    },
+    {
+      "icon_id": "11647823",
+      "name": "多层土壤墒情",
+      "font_class": "duocengturangshangqing",
+      "unicode": "eb61",
+      "unicode_decimal": 60257
+    },
+    {
+      "icon_id": "26805914",
+      "name": "水文站",
+      "font_class": "shuiwenzhan",
+      "unicode": "e7e4",
+      "unicode_decimal": 59364
+    },
+    {
+      "icon_id": "26805955",
+      "name": "电子水尺",
+      "font_class": "dianzishuichi",
+      "unicode": "e7e5",
+      "unicode_decimal": 59365
+    },
+    {
       "icon_id": "357804",
       "name": "冶金矿产",
       "font_class": "centerdata-t-resources-deposit",
@@ -85,7 +309,7 @@
     {
       "icon_id": "21492584",
       "name": "5饲料",
-      "font_class": "farmenterprise_2",
+      "font_class": "farmenterprise_3",
       "unicode": "e67a",
       "unicode_decimal": 59002
     },
@@ -120,7 +344,7 @@
     {
       "icon_id": "11831137",
       "name": "菜刀",
-      "font_class": "farmenterprise_3",
+      "font_class": "farmenterprise_2",
       "unicode": "e731",
       "unicode_decimal": 59185
     },
@@ -519,7 +743,7 @@
     {
       "icon_id": "30787139",
       "name": "水鹤",
-      "font_class": "centerdata-t-forest-watercrane",
+      "font_class": "watercrane",
       "unicode": "e616",
       "unicode_decimal": 58902
     },

src/components/supermap-2.5d.vue

@@ -172,23 +172,23 @@ export default {
         // let shuixi_name_url = that.superMapRootUrl+'/3D-shuixi_Name/rest/realspace';
         // that.shuixi_name = that.scene.open(shuixi_name_url);
 
-        //9.添加乡镇界
-        let layer_xiangzhenjie = that.viewer.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
-          url : that.superMapRootUrl+"/map-SIPING/rest/maps/XiangZhenJie",
-        }));
-
-        //10.添加县界
+        //9.添加县界和乡镇界
         let layer_xianjie = that.viewer.imageryLayers.addImageryProvider(new Cesium.SuperMapImageryProvider({
-          url : that.superMapRootUrl+"/map-SIPING/rest/maps/XianJie",
+          url : that.superMapRootUrl+"/map-SIPING/rest/maps/XianJie_XiangZhenJie",
         }));
 
-        //11.添加县界名称 此处要先添加县界名称 否则县界名会不显示
-        let layer_xianjie_name = that.superMapRootUrl+'/3D-XianJie_Name/rest/realspace';
-        that.scene.open(layer_xianjie_name);
-
-        //12.添加乡镇界名称
-        let layer_xiangzhenjie_name = that.superMapRootUrl+'/3D-XiangZhenJie_Name/rest/realspace';
+        //10.添加区县乡镇村名称
+        let layer_xiangzhenjie_name = that.superMapRootUrl+'/3D-Name_he/rest/realspace';
         that.scene.open(layer_xiangzhenjie_name);
+        that.road_name.then(function (layers) {
+          let xianJie_textLayer = that.scene.layers.find('XianJie@SiPing#1');//区县文字图层
+          let xiangZhenJie_textLayer = that.scene.layers.find('XiangZhenJie@SiPing#2');//乡镇文字图层
+          let cun_textLayer = that.scene.layers.find('Cun@SiPing#1');//村文字图层
+          //关闭避让
+          xianJie_textLayer.isOverlapDisplayed = true;
+          xiangZhenJie_textLayer.isOverlapDisplayed = true;
+          cun_textLayer.isOverlapDisplayed = true;
+        });
 
       }, 3000);
 
@@ -227,6 +227,85 @@ export default {
       that.createRightClickDescription();
     },
     /**
+     * 地图落点
+     */
+    setMarkers(makerList){
+      let that = this;
+      that.handler = new Cesium.ScreenSpaceEventHandler(this.viewer.scene.canvas);
+      clearInterval(that.aac);
+      for (let i in makerList) {
+        let longitude = makerList[i].lng;
+        let latitude = makerList[i].lat;
+        that.viewer.entities.add({
+          name:"",
+          position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
+          billboard: {
+            image: iconList[makerList[i].icon],
+            width: 48,
+            height: 48,
+            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+            disableDepthTestDistance:Number.POSITIVE_INFINITY
+          },
+          description: makerList[i].bindPopupHtml,
+          click: makerList[i].click,
+          parameter: makerList[i].parameter,
+        });
+      }
+      // const carmodel = [];
+      // carmodel[0] = that.viewer.entities.add({
+      //   name:"",
+      //   position: Cesium.Cartesian3.fromDegrees(makerList[0].lng, makerList[0].lat),
+      //   billboard: {
+      //     image: iconList[makerList[0].icon],
+      //     width: 48,
+      //     height: 48,
+      //     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+      //     disableDepthTestDistance:Number.POSITIVE_INFINITY
+      //   },
+      //   description: makerList[0].bindPopupHtml,
+      //   click: makerList[0].click,
+      //   parameter: makerList[0].parameter,
+      // });
+      // carmodel[0].ellipse = {
+      //   semiMinorAxis: makerList[0].radius
+      //   semiMajorAxis: makerList[0].radius
+      //   height: 0.0,
+      //   material: Cesium.Color.RED.withAlpha(e),
+      //   outline: true,
+      //   outlineColor: Cesium.Color.BLUE.withAlpha(0.5),
+      //   outlineWidth: 2,
+      //   heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+      // }
+      // carmodel[1] = that.viewer.entities.add({
+      //   name:"",
+      //   position: Cesium.Cartesian3.fromDegrees(makerList[1].lng, makerList[1].lat),
+      //   billboard: {
+      //     image: iconList[makerList[1].icon],
+      //     width: 48,
+      //     height: 48,
+      //     heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+      //     disableDepthTestDistance:Number.POSITIVE_INFINITY
+      //   },
+      //   description: makerList[1].bindPopupHtml,
+      //   click: makerList[1].click,
+      //   parameter: makerList[1].parameter,
+      // });
+      // carmodel[0].ellipse = {
+      //   semiMinorAxis: makerList[0].radius
+      //   semiMajorAxis: makerList[0].radius
+      //   height: 0.0,
+      //   material: Cesium.Color.RED.withAlpha(e),
+      //   outline: true,
+      //   outlineColor: Cesium.Color.BLUE.withAlpha(0.5),
+      //   outlineWidth: 2,
+      //   heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
+      // }
+
+      that.viewer.scene.globe.depthTestAgainstTerrain=false;
+      that.createLeftClickDescription();
+      that.createRightClickDescription();
+    },
+    /**
      *鼠标左击事件是原来的气泡
      */
     createLeftClickDescription() {

src/router/index.js

@@ -31,7 +31,7 @@ import Layout from '@/layout'
 // 公共路由（可视化首页头部链接）
 export const constantRoutes = [{
 		path: '/',
-		redirect: 'datacenter',
+		redirect: 'forest',
 	},
 	{
 		//林业中心
@@ -91,7 +91,7 @@ export const constantRoutes = [{
 // 公共路由
 export const constantRoutesNew = [{
 		path: '/',
-		redirect: 'datacenter',
+		redirect: 'forest',
 	},
 	{
 		//林业中心

src/utils/request.js

@@ -55,11 +55,12 @@ service.interceptors.request.use(config => {
       const s_url = sessionObj.url;                  // 请求地址
       const s_data = sessionObj.data;                // 请求数据
       const s_time = sessionObj.time;                // 请求时间
-      const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
+      const interval = 500;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
+        //Promise.reject(new Error(message))
+        return Promise.reject()
       } else {
         cache.session.setJSON('sessionObj', requestObj)
       }
@@ -105,12 +106,14 @@ service.interceptors.response.use(res => {
         message: msg,
         type: 'error'
       })
-      return Promise.reject(new Error(msg))
+      //Promise.reject(new Error(msg))
+      return Promise.reject()
     } else if (code !== 200) {
       Notification.error({
         title: msg
       })
-      return Promise.reject('error')
+      //Promise.reject('error')
+      return Promise.reject()
     } else {
       return res.data
     }
@@ -133,7 +136,8 @@ service.interceptors.response.use(res => {
       type: 'error',
       duration: 5 * 1000
     })
-    return Promise.reject(error)
+    //Promise.reject(error)
+    return Promise.reject()
   }
 )
 

src/views/eventdetailsdialog.vue

@@ -37,7 +37,7 @@
                       <div class="i-list-con">
                         <div class="d-l-con-icon" style="flex-direction:row;flex-wrap: nowrap;">
                           <div class="icon-con" style="width: fit-content !important;"
-                               v-for="(item,index) in resourcesList" @click="listResourceByWz(item.type)">
+                               v-for="(item,index) in resourcesList" @click="fireControlViewPoint(item.type)">
                             <div class="iconfont icon icon-normal" :class="item.icon"></div>
                             <div class="icon-text">
                               <h5>{{ item.resourceName }}</h5>
@@ -1076,6 +1076,8 @@ import TcPlayer from '@/components/TcPlayer' //视频预览
 import TVWall from '@/components/TVWall.vue' //电视墙弹窗
 import findUserByDept from '@/views/findUserByDept' //责任人选择弹框
 import {
+  fireControlViewPoint,
+  fireControlViewList,
   getEventDetail,
   sendEventLog,
   listSJfl,
@@ -1391,7 +1393,47 @@ export default {
     this.ws = DHWsInstance
     /** ----------------------------------摄像头预览结束------------------------------------- */
   },
+  mounted() {
+    // 获取消防左侧菜单列表
+    this.fireControlViewList();
+  },
   methods: {
+    // 获取消防左侧菜单列表
+    fireControlViewList() {
+      this.resourcesList = [];
+      let _this = this;
+      // {
+      //   resourceName: '取水口',
+      //     type: 'qsk',
+      //   count: '1',
+      //   icon: 'sj-icon-waterintake'
+      // },
+      fireControlViewList().then(function (res) {
+        // _this.resourcesList = res.data
+        //截取data.resourceTable字段中“_”分隔符最后一个作为关键字,重新拼接成前端需要的图标:class,格式sj-icon-xxxx,将其set回原数组
+        res.data.forEach(function (data, index) {
+          let obj = {};
+          let icon ='sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-").replaceAll("@", "-");
+          let resourceName = data.name.replaceAll("(个)", "");
+          obj.resourceName = resourceName;
+          obj.type = data.type;
+          obj.count = data.num;
+          obj.icon = icon;
+          if(resourceName != "重点场所"
+            && resourceName != "基本联动力量"
+            && resourceName != "其他联动力量"){
+            _this.resourcesList.push(obj);
+          }
+          console.log("icon_" + (index + 1) + "=", icon);
+        })
+        _this.resourcesList.push({
+          resourceName: '摄像头',
+          type: 'sxt',
+          count: '1',
+          icon: 'sj-icon-jkzx'
+        })
+      })
+    },
     /************************************责任制-开始****************************************/
     //初始化责任制数据列表
     initDutysystemTableData(){
@@ -1567,6 +1609,62 @@ export default {
         })
       }
     },
+    fireControlViewPoint(type) {
+      // alert(type)
+      if (this.resourcesListCheck.indexOf(type) > -1) {
+        this.resourcesListCheck.splice(this.resourcesListCheck.indexOf(type), 1)
+        setTimeout(() => {
+          this.$refs.supermapDialog.clearMByType(type)
+        }, 1000)
+      } else {
+        // 消防资源落点
+        let param = { longitude: this.longitude, latitude: this.latitude, type: type, radius: this.radius }
+        if (type != 'sxt') {
+          fireControlViewPoint(type).then(res => {
+            if (res.data != null && res.data.pointList.length > 0) {
+              this.resourcesListCheck.push(type)
+              var markersList = []
+              for (let i = 0; i < res.data.pointList.length; i++) {
+                let markersMap = {
+                  lng: 124.59,
+                  lat: 43.02,
+                  icon: 'marker',
+                  bindPopupHtml: '',
+                  click: '',
+                  parameter: '',
+                  keepBindPopup: false,
+                  isAggregation: true
+                }
+                if (res.data.pointList.length > 50) {
+                  markersMap.isAggregation = true
+                }
+                // centerdata_t_firecontrol_basic_linkage_force
+                // sj-icon-map-centerdata-t-firecontrol-basic-linkage-force
+                markersMap.icon = 'sj-icon-map-' + type.replaceAll("_", "-");
+                // alert(res.data.pointList[i].longitude)
+                markersMap.lng = res.data.pointList[i].longitude;
+                markersMap.lat = res.data.pointList[i].latitude;
+                markersMap.bindPopupHtml = '<div class="map-tip">' +
+                  '<span>' +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  '                  <h4>资源名称：' + res.data.pointList[i].name + '</h4>' +
+                  '                </div>' +
+                  '                </div>' +
+                  '                </span>' +
+                  '</div>'
+                markersList.push(markersMap)
+              }
+              setTimeout(() => {
+                this.$refs.supermapDialog.setMarkersByType(markersList, type)
+              }, 1000)
+            }
+          })
+        }else {
+          this.listResourceByWz(type);
+        }
+      }
+    },
     listResourceByWz(type) {
       if (this.resourcesListCheck.indexOf(type) > -1) {
         this.resourcesListCheck.splice(this.resourcesListCheck.indexOf(type), 1)
@@ -1613,8 +1711,8 @@ export default {
                 if (res.data[i].cameraCode != null) {
                   markersMap.click = 'preview'
                   // markersMap.parameter = res.data[i].cameraCode
-                  markersMap.parameter = {code:res.data.data[i].cameraCode,
-                    type:res.data.data[i].cameraFactory}
+                  markersMap.parameter = {code:res.data[i].cameraCode,
+                    type:res.data[i].cameraFactory?res.data[i].cameraFactory:1}
                 }
               }
               markersMap.lng = res.data[i].longitude