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

行政规划错误。江苏南通海门市，修改为海门区，浙江杭州删除下城区、江干区，新增钱塘区，临平区

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

src/main/resources/civilCode.csv

@@ -861,7 +861,7 @@
 320623,如东县,3206
 320681,启东市,3206
 320682,如皋市,3206
-320684,海门市,3206
+320684,海门区,3206
 320685,海安市,3206
 3207,连云港市,32
 320703,连云区,3207
@@ -918,8 +918,6 @@
 33,浙江省, 
 3301,杭州市,33
 330102,上城区,3301
-330103,下城区,3301
-330104,江干区,3301
 330105,拱墅区,3301
 330106,西湖区,3301
 330108,滨江区,3301
@@ -927,6 +925,8 @@
 330110,余杭区,3301
 330111,富阳区,3301
 330112,临安区,3301
+330113,临平区,3301
+330114,钱塘区,3301
 330122,桐庐县,3301
 330127,淳安县,3301
 330182,建德市,3301

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:') {