소스 검색

电视墙样式

王通 1 년 전
부모
커밋
ee6b0f59a3
4개의 변경된 파일16개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      src/components/TVWall.vue
  2. 1 1
      src/components/TVWalls.vue
  3. 2 1
      src/views/forest.vue
  4. 12 4
      src/views/monitor.vue

+ 1 - 1
src/components/TVWall.vue

@@ -45,7 +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您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
+      title:['365','369','371','373','372','370'].includes(Cookies.get("deptId"))?"电视墙":"电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
       tvListJson: [
         {
         'switchTab': '1',

+ 1 - 1
src/components/TVWalls.vue

@@ -55,7 +55,7 @@ export default {
   data() {
     return {
       detail:null,
-      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您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
+      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您的所有操作痕迹已被后台记录,请谨慎操作。部分摄像头处于敏感区域,已屏蔽操控权限,无法操控。",
       tvListJson: [
         {
           'switchTab': '1',

+ 2 - 1
src/views/forest.vue

@@ -1237,7 +1237,6 @@ export default {
       if (this.calendarDay == this.getCurrentDataStr() && data != e.data) {
         // 处理收到的消息
         this.handleWebSoceketEvent(e.data)
-
         this.getTodayEvents(this.getCurrentDataStr(), true);
         this.getDeptEventCount(this.getCurrentDataStr(), true);
         this.getEventByEventType(this.getCurrentDataStr(), true);
@@ -1272,6 +1271,8 @@ export default {
             this.$refs.bottomMenu.updateAlert();
             this.$refs.up.play();
             //}
+          }else {
+            this.getEventList(this.getCurrentDataStr(), this.pageSize, this.pageNum)
           }
         })
       }

+ 12 - 4
src/views/monitor.vue

@@ -32,7 +32,7 @@
                   <!--   -->
                   <div class="icon icon-dot"></div>
                   <div class="icon-text">
-                    <h6>{{ visuForestCloudMapDeviceBOList[0].deviceCount }}</h6>
+                    <h6>{{ deviceCount }}</h6>
                     <h5>{{ visuForestCloudMapDeviceBOList[0].deviceName }}</h5>
                   </div>
                 </div>
@@ -284,12 +284,13 @@ export default {
   mounted() {
     // 初始化地图数据
     this.getSuperMapUrl();
-    this.selectCameraByCoverage()
+
     setTimeout(() => {
       this.selectKeyAreaList();
       this.bottomMenuList(); //获取底部公共组件消息和任务
       this.getTreeselect();
       this.deptId = parseInt(Cookies.get("deptId"));
+      this.selectCameraByCoverage(this.deptId)
       this.getMonitorDeviceAndDataLists(this.deptId);
        this.getDlblistBydeptIds();
       this.selectDeviceType('',-2);
@@ -300,6 +301,7 @@ export default {
   },
   data() {
     return {
+      deviceCount:0,
       jkListIcon:'sj-icon-jkzx',
       //摄像头名称
       cgqData: [],
@@ -385,9 +387,9 @@ export default {
     },
   },
   methods: {
-    selectCameraByCoverage()
+    selectCameraByCoverage(deptId)
     {
-      selectCameraByCoverage(365).then(res=>{
+      selectCameraByCoverage(deptId).then(res=>{
         this.CameraCoverageList=res.data
       })
     },
@@ -518,6 +520,7 @@ export default {
       console.log("节点单击事件", data, that.localMark);
       // this.findCameraByDept(data.id)
       if (that.localMark == "she") {
+        this.selectCameraByCoverage(data.id)
         that.selectCameraByDeptId(data.id);
         getCamerasByDeptId(data.id).then((res) => {
           that.$refs.TVWalls.showTVWall(res.data, {
@@ -1194,12 +1197,17 @@ export default {
       //获取左侧动态感知设备
       let that = this;
       that.onCoverage=index
+
       this.$refs.supermap.clearM()
       this.$refs.supermap.clearMRadius()
       selectDeviceType({deptId:this.deptId,cameraRadius:cameraRadius,type:8}).then((res) => {
         that.cameraMarkersList = [];
         that.visuForestCloudMapDeviceBOList =
           res.data.visuForestCloudMapDeviceBOList;
+        if(index==-2)
+        {
+          this.deviceCount=res.data.visuForestCloudMapDeviceBOList[0].deviceCount
+        }
         that.region = res.data.visuForestCloudTodaySjfbBOList;
 
         if (