Jelajahi Sumber

电视墙新接口

qinhouyu 1 tahun lalu
induk
melakukan
1a4ecc3e73
3 mengubah file dengan 61 tambahan dan 20 penghapusan
  1. 2 2
      src/api/forest.js
  2. 23 3
      src/components/TVWalls.vue
  3. 36 15
      src/views/datacenter.vue

+ 2 - 2
src/api/forest.js

@@ -15,9 +15,9 @@ export function fireControlViewPoint(param) {
 
   })
 }
-export function esViewDetail(param) {
+export function esViewDetail(params) {
   return request({
-    url: `/sooka-middleware/visual/getResourceDetail?type=${param.type}&id=${param.id}`,
+    url: `/sooka-middleware/visual/getResourceDetail?type=${params.type}&id=${params.id}`,
     method: 'get'
 
   })

+ 23 - 3
src/components/TVWalls.vue

@@ -30,6 +30,19 @@
             <h4>电话:{{user.phone}}</h4>
           </div>
         </div>
+<!--
+经纬度:
+纬度:
+名称:
+地址:
+联系人:
+联系电话:
+-->
+        <div class="leader-info-container" v-if="detailDataShow">
+          <div class="leader-info-list-con" v-for="(value, key) in detailData" :key="key">
+            {{ key }}: {{ value }}
+          </div>
+        </div>
       </div>
     </el-dialog>
   </div>
@@ -203,7 +216,9 @@ export default {
       pubKey: '',
       oWebControl: null,
       userData:[],
+      detailData:null,
       userDataShow:false,
+      detailDataShow:false,
     }
   },
   created() {
@@ -225,7 +240,7 @@ export default {
           })
       }
     },
-    showTVWall(data, val, item) {
+    showTVWall(data, val, item,num) {
 
       selectConfigKey("DssVersion").then(res => {
         if(this.ws.getLocalDssVersion()!=res.data){
@@ -244,8 +259,13 @@ export default {
           return
         }else{
           if(item != null){
-            this.userData = item;
-            this.userDataShow = true;
+            if(num===1) {
+              this.detailData = item;
+              this.detailDataShow = true;
+            }else{
+              this.userData = item;
+              this.userDataShow = true;
+            }
           }
           this.tvListJson = data
           this.data = val

+ 36 - 15
src/views/datacenter.vue

@@ -53,6 +53,7 @@
         ref="supermap"
         style="width: 100%; height: 100vh"
         @sewageOutletClick="sewageOutletClick"
+        @fatherMethod="fatherMethod"
       ></supermap>
       <!--      <button @click="showEventInfo1" style="position: absolute; right: 50%;top: 45%;z-index: 1000;">弹层事件演示用按钮-->
       <!--      </button>-->
@@ -99,6 +100,7 @@
     </div>
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
+    <TVWalls ref="TVWalls"></TVWalls>
   </div>
 </template>
 
@@ -113,6 +115,9 @@ import vheader from "@/components/v-header.vue"; //一体化共用头部
 import vBottomMenu from "@/components/vBottomMenu.vue"; //一体化公共底部菜单
 import eventLocation from "@/components/eventLocation.vue"; //事件定位弹窗
 import TVWall from "@/components/TVWall.vue"; //电视墙弹窗
+import TVWalls from "@/components/TVWalls.vue"; //电视墙弹窗
+import {esViewDetail} from "@/api/forest"; //资源底色控制文件
+
 import { getIconBg } from "@/api/components/sookaMapIcon";
 import {getUserProfile} from "@/api/system/user";
 import { Button } from '@/dahua/TVWalllib/iview' //资源底色控制文件
@@ -127,6 +132,7 @@ export default {
     vBottomMenu,
     eventLocation,
     TVWall,
+    TVWalls,
   },
   created() {
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
@@ -197,6 +203,15 @@ export default {
       this.$modal.msgSuccess("正在查询,请稍后...");
       this.fireControlViewPoint(this.resourceTable, this.searchName,"search");
     },
+    fatherMethod(dianshiqiang, longitude, latitude, item) {
+      this.$refs.TVWalls.showTVWall(
+        dianshiqiang, {
+          longitude: longitude,
+          latitude: latitude,
+        },
+        item
+      );
+    },
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
     bottomMenuList() {
       this.$refs.bottomMenu.selectTaskList(); //获取任务列表
@@ -489,11 +504,15 @@ export default {
         "                </span></div>";
       return markersMap;
     },
-    sewageOutletClick(data) {
-      console.log(data);
+    async sewageOutletClick(data) {
+      console.log('data',data);
       const params = Object.assign({});
       params.longitude = data.longitude;
       params.latitude = data.latitude;
+      params.id = data.id;
+      params.type = data.indexName;
+
+      let result = await esViewDetail(params);
 
       const treeLabels = [
         {
@@ -505,22 +524,22 @@ export default {
         },
       ];
       const labelChannels = [];
-      for (let i in data.cameraList) {
+      for (let i in result.data.cameras) {
         treeLabels.push({
           id: null,
-          labelCode: data.cameraList[i].cameraCode,
-          labelName: data.cameraList[i].cameraName,
-          cameraType: data.cameraList[i].cameraType,
+          labelCode: result.data.cameras[i].cameraCode,
+          labelName: result.data.cameras[i].cameraName,
+          cameraType: result.data.cameras[i].cameraType,
           parentLabelCode: "999",
         });
         labelChannels.push({
-          labelCode: data.cameraList[i].cameraCode,
+          labelCode: result.data.cameras[i].cameraCode,
           channelDates: [
             {
-              channelCode: data.cameraList[i].cameraCode,
-              channelName: data.cameraList[i].cameraName,
+              channelCode: result.data.cameras[i].cameraCode,
+              channelName: result.data.cameras[i].cameraName,
               channelSn: null,
-              cameraType: data.cameraList[i].cameraType,
+              cameraType: result.data.cameras[i].cameraType,
               online: "1",
               cameraCode: "1",
             },
@@ -534,11 +553,13 @@ export default {
           labelChannels: labelChannels,
         },
       ];
-      if (data.cameraList.length > 0) {
-        this.$refs.TVWall.showTVWall1(
-          data.longitude,
-          data.latitude,
-          dianshiqiang
+      if (result.data.cameras.length > 0) {
+        this.$refs.TVWalls.showTVWall(
+          dianshiqiang, {
+            longitude: data.longitude,
+            latitude: data.latitude,
+          },
+          result.data.detail,1
         );
       }
     },