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

还有以下一处需要修改web\src\layout\components\dialog\changePassword.vue

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

web/src/views/cloudRecord/cloudRecordPlayer.vue

@@ -295,6 +295,7 @@ export default {
       } else {
         this.videoUrl = streamInfo['ws_flv']
       }
+      console.log(location.protocol)
       this.streamInfo = streamInfo
       this.timeLen = timeLen
       this.startTime = startTime

web/src/views/common/jessibuca.vue

@@ -5,7 +5,7 @@
     @dblclick="fullscreenSwich"
   >
     <div style="width:100%; padding-top: 56.25%; position: relative;" />
-    <div id="buttonsBox" class="buttons-box" v-if="typeof showButton == 'undefined' || showButton">
+    <div id="buttonsBox" class="buttons-box" >
       <div class="buttons-box-left">
         <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick" />
         <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause" />
@@ -55,19 +55,24 @@ export default {
     }
   },
   watch: {
-    videoUrl: {
-      handler(val, _) {
-        this.$nextTick(() => {
-          this.play(val)
-        })
-      },
-      immediate: true
-    }
+    // videoUrl: {
+    //   handler(val, _) {
+    //     if (typeof val !== 'undefined' && val !== 'undefined') {
+    //       console.log(22222111)
+    //       console.log(val)
+    //       this.$nextTick(() => {
+    //
+    //         this.play(val)
+    //       })
+    //     }
+    //   },
+    //   immediate: true
+    // }
   },
   created() {
     const paramUrl = decodeURIComponent(this.$route.params.url)
     this.$nextTick(() => {
-      if (typeof (this.videoUrl) === 'undefined') {
+      if (typeof (this.videoUrl) === 'undefined' || typeof (paramUrl) !== 'undefined') {
         this.videoUrl = paramUrl
       }
       this.btnDom = document.getElementById('buttonsBox')
@@ -89,16 +94,21 @@ export default {
       if (jessibucaPlayer[this._uid]) {
         jessibucaPlayer[this._uid].destroy()
       }
+      console.log(1111)
+      console.log(this.$refs.container.dataset['jessibuca'])
+      if (this.$refs.container.dataset['jessibuca']) {
         this.$refs.container.dataset['jessibuca'] = undefined
+      }
+
       if (this.$refs.container.getAttribute('data-jessibuca')) {
         this.$refs.container.removeAttribute('data-jessibuca')
       }
       const options = {
         container: this.$refs.container,
         videoBuffer: 0,
-        isResize: false,
+        isResize: true,
         useMSE: true,
-        useWCS: true,
+        useWCS: false,
         text: '',
         // background: '',
         controlAutoHide: false,
@@ -144,20 +154,19 @@ export default {
       jessibucaPlayer[this._uid] = new window.Jessibuca(options)
 
       const jessibuca = jessibucaPlayer[this._uid]
-      const _this = this
       jessibuca.on('pause', () => {
-        _this.playing = false
+        this.playing = false
         this.$emit('playStatusChange', false)
       })
       jessibuca.on('play', () => {
-        _this.playing = true
+        this.playing = true
         this.$emit('playStatusChange', true)
       })
       jessibuca.on('fullscreen', (msg) => {
-        _this.fullscreen = msg
+        this.fullscreen = msg
       })
       jessibuca.on('mute', (msg) => {
-        _this.isNotMute = !msg
+        this.isNotMute = !msg
       })
       jessibuca.on('performance', (performance) => {
         let show = '卡顿'
@@ -166,10 +175,10 @@ export default {
         } else if (performance === 1) {
           show = '流畅'
         }
-        _this.performance = show
+        this.performance = show
       })
       jessibuca.on('kBps', (kBps) => {
-        _this.kBps = Math.round(kBps)
+        this.kBps = Math.round(kBps)
       })
       jessibuca.on('videoInfo', (msg) => {
         console.log('Jessibuca -> videoInfo: ', msg)
@@ -193,13 +202,17 @@ export default {
         console.log('Jessibuca -> playToRenderTimes: ', msg)
       })
       jessibuca.on('timeUpdate', (videoPTS) => {
-        console.log(videoPTS)
         if (jessibuca.videoPTS) {
           this.playerTime += (videoPTS - jessibuca.videoPTS)
           this.$emit('playTimeChange', this.playerTime)
         }
         jessibuca.videoPTS = videoPTS
       })
+      jessibuca.on('play', () => {
+        this.playing = true
+        this.loaded = true
+        this.quieting = jessibuca.quieting
+      })
     },
     playBtnClick: function(event) {
       this.play(this.videoUrl)
@@ -210,18 +223,18 @@ export default {
         this.destroy()
       }
       this.create()
-      jessibucaPlayer[this._uid].on('play', () => {
-        this.playing = true
-        this.loaded = true
-        this.quieting = jessibuca.quieting
-      })
-      if (jessibucaPlayer[this._uid].hasLoaded()) {
+      this.$nextTick(() => {
         jessibucaPlayer[this._uid].play(url)
+
+        if (jessibucaPlayer[this._uid].hasLoaded()) {
+          // jessibucaPlayer[this._uid].play(url)
         } else {
           jessibucaPlayer[this._uid].on('load', () => {
-          jessibucaPlayer[this._uid].play(url)
+            // jessibucaPlayer[this._uid].play(url)
           })
         }
+      })
+
     },
     pause: function() {
       if (jessibucaPlayer[this._uid]) {

web/src/views/dialog/changePasswordForAdmin.vue

@@ -13,10 +13,10 @@
       <div id="shared" style="margin-right: 20px;">
         <el-form ref="passwordForm" :rules="rules" status-icon label-width="80px">
           <el-form-item label="新密码" prop="newPassword">
-            <el-input v-model="newPassword" autocomplete="off" />
+            <el-input v-model="newPassword" autocomplete="off" type="password" />
           </el-form-item>
           <el-form-item label="确认密码" prop="confirmPassword">
-            <el-input v-model="confirmPassword" autocomplete="off" />
+            <el-input v-model="confirmPassword" autocomplete="off" type="password" />
           </el-form-item>
 
           <el-form-item>
@@ -88,6 +88,14 @@ export default {
       }
     },
     onSubmit: function() {
+      if (this.newPassword !== this.confirmPassword) {
+        this.$message({
+          showClose: true,
+          message: '两次输入密码不一致！',
+          type: 'error'
+        })
+        return
+      }
       this.$store.dispatch('user/changePasswordForAdmin', {
         password: this.newPassword,
         userId: this.form.id

web/src/views/dialog/devicePlayer.vue

@@ -21,12 +21,11 @@
           @tab-click="changePlayer"
         >
           <el-tab-pane label="Jessibuca" name="jessibuca">
-            <div style="height: 22.5vw">
             <jessibucaPlayer
+              style="height: 22.5vw"
               v-if="activePlayer === 'jessibuca'"
               ref="jessibuca"
               :visible.sync="showVideoDialog"
-                :video-url="videoUrl"
               :error="videoError"
               :message="videoError"
               :has-audio="hasAudio"
@@ -34,7 +33,6 @@
               autoplay
               live
             />
-            </div>
 
           </el-tab-pane>
           <el-tab-pane label="WebRTC" name="webRTC">
@@ -427,7 +425,6 @@ export default {
       console.log(this.player[tab.name][0])
       this.activePlayer = tab.name
       this.videoUrl = this.getUrlByStreamInfo()
-      console.log(this.videoUrl)
     },
     openDialog: function(tab, deviceId, channelId, param) {
       if (this.showVideoDialog) {
@@ -470,22 +467,23 @@ export default {
       this.playFromStreamInfo(false, streamInfo)
     },
     getUrlByStreamInfo() {
-      console.log(this.streamInfo)
       let streamInfo = this.streamInfo
       if (this.streamInfo.transcodeStream) {
         streamInfo = this.streamInfo.transcodeStream
       }
+      let videoUrl
       if (location.protocol === 'https:') {
-        this.videoUrl = streamInfo[this.player[this.activePlayer][1]]
+        videoUrl = streamInfo[this.player[this.activePlayer][1]]
       } else {
-        this.videoUrl = streamInfo[this.player[this.activePlayer][0]]
+        videoUrl = streamInfo[this.player[this.activePlayer][0]]
       }
-      return this.videoUrl
+      return videoUrl
     },
 
     playFromStreamInfo: function(realHasAudio, streamInfo) {
       this.showVideoDialog = true
       this.hasaudio = realHasAudio && this.hasaudio
+      console.log(66666666)
       if (this.$refs[this.activePlayer]) {
         this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
       } else {