JX.LI 2 년 전
부모
커밋
bdc1301a7b
4개의 변경된 파일27개의 추가작업 그리고 9개의 파일을 삭제
  1. 16 1
      src/assets/styles/base.scss
  2. 2 2
      src/components/TVWall.vue
  3. 4 1
      src/views/forest.vue
  4. 5 5
      src/views/monitor.vue

+ 16 - 1
src/assets/styles/base.scss

@@ -85,11 +85,26 @@ $date-state3: #d6333b;
 //视频摄像头预览弹层样式
 .videoCustomWidth {
   width: 1150px !important;
-  height: 700px !important;
+  height: 750px !important;
 }
 //电视墙视频摄像头预览弹层样式
 .TVWallCustomWidth {
   width: 1200px !important;
+  height: 750px !important;
+  .el-descriptions__body{
+      background:transparent !important;
+      color: #fff;
+      .el-descriptions-item__label{
+        background:transparent !important;
+        color: #fff;
+        width: 100px;
+      }
+    }
+}
+
+//电视墙视频摄像头预览弹层样式
+.TVWallCustomWidths {
+  width: 1200px !important;
   height: 800px !important;
   .el-descriptions__body{
       background:transparent !important;

+ 2 - 2
src/components/TVWall.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog :title="title + titleSuffix" :visible.sync="TVWallVisible" v-if="TVWallVisible"
-      customClass="TVWallCustomWidth" @close="cancelEventLocationShow()">
+      customClass="TVWallCustomWidths" @close="cancelEventLocationShow()">
       <!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
       <!--&lt;!&ndash; <div class="this-title">-->
       <!--<span>林场</span>-->
@@ -919,4 +919,4 @@
     margin-top: 100px;
     margin-left: 80px;
   }
-</style>
+</style>

+ 4 - 1
src/views/forest.vue

@@ -427,6 +427,7 @@
       @getFirespread="getFirespread" @showDialog="showDialog"></firespread>
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
+    <TVWalls2 ref="TVWalls2"></TVWalls2>
     <TVWalls ref="TVWalls"></TVWalls>
   </div>
 </template>
@@ -460,6 +461,7 @@
   import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
   import TVWall from '@/components/TVWall.vue' //电视墙弹窗
   import TVWalls from '@/components/TVWalls.vue' //电视墙弹窗
+  import TVWalls2 from '@/components/TVWalls2.vue' //电视墙弹窗
   import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
   import firespread from '@/views/firespread.vue' //事件详情弹窗
   import {
@@ -497,6 +499,7 @@
       eventLocation,
       TVWall,
       TVWalls,
+      TVWalls2,
       dateChoose,
       eventdetailsdialog,
       firespread
@@ -1327,7 +1330,7 @@
         })
       },
       fatherMethod(dianshiqiang, longitude, latitude, item) {
-        this.$refs.TVWalls.showTVWall(
+        this.$refs.TVWalls2.showTVWall(
           dianshiqiang, {
             longitude: longitude,
             latitude: latitude,

+ 5 - 5
src/views/monitor.vue

@@ -1645,7 +1645,7 @@
                   markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor'
                   markersMap.click = ''
                 }
-              
+
               } else if (res.data[i].cameraUse == 2) {
                 if (res.data[i].workingStatus == 0) {
                   markersMap.icon = "camera";
@@ -1662,7 +1662,7 @@
                   markersMap.icon = 'sj-icon-map-not-centerdata-slmonitor-traffic'
                   markersMap.click = ''
                 }
-              
+
               } else if (res.data[i].cameraUse == 4) {
                 if (res.data[i].workingStatus == 0) {
                   markersMap.icon = 'sj-icon-map-centerdata-sand-quarry-camera'
@@ -1671,7 +1671,7 @@
                   markersMap.icon = 'sj-icon-map-not-centerdata-sand-quarry-camera'
                   markersMap.click = ''
                 }
-              
+
               } else if (res.data[i].cameraUse == 5) {
                 if (res.data[i].workingStatus == 0) {
                   markersMap.icon = 'sj-icon-map-centerdata-river_camera'
@@ -1681,13 +1681,13 @@
                   markersMap.click = ''
                 }
               }
-              
+
               if (res.data.visuForestCloudCameraBOList[i].channelCode != null) {
                 markersMap.parameter = res.data.visuForestCloudCameraBOList[i]
               } else {
                 markersMap.parameter = [];
               }
-              
+
               markersMap.lng = res.data[i].longitude;
               markersMap.lat = res.data[i].latitude;
               markersMap.radius = res.data[i].cameraRadius;