修改bug

public/index.html

@@ -202,6 +202,7 @@
     <script src="./html/jsencrypt.min.js"></script>
     <!-- 用于RSA加密 -->
     <script src="./html/jsWebControl-1.0.0.min.js"></script>
+    <script type="text/javascript" src="ckplayer3.0x/hls.js/hls.min.js"></script>
     <link type="text/css" rel="stylesheet" href="./ckplayer3.0x/css/ckplayer.css" />
     <script type="text/javascript" src="./ckplayer3.0x/js/ckplayer.js" charset="utf-8" data-name="ckplayer"></script>
     <!-- <script type="text/javascript" src="./ckplayer/ckplayer.js" charset="utf-8" data-name="ckplayer"></script> -->

src/views/bigscreen/index.vue

@@ -51,7 +51,7 @@ export default {
               params:'{"httpMethod":"POST","path":"/api/resource/v1/cameras","headers":{},"query":{},"parameter":{},"body":{"pageNo": 1,"pageSize": 5000,"treeCode": "0"},"contentType":"application/json;charset=UTF-8","mock":false,"appKey":"27794545","appSecret":"5Xi27Gl7JrbHHF1MpdaB"}'
             },
             staticCount:0,
-            dynamicCount:2,
+            dynamicCount:0,
             areaCount:0,
             maptypeBig:'1',
             iscommic:true,
@@ -81,7 +81,7 @@ export default {
              this.iscommic = !this.iscommic;
              if(!this.iscommic){
                      this.staticCount = 0;
-                     this.dynamicCount = 2;
+                     this.dynamicCount = 0;
                      this.areaCount = 0;
                      this.getvideoList()
                      this.getResource();

src/views/drone/index.vue

@@ -153,7 +153,7 @@ export default {
 
          },
          loadCkplayer(url){
-                        url = 'rtsp://39.104.22.45:30495/rtp/34020001001320000001_34020001001320000001'
+                        // url = 'rtsp://39.104.22.45:30495/rtp/34020001001320000001_34020001001320000001'
                         console.log(url);
                         url = this.Base64.encode(url);
                         console.log(url);
@@ -171,15 +171,15 @@ export default {
                             autoplay:true,
                             live:true,
                             overspread:true,//是否让视频铺满播放器
-                            html5m3u8:true,//m3u8-hls形式播放视频
+                            // html5m3u8:true,//m3u8-hls形式播放视频
+                            plug:'hls.js',//使用hls.js插件播放m3u8
                             // video: 'rtmp://58.200.131.2:1935/livetv/cctv1'//视频地址
                             video:data.data//视频地址
                             // video:'http://39.104.22.45:8089/rtp/34020001001320000001_34020001001320000001/hls.m3u8'
                             };
                             console.log(videoObject);
                             window.player = new ckplayer(videoObject);
-                            console.log(new ckplayer);
-                            console.log(new window.player);
+                          
                         })
                     },
          getDroneList() {

src/views/qdtl/incident/index.vue

@@ -58,7 +58,7 @@
                     <el-table-column label="相关图片" align="center" prop="detail" />
                     <el-table-column label="相关图片" align="center" class-name="small-padding fixed-width">
                                 <template slot-scope="scope">
-                                      {{getCount(scope.row.pics)}}
+                                      {{getCount(scope.row.pics)+getCount(scope.row.dealPics)}}
                                 </template>
                     </el-table-column>
                     <el-table-column label="上报人" align="center" prop="createByName" />
@@ -106,7 +106,7 @@
                                         margin-top:10rem">
                                <el-row type="flex" class="row-bg">
                                     <el-col :span="5"><div  style="float:right">区域:</div></el-col>
-                                    <el-col :span="19"><div style="padding-left:2rem">{{detailObj.area}}</div></el-col>
+                                    <el-col :span="19"><div style="padding-left:2rem">{{getAreaName(detailObj.area)}}</div></el-col>
                                </el-row>
                                 <el-row type="flex" class="row-bg" style="margin-top:2rem">
                                     <el-col :span="5"><div  style="float:right">位置:</div></el-col>
@@ -166,16 +166,16 @@
                                               <img :src='getImage()' style="width: 88.7rem;height: 50.7rem;"/>
                                     </div>
                                     <div v-if="detailObj.pics" style="display:flex; flex-direction: row;margin-top:3rem;padding-left:5rem">
-                                                <div v-for="(pic,index) in detailObj.pics.split(',')">
+                                                <div v-for="(pic,index) in detailObj.picList.split(',')">
                                                      <div :class='selectindex === index?"imgSelect":""' @click="selectImg(index)" style="margin-left:1rem">
                                                      <img :src='getImageUrl(pic)' style="width: 11.7rem;height: 8.7rem;"/>
                                                      </div>
                                                 </div>
-                                                <div v-for="(pic,index) in detailObj.dealPics.split(',')">
+                                                <!-- <div v-for="(pic,index) in detailObj.dealPics.split(',')">
                                                      <div :class='selectindex === index?"imgSelect":""' @click="selectImg(index)" style="margin-left:1rem">
                                                      <img :src='getImageUrl(pic)' style="width: 11.7rem;height: 8.7rem;"/>
                                                      </div>
-                                                </div>
+                                                </div> -->
                                     </div>
                            </div>
                    </el-col>
@@ -203,7 +203,8 @@ export default {
   dicts: ['tl_xun_area'],
   data() {
     return {
-
+      pageList:[],
+     
       picImage:'',
 
       detailObj:{},
@@ -288,9 +289,18 @@ export default {
             //console.log(index);
             //this.detailObj.index = index;
             this.selectindex=index;
-            this.picImage = this.detailObj.pics.split(',')[index];
+            this.picImage = this.detailObj.picList.split(',')[index];
+            console.log(this.picImage);
              //console.log(this.detailObj.index);
       },
+      getAreaName(id){
+            console.log(this.dict.type.tl_xun_area);
+            for(var index in this.dict.type.tl_xun_area){
+                     if(this.dict.type.tl_xun_area[index].value == id){
+                                    return this.dict.type.tl_xun_area[index].label
+                     }      
+            }
+      },
       getImage (){
             return process.env.VUE_APP_BASE_API+this.picImage
       },
@@ -301,7 +311,8 @@ export default {
             //console.log(obj);
             this.dialogVisible = true
             this.detailObj = obj
-            console.log(this.detailObj);
+            console.log(this.detailObj.dealPics);
+            this.detailObj.picList = this.detailObj.pics+','+this.detailObj.dealPics
             this.picImage = this.detailObj.pics.split(',')[0];
             this.selectindex = 0;
             console.log(this.picImage);

src/views/qdtl/video/video.vue

@@ -97,7 +97,7 @@ export default {
           children: [],
         },
         {
-          id: 2,
+          id: 100,
           label: "单兵",
           children: [],
         },
@@ -233,6 +233,7 @@ export default {
       });
     },
     loadNode(node, resolve) {
+      console.log(node)
       // if (node.level > 4) return resolve([]);
       if (node.level === 0) {
         return resolve(this.treedata);
@@ -241,7 +242,8 @@ export default {
         return resolve(this.treedata[0].children);
       }
 
-      if (node.id === 2 && node.level === 1) {
+      if (node.id != 1 && node.level === 1) {
+        console.log(this.treedata[0]);
         return resolve(this.treedata[1].children);
       }
       if (node.id === 1 && node.level === 1) {

src/views/qdtl/wrj/index.vue

@@ -194,7 +194,8 @@ export default {
               autoplay:true,
               live:true,
               overspread:true,//是否让视频铺满播放器
-              html5m3u8:true,//m3u8-hls形式播放视频
+              plug:'hls.js',//使用hls.js插件播放m3u8
+              // html5m3u8:true,//m3u8-hls形式播放视频
               // video: 'rtmp://58.200.131.2:1935/livetv/cctv1'//视频地址
               video:data.data//视频地址
               // video:'http://39.104.22.45:8089/rtp/34020001001320000001_34020001001320000001/hls.m3u8'