Browse Source

修改bug

qinhouyu 1 year ago
parent
commit
be3ba20d93

+ 10 - 0
src/assets/styles/base.scss

@@ -91,6 +91,16 @@ $date-state3: #d6333b;
 .TVWallCustomWidth {
   width: 1200px !important;
   height: 800px !important;
+
+  .el-descriptions__body{
+    background:transparent !important;
+    color: #fff;
+    .el-descriptions-item__label{
+      background:transparent !important;
+      color: #fff;
+      width: 100px;
+    }
+  }
 }
 
 //公共

+ 2 - 34
src/components/TVWalls.vue

@@ -2,27 +2,7 @@
   <div>
     <el-dialog :title="title" :visible.sync="TVWallVisible" v-if="TVWallVisible" customClass="TVWallCustomWidth"
                @close="cancelEventLocationShow()">
-
-      <!--<div @click="findCameraByEventCoordinate()">视频联动</div>-->
-      <!--<div class="forthis" style="width: 22%; position: absolute;left: 0;z-index: 9999999999999;">-->
-      <!--<div class="i-list-con" style="height: 46vh; overflow-y: scroll;">-->
-      <!--<span v-for="(item,index) in cameraList" :key="index">-->
-      <!--<div class="d-l-con" @click="playhk(item.channelCode)">-->
-      <!--<div class="d-l-l-text">-->
-      <!--<i class="i-small"></i>-->
-      <!--<h4>{{ item.cameraName }}</h4>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--</span>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--<div style="width:70%;height:400px;position:absolute;">-->
-      <!--&lt;!&ndash;视频窗口展示-&#45;&#45;大华&ndash;&gt;-->
-      <!--<div id="dom1" class="dom1"></div>-->
-      <!--&lt;!&ndash;视频窗口展示-&#45;&#45;海康&ndash;&gt;-->
-      <!--<div id="playWnd" class="playWnd" style="left: 0px; top: 0px;"></div>-->
-      <!--</div>-->
-      <div style="display: flex;" >
+      <div style="display: flex;">
         <div id="dom1" class="dom1"></div>
         <div class="leader-info-container" v-if="userDataShow">
           <div class="leader-info-list-con" v-for="user in userData">
@@ -30,19 +10,17 @@
             <h4>电话:{{user.phone}}</h4>
           </div>
         </div>
-
         <div class="leader-info-container" v-if="detailDataShow">
           <div class="leader-info-list-con">
             <div v-for="(value, key) in detailData" :key="key">
               <el-descriptions class="margin-top" title="" :column="1" size="mini" border>
-                <el-descriptions-item :label="`${key}:`" :contentStyle='contentStyle' :labelStyle='labelStyle' >
+                <el-descriptions-item :label="`${key}`">
                   {{ value }}
                 </el-descriptions-item>
               </el-descriptions>
             </div>
           </div>
         </div>
-
       </div>
     </el-dialog>
   </div>
@@ -63,16 +41,6 @@ export default {
   components: {},
   data() {
     return {
-      contentStyle: {
-        'background-color':'#063652',
-        'color':'white'
-      },
-      //label样式
-      labelStyle: {
-        'width': '80px',
-        'background-color':'#063652',
-        'color':'white'
-      },
       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: [],
       TVWallVisible: false,

+ 4 - 1
src/views/datacenter.vue

@@ -101,6 +101,7 @@
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
     <TVWalls ref="TVWalls"></TVWalls>
+    <TVWalls_another ref="TVWalls_another"></TVWalls_another>
   </div>
 </template>
 
@@ -116,6 +117,7 @@ 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 TVWalls_another from "@/components/TVWalls.vue"; //电视墙弹窗
 import {esViewDetail} from "@/api/forest"; //资源底色控制文件
 
 import { getIconBg } from "@/api/components/sookaMapIcon";
@@ -133,6 +135,7 @@ export default {
     eventLocation,
     TVWall,
     TVWalls,
+    TVWalls_another,
   },
   created() {
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
@@ -204,7 +207,7 @@ export default {
       this.fireControlViewPoint(this.resourceTable, this.searchName,"search");
     },
     fatherMethod(dianshiqiang, longitude, latitude, item) {
-      this.$refs.TVWalls.showTVWall(
+      this.$refs.TVWalls_another.showTVWall(
         dianshiqiang, {
           longitude: longitude,
           latitude: latitude,

+ 1 - 0
src/views/eventdetailsdialog.vue

@@ -195,6 +195,7 @@
                             v-model="radius"
                             class="d-input-bottom"
                             placeholder="请输入搜索半径"
+                            max="99999999"
                           />
                         </div>
                       </dv-border-box-7>