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

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

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

web/src/store/modules/play.js

@@ -11,7 +11,7 @@ const actions = {
       })
     })
   },
-  stop({ commit }, [deviceId, channelId]) {
+  stop({ commit }, { deviceId, channelId }) {
     return new Promise((resolve, reject) => {
       stop(deviceId, channelId).then(response => {
         const { data } = response

web/src/views/device/channel/index.vue

@@ -422,7 +422,10 @@ export default {
       })
     },
     stopDevicePush: function(itemData) {
-      this.$store.dispatch('play/stop', [this.deviceId, itemData.deviceId]).then(data => {
+      this.$store.dispatch('play/stop', {
+        deviceId: this.deviceId,
+        channelId: itemData.deviceId
+      }).then(data => {
         this.initData()
       }).catch((error) => {
         if (error.response.status === 402) { // 已经停止过

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