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

修复预置位列表查询仅返回10条数据的问题

src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java

@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.DelayQueue;
 import java.util.concurrent.TimeUnit;
 
+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getInteger;
 import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
 
 /**
@@ -81,7 +82,8 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
                 }
                 return;
             }
-            int num = Integer.parseInt(presetListNumElement.attributeValue("Num"));
+        	Integer sumNum = getInteger(rootElement, "SumNum");
+        	int	num = sumNum == null ? Integer.parseInt(presetListNumElement.attributeValue("Num")) : sumNum.intValue();
             List<Preset> presetQuerySipReqList = new ArrayList<>();
             if (num > 0) {
                 for (Iterator<Element> presetIterator = presetListNumElement.elementIterator(); presetIterator.hasNext(); ) {
@@ -102,7 +104,7 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
                 }
             }
             String sn = getText(element, "SN");
-            addCatch(cmdType + "_" + sn, num,  rootElement, presetQuerySipReqList);
+            addCatch(cmdType + "_" + sn, num, rootElement, presetQuerySipReqList);
             try {
                 responseAck(request, Response.OK);
             } catch (InvalidArgumentException | ParseException | SipException e) {

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