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

修复录制计划-编辑时的回显加载问题

src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java

@@ -95,8 +95,10 @@ public class SSRCFactory {
     }
 
     void rebuild() {
+        try {
             List<MediaServer> servers = mediaServerService.getAll();
             for (MediaServer server : servers) {
+                try {
                     if (server.isRtpEnable() && userSetting.getSsrcRandom()) {
                         continue;
                     }
@@ -120,10 +122,6 @@ public class SSRCFactory {
                                     } catch (NumberFormatException ignored) {
                                     }
                                 }
-                    }
-                } catch (Exception e) {
-                    log.warn("[SSRC重建] 查询媒体节点 {} 失败: {}", server.getId(), e.getMessage());
-                }
                                 usedMap.put(server.getId(), bits);
                                 if (count > 8000) {
                                     log.info("[SSRC重建] 媒体节点 {} 的SSRC使用率已超过80%，请注意扩展服务提升性能", server.getId());
@@ -132,6 +130,17 @@ public class SSRCFactory {
                                     log.debug("[SSRC重建] 节点 {} 已占用 {} 个SSRC", server.getId(), count);
                                 }
                             }
+                        } catch (Exception e) {
+                            log.warn("[SSRC重建] 查询媒体节点 {} 失败: {}", server.getId(), e.getMessage());
+                        }
+
+                    }
+                }catch (Exception e) {
+                    log.warn("[SSRC重建] 处理媒体节点 {} 失败: {}", server.getId(), e.getMessage());
+                }
+            }
+        }catch (Exception e) {
+            log.error("[SSRC] 重建SSRC失败", e);
         }
     }
 }

web/src/views/common/weekTimePicker.vue

@@ -148,10 +148,17 @@ export default {
     }
   },
   watch: {
-    planArray: function(array) {
+    planArray: {
+      handler(array) {
+        if (!array || !array.length) {
+          return
+        }
         for (let i = 0; i < array.length; i++) {
           this.weekData[i].data = array[i].data
         }
+      },
+      deep: true,
+      immediate: true
     }
   },
   created() {

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