资源数据不显示摄像头提交

src/components/TVWalls.vue

@@ -34,7 +34,15 @@
         <!--</el-descriptions>-->
         <div id="dom1" class="dom1" v-if="cameraNum!=0"></div>
         <img src="@/assets/images/cameraType/not-video.png" v-else style="height: 650px;width: 1086px;">
-        <!--<div id="dom1" class="dom1"></div>-->
+        <div class="leader-info-container" v-if="resourceData!=null">
+          <div class="leader-info-list-con" ref="listcon" :style="listconHeight != null ? {height: listconHeight}:{}">
+            <div v-for="(item,key) in resourceData" :key="key">
+              <el-descriptions class="margin-top" title="" :column="1" size="medium" border>
+                <el-descriptions-item :label="`${key}`">{{item}}</el-descriptions-item>
+              </el-descriptions>
+            </div>
+          </div>
+        </div>
           <div class="leader-info-container" v-if="userDataShow">
             <div class="leader-info-list-con" v-for="user in userData">
               <h4 style="">{{user.position}}：{{user.name}}</h4>
@@ -42,22 +50,6 @@
           </div>
         </div>
 
-        <div class="leader-info-container" v-if="resourceDataShow">
-          <div class="leader-info-list-con" :style="this.resourceData.length > 12 ? '' : 'height:100% !important'">
-            <div v-for="resource in resourceData">
-              <el-descriptions class="margin-top" title="" :column="1" :size="size" direction="horizontal" border >
-                <el-descriptions-item >
-                  <template slot="label">
-                    {{resource.key}}
-                  </template>
-                  {{resource.value}}
-                </el-descriptions-item>
-              </el-descriptions>
-            </div>
-          </div>
-        </div>
-
-
         <!--<div class="leader-info-container" v-if="resourceDataShow">-->
           <!--<div class="leader-info-list-con" >-->
             <!--<h4 style="" v-for="resource in resourceData">{{resource.key}}：{{resource.value}}</h4>-->
@@ -84,6 +76,7 @@ export default {
   data() {
     return {
       cameraNum:0,
+      listconHeight: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: "电视墙\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000\u3000您的所有操作痕迹已被后台记录，请谨慎操作。部分摄像头处于敏感区域，已屏蔽操控权限，无法操控。",
       tvListJson: [],
@@ -238,7 +231,7 @@ export default {
       pubKey: '',
       oWebControl: null,
       userData:[],
-      resourceData:[],
+      resourceData:null,
       userDataShow:false,
       resourceDataShow:false,
     }
@@ -263,7 +256,6 @@ export default {
       }
     },
     showTVWall(data, val, item, resourceData) {
-      if(data[0].labelChannels.length != 0){
         selectConfigKey("DssVersion").then(res => {
           if(this.ws.getLocalDssVersion()!=res.data){
             this.$modal.confirm('系统检测到新客户端版本，请更新后使用', '系统提示', {
@@ -285,20 +277,8 @@ export default {
               this.userDataShow = true;
             }
             if(resourceData != null){
-              let myCollection = [];
-              Object.keys(resourceData).forEach((k) => {
-                // console.log("k=", k)
-                myCollection.push({
-                  key: k,
-                  value: resourceData[k]?resourceData[k]:'无'
-                  // eval("("+'{'+k+' : resourceData[k]}'+")")
-                });
-              });
-              // console.log("myCollection=", myCollection);
-              // for (let i = 0; i < resourceData.length; i++) {
-              //   console.log("resourceData=", resourceData[i])
-              // }
-              this.resourceData = myCollection;
+              debugger
+              this.resourceData = resourceData;
               this.userDataShow = false;
               this.resourceDataShow = true;
             }else {
@@ -326,7 +306,10 @@ export default {
                 this.alertReinstall()
               }
             })
-            this.preview()
+            if(data[0].labelChannels.length>0){
+              this.preview()
+            }
+
             /** ----------------------------------大华摄像头预览结束------------------------------------- */
             /** ----------------------------------海康摄像头预览开始------------------------------------- */
             // tvCameraList().then(response => {
@@ -341,7 +324,6 @@ export default {
             // this.cameraNum = data[0].labelChannels.length;
           }
         })
-      }
       this.TVWallVisible = true
       this.cameraNum = data[0].labelChannels.length;
     },
@@ -408,7 +390,6 @@ export default {
     realTimeVideoDialog(cameraParams) {
       // 调用弹窗实时播放接口
       if (!this.isLogin) {
-        this.$Message.info("正在登陆客户端，请稍等......");
         return false;
       }
       this.ws.openVideo(cameraParams);
@@ -464,7 +445,6 @@ export default {
     },
     destroy() { // 调用销毁控件接口
       if (!this.isLogin) {
-        this.$modal.msgWarning('正在登陆客户端，请稍等......')
         return false
       }
       const ctrls = this.ws.ctrls.map(i => {

src/views/datacenter.vue

@@ -727,12 +727,6 @@ export default {
             labelChannels: labelChannels,
           },
         ];
-        if (data.cameraList.length > 0 || true) {
-          // this.$refs.TVWall.showTVWall1(
-          //   data.longitude,
-          //   data.latitude,
-          //   dianshiqiang
-          // );
           this.$refs.TVWalls.showTVWall(
             dianshiqiang,
             {
@@ -748,7 +742,6 @@ export default {
             },
             res.data.detail // item
           );
-        }
       });
       /*for (let i in data.cameraList) {
         treeLabels.push({