Merge branch 'master' of ssh://111.61.77.35:15/lizhichao/whp-xl into master

dcit-hcsystem-hcsystem-master/src/utils/methods.ts

@@ -23,6 +23,7 @@ export default {
     MenuMg: "System",
     RoleMg: "System",
     UserMg: "System",
+    VideoList: "Video"
   },
   deleteFun(that: any, url: any, callback: any) {
     (that as any)

dcit-hcsystem-hcsystem-master/src/views/Video/VideoList.vue

@@ -13,32 +13,39 @@
                   :default-checked-keys="[]"
                   @node-click="nodeClick"
           >
+            <!--<template slot-scope="{node, data}">
+              <span>
+                <i class="'#' + iconArrClass[data.level]" aria-hidden="true">
+                </i>
+                {{node.label}}
+              </span>
+            </template>-->
           </el-tree>
         </div>
       </el-col>
 
       <el-col :xs="12" :sm="12" :md="18" :lg="20" :xl="20">
           <el-row class="row">
-            <div class="box" :class="[flag == 'newplay1' ? 'boxred' : 'boxblack']">
-              <div id="newplay1" style="width:100%; height:100%;" @click="chooseWindow('newplay1')">
+            <div class="box" :class="[flag == 1 ? 'boxred' : 'boxblack']">
+              <div id="newplay1" style="width:100%; height:100%;" @click="chooseWindow(1)">
                 <span class="novideo">无信号</span>
               </div>
             </div>
-            <div class="box" :class="[flag == 'newplay2' ? 'boxred' : 'boxblack']">
-              <div id="newplay2" style="width:100%; height:100%;" @click="chooseWindow('newplay2')">
+            <div class="box" :class="[flag == 2 ? 'boxred' : 'boxblack']">
+              <div id="newplay2" style="width:100%; height:100%;" @click="chooseWindow(2)">
                 <span class="novideo">无信号</span>
               </div>
             </div>
           </el-row>
 
           <el-row class="row">
-            <div class="box" :class="[flag == 'newplay3' ? 'boxred' : 'boxblack']">
-              <div id="newplay3" style="width:100%; height:100%;" @click="chooseWindow('newplay3')">
+            <div class="box" :class="[flag == 3 ? 'boxred' : 'boxblack']">
+              <div id="newplay3" style="width:100%; height:100%;" @click="chooseWindow(3)">
                 <span class="novideo">无信号</span>
               </div>
             </div>
-            <div class="box" :class="[flag == 'newplay4' ? 'boxred' : 'boxblack']">
-              <div id="newplay4" style="width:100%; height:100%;" @click="chooseWindow('newplay4')">
+            <div class="box" :class="[flag == 4 ? 'boxred' : 'boxblack']">
+              <div id="newplay4" style="width:100%; height:100%;" @click="chooseWindow(4)">
                 <span class="novideo">无信号</span>
               </div>
             </div>
@@ -54,20 +61,30 @@
     .box{
       width: 100%;
       text-align: center;
-      background-color: #edf1f6;
+      background-color: black;
     }
   }
   .boxred{
     border: 1px solid red;
   }
   .boxblack{
-    border: 1px solid black;
+    border: 1px solid white;
   }
   .novideo{
-    /*padding: 147px 0px 147px 0px;*/
-    /*display: block;*/
+    /*padding: 147px 0px 147px 0px;
+    display: block;*/
     line-height: calc((100vh - 120px)/2);
+    color: white;
   }
+  /*.nodeImg1{
+    background: url("//assets//qiye.png") no-repeat center,
+  }
+  .nodeImg2{
+    background: url("//assets//enterprises.png") no-repeat center,
+  }
+  .nodeImg3{
+    background: url("//assets//video.png") no-repeat center,
+  }*/
 </style>
 
 <script lang="ts">
@@ -78,7 +95,7 @@
   export default class VideoList extends Vue {
     @Provide() loading: Boolean = false;
     @Provide() playerWindow: String = "newplay1";
-    @Provide() flag:String = "";
+    @Provide() flag: number = 1;
     @Provide() treeData: any = [
       {
         enterpriseId: 0,
@@ -88,6 +105,11 @@
         childList: []
       }
     ];
+    @Provide() iconArrClass: any = [
+      "nodeImg1",
+      "nodeImg2",
+      "nodeImg3"
+    ];
     @Provide() treeProps: Object = {
       children: "childList",
       label: "name"
@@ -108,14 +130,18 @@
       that.treecheckedObj = node.data;
 
       if(node.level == "3"){
+        that.playerWindow = 'newplay' + that.flag;
         var player = new WasmPlayer(null, that.playerWindow, null, {Height: true});
-          console.log(that.playerWindow, node.data.deviceNumber)
+        // console.log(that.playerWindow, node.data.deviceNumber)
         player.play('http://27.128.189.137:10001/flv/hls/' + that.treecheckedObj.deviceNumber + '.flv', 1);
+        if(that.flag < 4) {
+          that.flag++;
+        }
       }
     }
     chooseWindow(data: any){
-        this.playerWindow = data;
       this.flag = data;
+      this.playerWindow = 'newplay' + this.flag;
     }
 
     created() {