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

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

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

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -1148,6 +1148,15 @@ public class SIPCommander implements ISIPCommander {
                 if (code == ErrorCode.SUCCESS.getCode() && data instanceof Element) {
                     Element responseElement = (Element) data;
                     Element configElement = responseElement.element(configType);
+                    if (configElement == null) {
+                        // 兼容部分宇视设备ElementName和configType不一致的情况
+                        for (Element child : responseElement.elements()) {
+                            if (child.element("Item") != null) {
+                                configElement = child;
+                                break;
+                            }
+                        }
+                    }
                     if (configElement != null) {
                         try {
                             T result = configClass.getDeclaredConstructor().newInstance();

web/src/views/user/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