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

Update 初始化-postgresql-kingbase-2.7.4.sql

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

数据库/2.7.4/初始化-postgresql-kingbase-2.7.4.sql

@@ -350,7 +350,7 @@ create table IF NOT EXISTS wvp_media_server
     record_path         character varying(255),
     record_day          integer               default 7,
     transcode_suffix    character varying(255),
-    server_id           character varying(50),
+    server_id           character varying(50)
 );
 COMMENT ON TABLE wvp_media_server IS '媒体服务器（如 ZLM）节点信息';
 COMMENT ON COLUMN wvp_media_server.id IS '媒体服务器ID';
@@ -931,7 +931,7 @@ create table IF NOT EXISTS wvp_alarm (
         latitude double precision,
         alarm_type integer,
         alarm_time bigint
-)
+);
 COMMENT ON COLUMN wvp_alarm.id IS '主键ID';
 COMMENT ON COLUMN wvp_alarm.channel_id IS '关联通道的数据库id';
 COMMENT ON COLUMN wvp_alarm.description IS '报警描述';