Merge pull request '1' (#141) from pc-master into portal

Reviewed-on: #141

src/router/index.js

@@ -90,6 +90,10 @@ const routes = [
       path: '/systemManage',
       name: 'systemManage',
       component: () => import('../views/page/systemManage.vue')
+    },{
+      path: '/manage',
+      name: 'manage',
+      component: () => import('../views/manage/index.vue')
     },  {
       path: '/control',
       name: 'control',

src/views/index.vue

@@ -25,7 +25,7 @@
             </div>
         </div>
         <div class="index-content">
-            <div class="left collapse">
+            <div class="left collapse" v-if="routerNow!='manage'">
                 <el-collapse v-model="activeNames">
                     <template v-for="item, index in leftList">
                         <el-collapse-item :name="index + 1" :key="index" v-if="!item.isRouter">
@@ -50,6 +50,9 @@
 
                 </el-collapse>
             </div>
+            <div class="left collapse" v-else>
+               管理
+            </div>
             <div class="right">
                 <router-view v-if="!loading"></router-view>
             </div>
@@ -76,7 +79,7 @@ export default {
                 { name: '数据分析', router: 'dataAnalysis', index: 1, routerList: ['dataAnalysis'], img: require('../assets/image/header-img4.png') },
                 // { name: '设备菜单', router: '', routerList: [], img: require('../assets/image/header-img5.png') },
                 //systemManage systemManage
-                { name: '管理', router: '', routerList: [''], img: require('../assets/image/header-img6.png') },
+                { name: '管理', router: 'manage', routerList: ['manage'], img: require('../assets/image/header-img6.png') },
 
                 { name: '大数据', router: 'largeScreen', routerList: ['largeScreen'], img: require('../assets/image/header-img8.png') }
             ],

src/views/manage/index.vue

@@ -0,0 +1,19 @@
+<template>
+    <div class="manage-index">
+        管理
+    </div>
+  </template>
+  <script>
+  export default {
+    data(){
+        return {}
+    },
+    mounted(){},
+    methods:{},
+  
+  }
+  </script>
+  <style lang="scss">
+  
+  </style>
+  

src/views/page/realTime.vue

@@ -81,8 +81,8 @@
                 <div class="left-view" v-if="deviceName != 30">
                     <div ref="monitor" class="monitor" id="monitor">
                         <!-- <video ref="videoPlayer" class="video-js" id="video-js"></video> -->
-                        <img v-if="imgUrl" style="width: 100%;height: 100%;" :src="imgUrl" alt="">
+                        <img  style="width: 100%;height: 100%;" :src="imgUrl" alt="">
-                        <div v-else ref="videoPlayer" class="video-js" id="video-js"></div>
+                        <!-- <div v-else ref="videoPlayer" class="video-js" id="video-js"></div> -->
                     </div>
                 </div>
                 <div class="right" id="realTime-line"></div>
@@ -1024,21 +1024,22 @@ export default {
                     cameraid: nowDevice.cameraSerialNumber,
                     channelid: nowDevice.cameraChannelNumber
                 }
-
+                this.imgUrl = nowDevice.hls
                 //当前没有设备 默认写死 后续有数据需要改回去
                 // var data2 = {
                 //     cameraid: 'L18357958',
                 //     channelid: '1'
                 // }
                 if (!this.player) {
-                    this.api.getGethls(data2).then(res => {
+                 
-                        if (res.data.code == 200) {
+                    // this.api.getGethls(data2).then(res => {
-                            this.url = res.data.data.ezopen
+                    //     if (res.data.code == 200) {
-                            this.createVideoNew(res.data.data.accesstoken)
+                    //         this.url = res.data.data.ezopen
-                        } else {
+                    //         this.createVideoNew(res.data.data.accesstoken)
-                            this.imgUrl = nowDevice.hls
+                    //     } else {
-                        }
+                        // this.imgUrl = nowDevice.hls
-                    })
+                    //     }
+                    // })
                 }
 
             } else if (this.deviceName == 10) {
@@ -1143,22 +1144,23 @@ export default {
                     cameraid: nowDevice.cameraSerialNumber,
                     channelid: nowDevice.cameraChannelNumber
                 }
-
+                this.imgUrl = nowDevice.hls
                 //当前没有设备 默认写死 后续有数据需要改回去
                 // var data2 = {
                 //     cameraid: 'L18357958',
                 //     channelid: '1'
                 // }
                 if (!this.player) {
-                    this.api.getGethls(data2).then(res => {
+                    // this.imgUrl = nowDevice.hls
-                        // console.log(res.data, 11);
+                    // this.api.getGethls(data2).then(res => {
-                        if (res.data.code == 200) {
+                    //     // console.log(res.data, 11);
-                            this.url = res.data.data.ezopen
+                    //     if (res.data.code == 200) {
-                            this.createVideoNew(res.data.data.accesstoken)
+                    //         this.url = res.data.data.ezopen
-                        } else {
+                    //         this.createVideoNew(res.data.data.accesstoken)
-                            this.imgUrl = nowDevice.hls
+                    //     } else {
-                        }
+                    //         this.imgUrl = nowDevice.hls
-                    })
+                    //     }
+                    // })
                 }
             } else if (this.deviceName == 30) {
                 this.api.getControlRtDatastation(formData).then(res => {