无感监管新功能

src/components/Monitor_StatusAware/index.vue

@@ -63,7 +63,8 @@
 
             <div class="third_contain">
               <!-- 三级搜索框 -->
-              <el-input v-model="thirdInput" class="thirdInputModel"  placeholder="按企业名称搜索 " style="color:white" @change="thirdLevelSearch">
+              <el-input v-model="queryParams.enterpriseName" class="thirdInputModel"  placeholder="按企业名称搜索 " style="color:white"
+                        @change="enterpriseList">
               </el-input>
               <div style="height: 4%;"></div>
               <div class="sp_sbg">
@@ -78,13 +79,13 @@
                     :style="deviceBtn == index ? 'color:#38CCEA' : 'color:#fff'"
                     :class=" deviceBtn == index ? 'highlightedBtn': 'notHighlightedBtn'"
                     @click="getDeviceList(e,index)">
-                    <el-tooltip :content="e.name" placement="top" v-if="(e.name!=null||e.name!='')&&e.name.length>8">
+                    <el-tooltip :content="e.enterpriseName" placement="top" v-if="(e.enterpriseName!=null||e.enterpriseName!='')&&e.enterpriseName.length>8">
                       <span style="position: relative;left: -18%;">
-                      {{ e.name.substring(0,8) }}...
+                      {{ e.enterpriseName.substring(0,8) }}...
                     </span>
                     </el-tooltip>
                     <span style="position: relative;left: -18%;" v-else>
-                      {{ e.name }}
+                      {{ e.enterpriseName }}
                     </span>
                   </el-button>
                   <div
@@ -96,11 +97,11 @@
               </div>
               <!--分页-->
               <div class="paging">
-                <el-button type="button" @click="getCompanyList(10,queryParams.pageNum-1)">上一页
+                <el-button type="button" @click="enterpriseList(10,queryParams.pageNum-1)">上一页
                 </el-button>
                 <span>第{{ queryParams.pageNum }}页</span>
                 <el-button type="button" :disabled="nextbutton"
-                          @click="getCompanyList(10,queryParams.pageNum+1)">下一页
+                          @click="enterpriseList(10,queryParams.pageNum+1)">下一页
                 </el-button>
               </div>
             </div>
@@ -114,6 +115,11 @@
 <script>
 import {treeselect} from "@/api/system/dept";
 import Cookies from "js-cookie";
+import {
+  enterpriseList,
+  enterpriseById,
+  selectRegulatoryinformationByEnterpriseId
+} from '@/api/forest';
 
 export default {
   name: "StatusAware",
@@ -122,7 +128,7 @@ export default {
   data() {
     return {
       localMark: "She",               // 当前资源类型
-      She: true,
+      She: false,
       Chuan: false,
       La: false,
       Zhi: false,
@@ -140,178 +146,49 @@ export default {
       },                          // 部门树默认props
       placeholderMsg: '',
       cgqTimer: null,
-      cameraListSearch:[
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-        ],
       thirdInput:'',                // 输入框label(三级)
-      companyList:[
-        {
-          name:'测试测试测试测试测试测试'
-        },
-        {
-          name:'测试测试测试测试测试测试'
-        },
-        {
-          name:'测试测试测试测试测试测试'
-        },
-        {
-          name:'测试测试测试测试测试测试'
-        },
-        {
-          name:'测试测试测试测试测试测试'
-        },
-        {
-          name:'测试测试测试测试测试测试'
-        },
-        {
-          name:'测试测试测试测试测试测试'
-        },
-        {
-          name:'测试测试测试测试测试测试'
-        },
-        {
-          name:'测试测试测试测试测试测试'
-        },
-      ],               // 企业列表
-      cameraListSearch:[
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-        {
-          sbName:'测试测试测试测试测试测试',
-          cameraImg:null
-        },
-      ],
-      queryParams:{
-        pageNum:1
-      },               // 企业列表参数
+      companyList:[],               // 企业列表
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        enterpriseName: null
+      },
+      totalAllCompany:0,
+      cameraListSearch:[],
       deviceBtn:null
     }
   },
   mounted() {
     this.getTreeselect();
+    this.enterpriseList(10,1);
   },
   methods: {
+    /**
+     * 企业列表接口
+     */
+    enterpriseList(pageSize, pageNum){
+      if (pageNum < 1) {
+        this.$modal.msg('当前已是第一页')
+        return
+      } else if(pageNum > this.totalAllCompany/10+1){
+        this.$modal.msg('当前已是最后一页')
+        return;
+      }
+      this.queryParams.pageSize = pageSize;
+      this.queryParams.pageNum = pageNum;
+      enterpriseList(this.queryParams).then(res => {
+        this.companyList = res.rows
+        this.totalAllCompany = res.total
+      })
+    },
+    getDeviceList(e,idx){
+      this.deviceBtn=idx
+      this.$parent.getDeviceList(e);
+    },
+    thirdDeviceHashighLighted(e,idx){
+      this.deviceBtn=idx
+      this.$parent.thirdDeviceHashighLighted(e);
+    },
     /* 电视墙替换结束 */
     /** 部门树*/
     // 查询部门下拉树结构
@@ -382,6 +259,9 @@ export default {
     clearInterval(this.cgqTimer); //关闭
   },
   watch: {
+    'queryParams.enterpriseName':function(val){
+      this.enterpriseList(this.queryParams.pageSize, this.queryParams.pageNum, val)
+    },
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);

src/components/supermap-2.5d.vue

@@ -486,7 +486,6 @@ export default {
       this.isObtainLaAndLon = isObtainLaAndLon
     },
     clearDW() {
-      debugger
       if (this.positioningEntity != null) {
         this.viewer.entities.remove(this.positioningEntity);
       }
@@ -839,9 +838,9 @@ export default {
      * 地图落点
      */
     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
@@ -859,6 +858,7 @@ export default {
           click: makerList[i].click,
           parameter: makerList[i].parameter
         })
+
         that.markerboxEntity.push(marker)
       }
       that.viewer.scene.globe.depthTestAgainstTerrain = true

src/views/forest.vue

@@ -60,14 +60,15 @@
           </div>
         </div>
         </dv-border-box-13>
-        
+
       </div>
       <!-- 地图 -->
       <!--<supermap ref="supermap" style="width: 100%;height: 100vh;" class="indexSupermapClass" :mapDiv="'forestMap'"-->
       <!--:dynamicPlotting="false"-->
       <!--:mapSite="{doubleClickZoom:false}" :codes="['9fa5']" :isSideBySide="false"-->
       <!--@showEventDialog="showEventDialog"></supermap>-->
-      <supermap ref="supermap" @previewBefore="previewBefore" :showLayer="true">
+      <supermap ref="supermap" @previewBefore="previewBefore" @preview="preview" @jump="jump"
+                @fatherMethod="fatherMethod" :showLayer="true">
       </supermap>
       <div class="sj-layer-switch">
         <div style="position: relative;left:23%; display: flex;">
@@ -221,7 +222,7 @@
           <div class="container">
             <div class="topBar">设备列表</div>
             <!-- 输入框 -->
-            <el-input v-model="input" class="inputModel" placeholder="请输入要查询的设备名称 " clearable style="color:white" @change="search" >
+            <el-input v-model="cameraListName" class="inputModel" placeholder="请输入要查询的设备名称 " clearable style="color:white" @change="search" >
             </el-input>
             <!-- 菜单 -->
             <div class="mainContainer">
@@ -239,9 +240,9 @@
 
         <!-- 企业信息列表 -->
         <div class="container1">
-          <div class="topBar">企业信息</div>
+          <div class="topBar">企业上报信息</div>
           <!-- 输入框 -->
-          <el-input v-model="regulatoryinformationQueryParams.infoTitle" class="inputModel" placeholder="请输入要查询的企业信息 " clearable style="color:white" @change="search" >
+          <el-input v-model="regulatoryinformationQueryParams.infoTitle" class="inputModel" placeholder="请输入要查询的企业上报信息 " clearable style="color:white" @change="search" >
           </el-input>
           <!-- 菜单 -->
           <div class="mainContainer">
@@ -252,7 +253,7 @@
                 </div>
             </div>
           </div>
-          
+
         </div>
 
         <!--分页-->
@@ -395,7 +396,7 @@
       // 初始化地图数据
       this.getSuperMapUrl();
       setTimeout(() => {
-        this.enterpriseList();
+        this.enterpriseList(10,1);
         this.getWeather(this.getCurrentDataStr())
       }, 2000)
       this.bottomMenuList() //获取底部公共组件消息和任务
@@ -494,12 +495,17 @@
           pageSize: 10,
           enterpriseName: null
         },
+        cameraListName:"",
+
         totalAllCompany:0,
         companyList:[],               // 企业列表
         cameraListSearch:[],
+        cameraListSearchAll:[],
         regulatoryinformation:[],
+        totalAllregulatoryinformation:0,
         deviceBtn:null,
 
+        localMark: "She",
         regulatoryinformationQueryParams: {
           pageNum: 1,
           pageSize: 10,
@@ -510,6 +516,22 @@
         companyInfoNextbutton:false
       }
     },
+    watch:{
+      cameraListName(val) {
+        this.cameraListSearch = [];
+        for(let i=0;i<this.cameraListSearchAll.length;i++){
+          if(this.cameraListSearchAll[i].cameraName.indexOf(val) !== -1){
+            this.cameraListSearch.push(this.cameraListSearchAll[i])
+          }
+        }
+      },
+      'queryParams.enterpriseName':function(val){
+        this.enterpriseList(this.queryParams.pageSize, this.queryParams.pageNum, val)
+      },
+      'regulatoryinformationQueryParams.infoTitle':function(val){
+        this.getSelectRegulatoryinformationByEnterpriseId(this.regulatoryinformationQueryParams.pageSize, this.regulatoryinformationQueryParams.pageNum, val)
+      },
+    },
     /** ----------------------------------weosocket开始------------------------------------- */
     metaInfo () {
       return {
@@ -527,10 +549,11 @@
     methods: {
       // 获取企业信息列表
       getSelectRegulatoryinformationByEnterpriseId(pageSize, pageNum) {
+        debugger
         if (pageNum < 1) {
           this.$modal.msg('当前已是第一页')
           return
-        } else if (pageNum > this.totalAllEvent / 10 + 1) {
+        } else if (pageNum > this.totalAllregulatoryinformation / 10 + 1) {
           this.$modal.msg('当前已是最后一页')
           return
         }
@@ -538,12 +561,8 @@
         this.regulatoryinformationQueryParams.pageNum = pageNum
 
         selectRegulatoryinformationByEnterpriseId(this.regulatoryinformationQueryParams).then(res => {
-          if (res.rows !== null && res.rows.length !== 0 && res.rows.length == 10) {
-            this.companyInfoNextbutton = false
-          } else {
-            this.companyInfoNextbutton = true
-          }
           this.regulatoryinformation = res.rows
+          this.totalAllregulatoryinformation = res.total
         })
       },
       showCompanyDialog(e){
@@ -592,6 +611,59 @@
           this.totalAllCompany = res.total
         })
       },
+      toTvWall(cameraParam) {
+        this.preview(cameraParam)
+      },
+      preview(cameraParam) {
+        this.showTVWall(cameraParam.code, cameraParam.name, cameraParam.type);
+      },
+      showTVWall(channelCode, channelName, type) {
+        let tvListJson = [
+          {
+            switchTab: "2",
+            treeLabels: [
+              {
+                id: null,
+                labelCode: "999",
+                labelName: "电视墙",
+                cameraType: null,
+                parentLabelCode: "",
+              },
+              {
+                id: "spcamera00010",
+                labelCode: channelCode,
+                labelName: channelName,
+                cameraType: type,
+                parentLabelCode: "999",
+              },
+            ],
+            labelChannels: [
+              {
+                labelCode: channelCode,
+                channelDates: [
+                  {
+                    channelCode: channelCode,
+                    channelName: channelName,
+                    channelSn: null,
+                    cameraType: type,
+                    online: "1",
+                    cameraCode: "1",
+                  },
+                ],
+              },
+            ],
+          },
+        ];
+        this.$refs.TVWall.showTVWall(tvListJson, [
+          {
+            channelId: channelCode,
+          },
+        ]);
+        this.$refs.bottomMenu.showMeasure = false;
+        this.$refs.bottomMenu.showChild = false;
+        this.$refs.bottomMenu.showBanChild = false;
+        this.$refs.bottomMenu.showChangChild = false;
+      },
       // 查询收藏列表
       getCompanyList(pageSize, pageNum) {
       },
@@ -601,6 +673,8 @@
         let that = this;
         enterpriseById(e.id).then(res => {
           that.cameraListSearch = res.data.cameras
+          that.cameraListSearchAll = res.data.cameras
+          let cameraMarkersList = [];
           for (let i = 0; i < res.data.cameras.length; i++) {
             let markersMap = {
               lng: 124.59,
@@ -624,11 +698,12 @@
             markersMap.icon = "camera";
             markersMap.click = 'previewBefore'
             markersMap.bindPopupHtml = "";
-            that.cameraMarkersList.push(markersMap);
+            cameraMarkersList.push(markersMap);
           }
           setTimeout(() => {
             that.$refs.supermap.clearM();
-            that.$refs.supermap.setMarkers(that.cameraMarkersList);
+            that.$refs.supermap.clearMRadius();
+            that.$refs.supermap.setMarkers(cameraMarkersList);
           }, 3000);
         })
         that.regulatoryinformationQueryParams = {
@@ -639,8 +714,63 @@
         },
         selectRegulatoryinformationByEnterpriseId(that.regulatoryinformationQueryParams).then(res => {
           that.regulatoryinformation = res.rows
+          that.totalAllregulatoryinformation = res.total
+        })
+      },
+      thirdDeviceHashighLighted(e){
+        let that = this;
+        enterpriseById(e.id).then(res => {
+          that.toTvWall_cgq(res.data);
         })
       },
+      toTvWall_cgq(cameraParam) {
+        const treeLabels = [
+          {
+            id: null,
+            labelCode: '999',
+            labelName: '电视墙',
+            cameraType: null,
+            parentLabelCode: ''
+          }
+        ]
+        const labelChannels = []
+        for (let i in cameraParam.cameras) {
+          treeLabels.push({
+            id: null,
+            labelCode: cameraParam.cameras[i].cameraCode,
+            labelName: cameraParam.cameras[i].cameraName,
+            cameraType: cameraParam.cameras[i].cameraType,
+            parentLabelCode: '999'
+          })
+          labelChannels.push({
+            labelCode: cameraParam.cameras[i].cameraCode,
+            channelDates: [
+              {
+                channelCode: cameraParam.cameras[i].cameraCode,
+                channelName: cameraParam.cameras[i].cameraName,
+                channelSn: null,
+                cameraType: cameraParam.cameras[i].cameraType,
+                online: '1',
+                cameraCode: '1'
+              }
+            ]
+          })
+        }
+        const dianshiqiang = [
+          {
+            switchTab: '2',
+            treeLabels: treeLabels,
+            labelChannels: labelChannels
+          }
+        ]
+        if (cameraParam.cameras.length != null) {
+          this.$refs.TVWall.showTVWall1(
+            cameraParam.longitude,
+            cameraParam.latitude,
+            dianshiqiang
+          );
+        }
+      },
       previewBefore(cameraParam) {
         selectByCameraId(cameraParam.code).then(res => {
           this.$refs.deviceDialog.update(res.data, 'SHE')
@@ -843,11 +973,13 @@
             }
             setTimeout(() => {
               that.$refs.supermap.clearM()
+              that.$refs.supermap.clearMRadius();
               that.$refs.supermap.setMarkers(that.markersList)
             }, 3000)
           } else {
             setTimeout(() => {
               that.$refs.supermap.clearM()
+              that.$refs.supermap.clearMRadius();
             }, 3000)
           }
           this.canSelectDate = true
@@ -940,14 +1072,6 @@
       },
       /** ----------------------------------底部按钮公用组件结束------------------------------------- */
     },
-    watch:{
-      'regulatoryinformationQueryParams.infoTitle':function(val){
-        this.getSelectRegulatoryinformationByEnterpriseId(this.regulatoryinformationQueryParams.pageSize, this.regulatoryinformationQueryParams.pageNum, val)
-      },
-      'queryParams.enterpriseName':function(val){
-        this.enterpriseList(this.queryParams.pageSize, this.queryParams.pageNum, val)
-      },
-    }
   }
 </script>
 

src/views/monitor.vue

@@ -41,16 +41,16 @@
           <div class="container">
             <div class="topBar">设备列表</div>
             <!-- 输入框 -->
-            <el-input v-model="input" class="inputModel" placeholder="请输入要查询的设备名称 " clearable style="color:white" @change="search" >
+            <el-input v-model="cameraListName" class="inputModel" placeholder="请输入要查询的设备名称 " clearable style="color:white" @change="search" >
             </el-input>
             <!-- 菜单 -->
             <div class="mainContainer">
               <!-- 列表 -->
-              <div class="listItem" v-for="(e,idx) in cameraListSearch" :key="idx" @click="dropLocation(e.latitude, e.longitude, idx,e.cameraRadius)">
+              <div class="listItem" v-for="(e,idx) in cameraListSearch" :key="idx" @click="dropLocation(e.latitude, e.longitude, e.cameraCode)">
                   <img class="itemPic"
-                    v-bind:src="e.cameraImg == null ? require('@/assets/images/video-plaza/shiLianWangImg/no-camera.png'):fileUrl+e.cameraImg" >
+                    v-bind:src="e.cameraImg == null ? require('@/assets/images/video-plaza/shiLianWangImg/no-camera.png'):e.cameraImg" >
                   <div class="itemArea" >
-                      <h4>{{ e.sbName }}</h4>
+                      <h4>{{ e.cameraName }}</h4>
                   </div>
               </div>
             </div>
@@ -133,6 +133,9 @@ import {
   selectByDeviceId,
   selectByBroadcastId, selectRecorderByDeptId
 } from "@/api/monitor";
+import {
+  enterpriseById
+} from '@/api/forest';
 import supermap from "@/components/supermap-2.5d"; //超图
 import vheader from "@/components/v-header.vue"; //一体化共用头部
 import vBottomMenu from "@/components/vBottomMenu.vue"; //一体化公共底部菜单
@@ -180,12 +183,12 @@ export default {
     // 初始化地图数据
     this.getSuperMapUrl();
     setTimeout(() => {
-      this.selectKeyAreaList();
-      this.bottomMenuList(); //获取底部公共组件消息和任务
+      // this.selectKeyAreaList();
+      // this.bottomMenuList(); //获取底部公共组件消息和任务
       this.deptId = parseInt(Cookies.get("deptId"));
-      this.getMonitorDeviceAndDataLists();
-      this.getDlblistBydeptIds();
-      this.selectRecorder();
+      // this.getMonitorDeviceAndDataLists();
+      // this.getDlblistBydeptIds();
+      // this.selectRecorder();
       this.selectDeviceType(-1);
       // this.showTVWall();
     }, 2000)
@@ -251,75 +254,20 @@ export default {
       cgqTimer: null,
       values: Math.random(),
       currentCameraParam: null,
-      cameraListSearch:[
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-          {
-            sbName:'测试测试测试测试测试测试',
-            cameraImg:null
-          },
-        ],
+      cameraListSearch:[],
+      cameraListSearchAll:[],
+      cameraListName:"",
     };
   },
   watch: {
+    cameraListName(val) {
+      this.cameraListSearch = [];
+      for(let i=0;i<this.cameraListSearchAll.length;i++){
+        if(this.cameraListSearchAll[i].cameraName.indexOf(val) !== -1){
+          this.cameraListSearch.push(this.cameraListSearchAll[i])
+        }
+      }
+    },
     // 根据名称筛选部门树
     deptName(val) {
       this.$refs.tree.filter(val);
@@ -343,6 +291,51 @@ export default {
     },
   },
   methods: {
+    getDeviceList(e){
+      let that = this;
+      that.$refs.supermap.clearM();
+      enterpriseById(e.id).then(res => {
+        this.cameraListSearch = res.data.cameras
+        this.cameraListSearchAll = res.data.cameras
+        let enterpriseCameraMarkersList = [];
+        for (let i = 0; i < res.data.cameras.length; i++) {
+          let markersMap = {
+            lng: 124.59,
+            lat: 43.02,
+            icon: "camera",
+            bindPopupHtml: "",
+            click: "previewBefore",
+            parameter: "",
+            name: i,
+            keepBindPopup: false,
+            isAggregation: false,
+          };
+          markersMap.parameter = {
+            code: res.data.cameras[i].cameraCode,
+            name: res.data.cameras[i].cameraName,
+            type: res.data.cameras[i].cameraType
+          }
+
+          markersMap.lng = res.data.cameras[i].longitude;
+          markersMap.lat = res.data.cameras[i].latitude;
+          markersMap.icon = "camera";
+          markersMap.click = 'previewBefore'
+          markersMap.bindPopupHtml = "";
+          enterpriseCameraMarkersList.push(markersMap);
+        }
+        setTimeout(() => {
+          that.$refs.supermap.clearM();
+          that.$refs.supermap.clearMRadius();
+          that.$refs.supermap.setMarkers(enterpriseCameraMarkersList);
+        }, 3000);
+      })
+    },
+    thirdDeviceHashighLighted(e){
+      let that = this;
+      enterpriseById(e.id).then(res => {
+        that.toTvWall_cgq(res.data);
+      })
+    },
     toTvWall(cameraParam) {
       this.preview(cameraParam)
     },
@@ -581,7 +574,7 @@ export default {
       this.jkListIcon = 'sj-icon-centerdata-t-firecontrol-fire-pressure-sensor'
     },
 //摄像头
-    selectDeviceType() {
+    selectDeviceType(initial) {
       //获取左侧动态感知设备
       this.localMark = 'She'
       this.deptId = Cookies.get("deptId")
@@ -591,92 +584,94 @@ export default {
         that.visuForestCloudCameraBOList = res.data;
         that.visuForestCloudCameraBOListSearch = res.data;
         that.sheNum = res.data.length;
-        if (
-          res.data != null && res.data.length > 0
-        ) {
-          for (let i = 0; i < res.data.length; i++) {
-            let markersMap = {
-              lng: 124.59,
-              lat: 43.02,
-              icon: "camera",
-              bindPopupHtml: "",
-              click: "previewBefore",
-              parameter: "",
-              name: i,
-              keepBindPopup: false,
-              isAggregation: false,
-            };
-            if (res.data[i].channelCode != null) {
-              markersMap.parameter = {
-                code: res.data[i].cameraCode,
-                name: res.data[i].cameraName,
-                type: res.data[i].cameraType,
+        if(initial != -1){
+          if (
+            res.data != null && res.data.length > 0
+          ) {
+            for (let i = 0; i < res.data.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: "camera",
+                bindPopupHtml: "",
+                click: "previewBefore",
+                parameter: "",
+                name: i,
+                keepBindPopup: false,
+                isAggregation: false,
               };
-            } else {
-              markersMap.parameter = [];
-            }
-
-            markersMap.lng = res.data[i].longitude;
-            markersMap.lat = res.data[i].latitude;
-            markersMap.radius =
-              res.data[i].cameraRadius;
-            if (res.data[i].cameraUse == 1) {
-              if (res.data[i].workingStatus == 0) {
-                markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
-                markersMap.click = 'previewBefore'
-              } else if (res.data[i].workingStatus == 1) {
-                markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
-                markersMap.click = 'previewBefore'
+              if (res.data[i].channelCode != null) {
+                markersMap.parameter = {
+                  code: res.data[i].cameraCode,
+                  name: res.data[i].cameraName,
+                  type: res.data[i].cameraType,
+                };
+              } else {
+                markersMap.parameter = [];
               }
 
-            } else if (res.data[i].cameraUse == 2) {
-              if (res.data[i].workingStatus == 0) {
-                markersMap.icon = "camera";
-                markersMap.click = 'previewBefore'
-              } else if (res.data[i].workingStatus == 1) {
-                markersMap.icon = "camera-not";
-                markersMap.click = 'previewBefore'
-              }
-            } else if (res.data[i].cameraUse == 3) {
-              if (res.data[i].workingStatus == 0) {
-                markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
-                markersMap.click = 'previewBefore'
-              } else if (res.data[i].workingStatus == 1) {
-                markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
-                markersMap.click = 'previewBefore'
-              }
+              markersMap.lng = res.data[i].longitude;
+              markersMap.lat = res.data[i].latitude;
+              markersMap.radius =
+                res.data[i].cameraRadius;
+              if (res.data[i].cameraUse == 1) {
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor'
+                  markersMap.click = 'previewBefore'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
+                  markersMap.click = 'previewBefore'
+                }
 
-            } else if (res.data[i].cameraUse == 4) {
-              if (res.data[i].workingStatus == 0) {
-                markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
-                markersMap.click = 'previewBefore'
-              } else if (res.data[i].workingStatus == 1) {
-                markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
-                markersMap.click = 'previewBefore'
-              }
+              } else if (res.data[i].cameraUse == 2) {
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = "camera";
+                  markersMap.click = 'previewBefore'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = "camera-not";
+                  markersMap.click = 'previewBefore'
+                }
+              } else if (res.data[i].cameraUse == 3) {
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = 'sj-icon-map-centerdata-slmonitor-traffic'
+                  markersMap.click = 'previewBefore'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
+                  markersMap.click = 'previewBefore'
+                }
 
-            } else if (res.data[i].cameraUse == 5) {
-              if (res.data[i].workingStatus == 0) {
-                markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
-                markersMap.click = 'previewBefore'
-              } else if (res.data[i].workingStatus == 1) {
-                markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
-                markersMap.click = 'previewBefore'
+              } else if (res.data[i].cameraUse == 4) {
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
+                  markersMap.click = 'previewBefore'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
+                  markersMap.click = 'previewBefore'
+                }
+
+              } else if (res.data[i].cameraUse == 5) {
+                if (res.data[i].workingStatus == 0) {
+                  markersMap.icon = 'sj-icon-map-centerdata-t-hydraulic-reservoir-camera'
+                  markersMap.click = 'previewBefore'
+                } else if (res.data[i].workingStatus == 1) {
+                  markersMap.icon = 'sj-icon-map-not-centerdata-t-hydraulic-reservoir-camera'
+                  markersMap.click = 'previewBefore'
+                }
               }
+              markersMap.bindPopupHtml = "";
+              this.cameraMarkersList.push(markersMap);
             }
-            markersMap.bindPopupHtml = "";
-            this.cameraMarkersList.push(markersMap);
+            setTimeout(() => {
+              that.$refs.supermap.clearM();
+              that.$refs.supermap.clearMRadius();
+              that.$refs.supermap.setMarkersRadius(this.cameraMarkersList);
+            }, 3000);
+          } else {
+            setTimeout(() => {
+              that.$refs.supermap.clearM();
+              that.$refs.supermap.clearMRadius();
+            }, 1000);
           }
-          setTimeout(() => {
-            that.$refs.supermap.clearM();
-            that.$refs.supermap.clearMRadius();
-            that.$refs.supermap.setMarkersRadius(this.cameraMarkersList);
-          }, 3000);
-        } else {
-          setTimeout(() => {
-            that.$refs.supermap.clearM();
-            that.$refs.supermap.clearMRadius();
-          }, 1000);
         }
       });
     },
@@ -1851,7 +1846,7 @@ function cbIntegrationCallBack(oData) {
     text-overflow: ellipsis;
     margin:auto auto auto 2%;
     color: #fff;
-  }   
+  }
   .itemArea:hover {
     white-space: normal;
     overflow: visible;