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

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

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

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

数据库/2.7.4/更新-mysql-2.7.4.sql

@@ -36,6 +36,7 @@ create table IF NOT EXISTS wvp_jt_channel (
 /*
 * 20250708
 */
+DROP PROCEDURE IF EXISTS `wvp_20250708`;
 DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250708`()
 BEGIN
@@ -52,6 +53,7 @@ DROP PROCEDURE wvp_20250708;
 /*
 * 20250917
 */
+DROP PROCEDURE IF EXISTS `wvp_20250917`;
 DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250917`()
 BEGIN
@@ -74,6 +76,7 @@ DROP PROCEDURE wvp_20250917;
 /*
 * 20250924
 */
+DROP PROCEDURE IF EXISTS `wvp_20250924`;
 DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250924`()
 BEGIN
@@ -103,6 +106,7 @@ DROP PROCEDURE wvp_20250924;
 /*
 * 20251027
 */
+DROP PROCEDURE IF EXISTS `wvp_20251027`;
 DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20251027`()
 BEGIN
@@ -119,6 +123,7 @@ DROP PROCEDURE wvp_20251027;
 /*
 * 20251101
 */
+DROP PROCEDURE IF EXISTS `wvp_20251101`;
 DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20251101`()
 BEGIN
@@ -137,6 +142,7 @@ DROP PROCEDURE wvp_20251101;
 /*
 * 202601025
 */
+DROP PROCEDURE IF EXISTS `wvp_202601025`;
 DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_202601025`()
 BEGIN
@@ -171,6 +177,7 @@ create table IF NOT EXISTS wvp_alarm (
 /*
 * 20260417 将wvp_device_mobile_position从专属国标的位置记录表，改为通用通道共用的位置记录表
 */
+DROP PROCEDURE IF EXISTS `wvp_20260417`;
 DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20260417`()
 BEGIN
@@ -215,6 +222,7 @@ DROP PROCEDURE wvp_20260417;
 /*
 * 20260521 添加wvp_device_channel唯一约束，防止通道重复写入
 */
+DROP PROCEDURE IF EXISTS `wvp_20260521`;
 DELIMITER //
 CREATE PROCEDURE `wvp_20260521`()
 BEGIN