소스 검색

气泡与电视墙

qinhouyu 2 년 전
부모
커밋
2a6dfc4a34
3개의 변경된 파일48개의 추가작업 그리고 8개의 파일을 삭제
  1. 3 2
      src/components/TVWall.vue
  2. 3 2
      src/components/TVWalls.vue
  3. 42 4
      src/components/supermap-2.5d.vue

+ 3 - 2
src/components/TVWall.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="电视墙" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
+    <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
 	  <!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
 	  	<!--&lt;!&ndash; <div class="this-title">-->
@@ -37,7 +37,7 @@ import { getDahuaVideoServer, getTVWallList } from '@/api/dahua/dahua'
 import { tvCameraList } from '@/api/haikang/haikang'
 import DHWs from '@/dahua/lib/DHWs'
 import { rotation } from '@/api/monitor'
-
+import Cookies from "js-cookie"
 
 /** ----------------------------------摄像头预览结束------------------------------------- */
 export default {
@@ -45,6 +45,7 @@ export default {
   components: {},
   data() {
     return {
+      title:['365','369','371','373','372','370'].includes(Cookies.get("deptId"))?"电视墙":"电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录,请谨慎操作。",
       tvListJson: [
         {
         'switchTab': '1',

+ 3 - 2
src/components/TVWalls.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="电视墙" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
+    <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
 
       <!--<div @click="findCameraByEventCoordinate()">视频联动</div>-->
@@ -43,13 +43,14 @@
   import {tvCameraList} from '@/api/haikang/haikang'
   import {findCameraByEventCoordinate, rotation} from '@/api/monitor'
   import DHWs from '@/dahua/lib/DHWs'
-
+  import Cookies from "js-cookie"
   /** ----------------------------------摄像头预览结束------------------------------------- */
   export default {
     dicts: ['event_source'],
     components: {},
     data() {
       return {
+        title:['365','369','371','373','372','370'].includes(Cookies.get("deptId"))?"电视墙":"电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录,请谨慎操作。",
         tvListJson: [
           {
             'switchTab': '1',

+ 42 - 4
src/components/supermap-2.5d.vue

@@ -5,8 +5,8 @@
       <transition name='fade'>
         <div class="map-tit" v-show="mapshow">
           <div class="top-tit">
-            <i class="iconfont sj-icon-jkzx"></i>
-            <span><img src="../assets/images/close.svg" @click="mapShow" /></span>
+            <i class="iconfont sj-icon-jkzx" @click="openTvwall()"></i>
+            <span><img src="../assets/images/close.svg" @click="mapshow=false"/></span>
           </div>
           <div class="map-txt" v-html="bindPopupHtml">
           </div>
@@ -31,6 +31,10 @@
     name: 'supermap-2.5d',
     data() {
       return {
+        dianshiqiang:null,
+        longitude:null,
+        latitude:null,
+        userList:[],
         bindPopupHtml: null,
         mapshow: false,
         superMapRootUrl: null,
@@ -727,18 +731,52 @@
                   ]
                 })
               }
-              const dianshiqiang = [
+              that.dianshiqiang = [
                 {
                   "switchTab": "2",
                   "treeLabels": treeLabels,
                   "labelChannels": labelChannels
                 }
               ]
-              that.$emit('fatherMethod', dianshiqiang,res.data[0].longitude,res.data[0].latitude,res.data[0].userList);
+              that.longitude = res.data[0].longitude;
+              that.latitude = res.data[0].latitude;
+              that.userList = res.data[0].userList;
+              let html =
+                '<div class="map-tip">' +
+                "<span>" +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                "                  <h4>名称:" + that.queryParams.name +
+                "</h4>" +
+                "                </div>" +
+                "                </div>" +
+                "                </span>";
+              for (let i in res.data[0].userList){
+                html += "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>" +res.data[0].userList[i].position+":"+res.data[0].userList[i].name+"</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>"+
+                  "<span>" +
+                  '                  <div class="d-l-con">' +
+                  '                  <div class="d-l-l-text">' +
+                  "                  <h4>电话:" + (res.data[0].userList[i].phone ? res.data[0].userList[i].phone : "")+"</h4>" +
+                  "                </div>" +
+                  "                </div>" +
+                  "                </span>";
+              }
+              html += "</div>";
+              that.bindPopupHtml = html;
+              that.mapshow = true
             });
           }
         });
       },
+      openTvwall(){
+        this.$emit('fatherMethod', this.dianshiqiang, this.longitude, this.latitude, this.userList);
+      },
       /**
        * 地图落点
        */