Pre Merge pull request !34 from WangXuewen/master

web/src/api/server.js

@@ -24,13 +24,13 @@ export function getMediaServer(id) {
 }
 
 export function checkMediaServer(params) {
-  const { ip, port, secret, type } = params
+  const { ip, httpPort, secret, type } = params
   return request({
     method: 'get',
     url: `/api/server/media_server/check`,
     params: {
       ip: ip,
-      port: port,
+      port: httpPort,
       secret: secret,
       type: type
     }

web/src/views/common/h265web.vue

@@ -208,15 +208,15 @@ export default {
     unPause: function() {
       if (h265webPlayer[this._uid]) {
         h265webPlayer[this._uid].play()
+        this.playing = h265webPlayer[this._uid].isPlaying()
       }
-      this.playing = h265webPlayer[this._uid].isPlaying()
       this.err = ''
     },
     pause: function() {
       if (h265webPlayer[this._uid]) {
         h265webPlayer[this._uid].pause()
+        this.playing = h265webPlayer[this._uid].isPlaying()
       }
-      this.playing = h265webPlayer[this._uid].isPlaying()
       this.err = ''
     },
     mute: function() {

web/src/views/dialog/MediaServerEdit.vue

@@ -11,7 +11,7 @@
       @close="close()"
     >
       <div id="formStep" style="margin-top: 1rem; margin-right: 20px;">
-        <el-form v-if="currentStep == 1" ref="mediaServerForm" :rules="rules" :model="mediaServerForm" label-width="140px">
+        <el-form v-if="currentStep === 1" ref="mediaServerForm" :rules="rules" :model="mediaServerForm" label-width="140px">
           <el-form-item label="IP" prop="ip">
             <el-input v-model="mediaServerForm.ip" placeholder="媒体服务IP" clearable :disabled="mediaServerForm.defaultServer" />
           </el-form-item>
@@ -237,7 +237,7 @@ export default {
     },
     checkServer: function() {
       this.serverCheck = 0
-      this.$store.dispatch("server/checkMediaServer", this.mediaServerForm)
+      this.$store.dispatch('server/checkMediaServer', this.mediaServerForm)
         .then(data => {
           if (parseInt(this.mediaServerForm.httpPort) !== parseInt(data.httpPort)) {
             this.$message({