Pre Merge pull request !43 from 阿斌/N/A

Signed-off-by: 阿斌 <38912748@qq.com>

web/src/views/common/jessibuca.vue

@@ -54,10 +54,12 @@ export default {
     }
   },
   created() {
-    const paramUrl = decodeURIComponent(this.$route.params.url)
+    if (this.$route.params.url) {
-    console.log(paramUrl)
+      const paramUrl = decodeURIComponent(this.$route.params.url)
-    if (!this.videoUrl && paramUrl) {
+      console.log(paramUrl)
-      this.videoUrl = paramUrl
+      if (!this.videoUrl) {
+        this.videoUrl = paramUrl
+      }
     }
     this.btnDom = document.getElementById('buttonsBox')
   },
@@ -217,6 +219,10 @@ export default {
       this.play(this.videoUrl)
     },
     play: function(url) {
+      if (!url) {
+        console.warn('Jessibuca -> invalid url, skip play')
+        return
+      }
       this.videoUrl = url
       console.log('Jessibuca -> url: ', url)
       if (!jessibucaPlayer[this._uid]) {

web/src/views/common/mediaInfo.vue

@@ -44,6 +44,9 @@ export default {
   },
   methods: {
     getMediaInfo: function() {
+      if (!this.app || !this.stream || !this.mediaServerId) {
+        return
+      }
       this.$store.dispatch('server/getMediaInfo', {
         app: this.app,
         stream: this.stream,
@@ -52,6 +55,7 @@ export default {
         .then(data => {
           this.info = data
         })
+        .catch(() => {})
     },
     startTask: function() {
       this.task = setInterval(this.getMediaInfo, 1000)

web/src/views/dialog/devicePlayer.vue

@@ -473,10 +473,13 @@ export default {
       this.mediaServerId = streamInfo.mediaServerId
       this.playFromStreamInfo(false, streamInfo)
     },
-    getUrlByStreamInfo() {
+    getUrlByStreamInfo(streamInfo) {
-      let streamInfo = this.streamInfo
+      streamInfo = streamInfo || this.streamInfo
-      if (this.streamInfo.transcodeStream) {
+      if (!streamInfo) {
-        streamInfo = this.streamInfo.transcodeStream
+        return ''
+      }
+      if (streamInfo.transcodeStream) {
+        streamInfo = streamInfo.transcodeStream
       }
       let videoUrl
       if (location.protocol === 'https:') {

web/src/views/map/index.vue

@@ -89,7 +89,7 @@
           <div class="infobox-content" v-if="channel">
             <el-descriptions class="margin-top" :title="channel.gbName" :column="1" :colon="true" size="mini" :labelStyle="labelStyle" >
               <el-descriptions-item label="编号" >{{channel.gbDeviceId}}</el-descriptions-item>
-              <el-descriptions-item label="生产厂商">{{channel.gbManufacture}}</el-descriptions-item>
+              <el-descriptions-item label="生产厂商">{{channel.gbManufacturer}}</el-descriptions-item>
               <el-descriptions-item label="安装地址" >{{channel.gbAddress == null?'未知': channel.gbAddress}}</el-descriptions-item>
             </el-descriptions>
             <div style="padding-top: 10px; margin: 0 auto; width: fit-content;">