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

src/views/datacenter.vue

@@ -516,10 +516,47 @@ export default {
       const params = Object.assign({})
       params.longitude = data.longitude;
       params.latitude = data.latitude;
-      params.type = '4'
-      initByCameras(params).then(res => {
-        this.$refs.TVWall.showTVWall1(data.longitude, data.latitude, res.data);
-      });
+      
+      const treeLabels = [{
+        "id": null,
+        "labelCode": "999",
+        "labelName": "电视墙",
+        "cameraType": null,
+        "parentLabelCode": ""
+      }];
+      const labelChannels = [];
+      for (let i in data.cameraList){
+        treeLabels.push({
+          "id": null,
+          "labelCode": data.cameraList[i].cameraCode,
+          "labelName": data.cameraList[i].cameraName,
+          "cameraType": "1",
+          "parentLabelCode": "999"
+        })
+        labelChannels.push({
+          "labelCode": data.cameraList[i].cameraCode,
+          "channelDates": [
+            {
+              "channelCode": data.cameraList[i].cameraCode,
+              "channelName": data.cameraList[i].cameraName,
+              "channelSn": null,
+              "cameraType": "1",
+              "online": "1",
+              "cameraCode": "1"
+            }
+          ]
+        })
+      }
+      const dianshiqiang = [
+        {
+          "switchTab": "2",
+          "treeLabels": treeLabels,
+          "labelChannels": labelChannels
+        }
+      ]
+
+      this.$refs.TVWall.showTVWall1(data.longitude, data.latitude, dianshiqiang);
+
     },
   }
 }

src/views/forest.vue

@@ -103,7 +103,7 @@
         </div>
       </div>
       <!-- 地图 -->
-      <supermap ref="supermap" style="width: 100%;height: 100vh;" ></supermap>
+      <supermap ref="supermap" style="width: 100%;height: 100vh;" @showEventDialog="showEventDialog" ></supermap>
       <!-- 右侧 -->
       <div class="rightbar rightbar-index" ref="right">
         <div class="right-item1">

src/views/leader.vue

@@ -68,8 +68,9 @@
         </div>
       </div>
       <!-- 地图 -->
-      <supermap ref="supermap" style="width: 100%;height: 100vh;" :mapDiv="'forestMap'" class="indexSupermapClass"
+<!--      <supermap ref="supermap" style="width: 100%;height: 100vh;" :mapDiv="'forestMap'" class="indexSupermapClass"
                 :mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"></supermap>
+ -->      <supermap ref="supermap" style="width: 100%;height: 100vh;" ></supermap>
       <!-- 右侧 -->
       <div class="rightbar" :class="indentright" ref="right">
         <div class="forthis">
@@ -152,7 +153,7 @@ import {
   getRy
 } from '@/api/leader'
 
-import supermap from '@/components/supermap' //超图
+import supermap from '@/components/supermap-2.5d' //超图
 import vheader from '@/components/v-header.vue' //一体化共用头部
 import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
 import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗