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

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

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

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

@@ -360,7 +360,15 @@ export default {
           setTimeout(() => {
             this.initData()
           }, 1000)
-        }).finally(() => {
+        })
+        .catch((error) => {
+          console.log(error)
+          this.$message.error({
+            showClose: true,
+            message: error
+          })
+        })
+        .finally(() => {
           itemData.playLoading = false
         })
     },

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/chooseTimeRange.vue

@@ -12,8 +12,9 @@
       @close="close()"
     >
       <div style="width:fit-content; margin: 0 auto">
-        <el-time-picker
+        <el-date-picker
           v-model="timeRange"
+          type="datetimerange"
           is-range
           range-separator="至"
           start-placeholder="开始时间"
@@ -31,8 +32,13 @@
 
 <script>
 
+import elDragDialog from '@/directive/el-drag-dialog'
+
 export default {
   name: 'ChooseDateTimeRange',
+  directives: {
+    elDragDialog
+  },
   props: {},
   data() {
     return {