超图

zhsq_qk-admin/src/main/java/zhsq_qk/web/controller/system/SysConfigController.java

@@ -124,7 +124,7 @@ public class SysConfigController extends BaseController {
     @Log(title = "获取超图服务信息", businessType = BusinessType.OTHER)
     @GetMapping("/getSuperMap")
     public AjaxResult getSuperMap() {
-        List<String> keys = Arrays.asList("superMapIServer","superMapIServerJilinshengAndQikaiMap", "superMapIServerJiedaoshequMap", "superMapIServerQiKaiQuMapCenterPoint", "superMapIServerJiedaoshequData");
+        List<String> keys = Arrays.asList("superMapIServer","superMapIServerJilinshengAndQikaiMap", "superMapIServerJiedaoshequMap", "superMapIServerQiKaiQuMapCenterPoint", "superMapIServerJiedaoshequData","superMapIServerJilinshengYingxaingAndQikaiMap");
         Map<String, String> resultMap = new HashMap<>();
         for (String key : keys) {
             resultMap.put(key, configService.selectConfigByKey(key));

zhsq_qk-ui/src/api/components/supermap.js

@@ -18,23 +18,16 @@ export function listForMark(query) {
 }
 
 export const iconList={
-  "marker":require('@/assets/images/cameraType/marker.png'),
-  "bigHorn":require('@/assets/images/cameraType/big-horn.png'),
-  "camera":require('@/assets/images/cameraType/camera.png'),
-  "cameraNot":require('@/assets/images/cameraType/camera-not.png'),
-  "notOnline":require('@/assets/images/cameraType/not-online.png'),
-  "sensor":require('@/assets/images/cameraType/sensor.png'),
+  "lmjs":require('@/assets/images/cameraType/lmjs.png'),
+  "xqjs":require('@/assets/images/cameraType/xqjs.png'),
+  "yy":require('@/assets/images/cameraType/yy.png'),
 }
 
 
 export function getIcon (state) {
   switch (state) {
-    case "1" : return iconList.marker;break;
-    case "2" : return iconList.bigHorn;break;
-    case "3" : return iconList.camera;break;
-    case "4" : return iconList.cameraNot;break;
-    case "5" : return iconList.notOnline;break;
-    case "6" : return iconList.sensor;break;
-    default : return iconList.camera;
+    case "1" : return iconList.lmjs;break;
+    case "2" : return iconList.xqjs;break;
+    case "3" : return iconList.yy;break;
   }
 }

zhsq_qk-ui/src/views/fusion/sprh.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
     <div class="map">
-      <supermap ref="supermap" style="height: 100%;width: 100%;position: absolute;z-index: 0;"></supermap>
+      <supermap ref="supermap" style="height: 100%;width: 100%;position: absolute;z-index: 0;"
+                :yxtSltProps="sltProps"></supermap>
     </div>
     <!-- 阴影背景 -->
     <div class="bj_left"><img src="@/assets/images/sprhbj-left.png"/></div>
@@ -10,6 +11,8 @@
     <!--头部开始-->
     <div class="header">
       <h1>城市运行一网统管指挥中心</h1>
+      <button @click="sltHandle" style="margin-left: 1200px">矢量图</button>
+      <button @click="yxtHandle">影像图</button>
     </div>
     <!--头部结束-->
     <!--左侧开始-->
@@ -124,10 +127,10 @@
           <div class="nav-li-right">
             <span>营商环境</span>
           </div>
-          <div class="nav-li-right"  @click="handleNavigation('yshj')">
+          <div class="nav-li-right" @click="handleNavigation('yshj')">
             <span>政务运行</span>
           </div>
-          <div class="nav-li-right on"  @click="handleNavigation('sprh')">
+          <div class="nav-li-right on" @click="handleNavigation('sprh')">
             <span>安全应急</span>
           </div>
           <div class="nav-li-right">
@@ -153,13 +156,14 @@ import supermap from "@/views/supermap/supermap";
 
 export default {
   name: "sprh",
-  components:{
+  components: {
     supermap
   },
   data() {
     return {
       dropdownVisible: false,
-      cameras: []
+      cameras: [],
+      sltProps: null
     };
     // 可根据实际情况添加更多设备列表
   },
@@ -173,11 +177,17 @@ export default {
   },
 
   methods: {
+    sltHandle() {
+      this.$refs.supermap.getSupermap(null,null,null,"slt",null,null)
+    },
+    yxtHandle() {
+      this.$refs.supermap.getSupermap(null,null,null,"yxt",null,null)
+    },
     handleNavigation(route) {
-      this.$router.push({ path: route });
+      this.$router.push({path: route});
     },
     homePage(route) {
-      this.$router.push({ path: route });
+      this.$router.push({path: route});
     },
     cameraList() {
       getCameraList().then(response => {

zhsq_qk-ui/src/views/supermap/supermap.vue

@@ -19,6 +19,7 @@ export default {
       layerId: "",
       zoom: "",
       iServerJieDaoSheQuMap: "",
+      iServerQkYingxiangtuMap: "",
       iServerJilinshengAndQikaiMap: "",
       datasourceName: "",
       datasetName: "",
@@ -31,6 +32,7 @@ export default {
       dataUrl: "",
       workspace_qk: "",
       workspace_jdsq: "",
+      workspace_qkyxt: "",
       map_jilinShiLiang: "",
       map_qikaiYingXiang: "",
       //选择用到的
@@ -42,9 +44,9 @@ export default {
       // 社区集合
       sqOptions: null,
       // 影像图/矢量图
-      yxtSlt: "yxt",
+      yxtSlt: null,
       // 人房户/事件
-      rfhSj: "rfh",
+      rfhSj: null,
       // 年份
       year: null,
       //事件详情页是否显示
@@ -79,6 +81,8 @@ export default {
       this.sqOptions = sqOptions;
       this.jieDao = jieDao;
       this.sheQu = sheQu;
+      this.yxtSlt = yxtSlt;
+      this.rfhSj = rfhSj;
       this.year = year;
       this.mapId = "";
       this.layers = [];
@@ -94,27 +98,40 @@ export default {
         this.zoom = response.data.zoom;
         this.iServerJilinshengAndQikaiMap = response.data.superMapIServerJilinshengAndQikaiMap;
         this.iServerJieDaoSheQuMap = response.data.superMapIServerJiedaoshequMap;
+        this.iServerQkYingxiangtuMap = response.data.superMapIServerJilinshengYingxaingAndQikaiMap;
         this.dataUrl = response.data.superMapIServerJiedaoshequMap;
         this.url = response.data.superMapIServerJiedaoshequMap;
         this.workspace_qk = this.iServerJilinshengAndQikaiMap;//省矢量及区影像，固定加载。
         this.workspace_jdsq = this.iServerJieDaoSheQuMap;//街道社区的地图服务路径
+        this.workspace_qkyxt = this.iServerQkYingxiangtuMap;//汽开区影像图
         this.map_jilinShiLiang = window.L.supermap.tiledMapLayer(this.workspace_qk, {
           noWrap: true
         });
-        // this.map_qikaiYingXiang = window.L.supermap.tiledMapLayer(this.workspace_qk + '/经开影像 ', {
-        //   noWrap: true
-        // });
+        this.map_qikaiYingXiang = window.L.supermap.tiledMapLayer(this.workspace_qkyxt + '/经开影像 ', {
+          noWrap: true
+        });
         this.initSlt();
       });
     },
+
     /**
      * 矢量图
      */
     initSlt: async function () {
       this.layers.push(this.map_jilinShiLiang);//吉林矢量
-      // this.layers.push(this.map_qikaiYingXiang);//经开影像
+      this.initYxt();
+    },
+
+    /**
+     * 影像图
+     */
+    initYxt: async function () {
+      if(this.yxtSlt == 'yxt'){//影像图
+        this.layers.push(this.map_qikaiYingXiang);//汽开影像
+      }
       this.initZxd();
     },
+
     /**
      * 事件落点
      */
@@ -124,12 +141,14 @@ export default {
         year: this.year
       }, this.map);
     },
+
     /**
      * 中心点、zoom
      */
     initZxd: async function () {
       this.initMap();
     },
+
     /**
      * 加载地图
      */
@@ -277,7 +296,6 @@ export default {
       });
     },
     addMark: function (options) {
-      console.log("iconList.camera",iconList.camera);
       let that = this;
       let marker = "markers" + options.id;
       marker = L.marker(
@@ -293,18 +311,17 @@ export default {
         }
         );
       /**鼠标悬停打开popup**/
-      // marker.on('mouseover', function () {
-      //   let html = "";
-      //   html += "<p class='v-p-color'>事件标题：" + options.eventTitle + "</p>";
-      //   html += "<p class='v-p-color'>上报时间：" + options.eventSbsj + "</p>";
-      //   html += "<p class='v-p-color'>上报人：" + options.eventSbrName + "</p>";
-      //   html += "<p class='v-p-color'>当前状态：" + getStateText(options.eventState) + "</p>";
-      //   this.bindPopup(html).openPopup(this.getLatLng());
-      // });
+      marker.on('mouseover', function () {
+        let html = "";
+        html += "<p class='v-p-color'>摄像头名称：" + options.cameraName + "</p>";
+        html += "<p class='v-p-color'>摄像头类型：" + options.buildType + "</p>";
+        html += "<p class='v-p-color'>所属派出所：" + options.policeName + "</p>";
+        this.bindPopup(html).openPopup(this.getLatLng());
+      });
       // /**鼠标移开关闭popup**/
-      // marker.on('mouseout', function () {
-      //   this.closePopup();
-      // });
+      marker.on('mouseout', function () {
+        this.closePopup();
+      });
       // marker.on('click', function () {
       //   getEventDetail(options.eventId).then(response => {
       //     that.$emit('child-event', response);