Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

src/constant/user.js

@@ -9,6 +9,10 @@ export const HTTP_STATUS = {message: "服务请求失败", code:9004};
 /**
  * 邮件系统
  */
+// export const MAIL_ADDRESS = "http://6.1.22.93:8000";
+// export const MAIL_MANAGER_ADDRESS = "http://6.1.22.93:8010";
+// export const MAIL_DOMAIN = "zyyt.com"
+
 export const MAIL_ADDRESS = "http://192.168.168.100:8000";
 export const MAIL_MANAGER_ADDRESS = "http://192.168.168.100:8010";
 export const MAIL_DOMAIN = "zyyt.com"
\ No newline at end of file

src/router/index.js

@@ -37,10 +37,6 @@ const constantRoutes = [{
     path: '/homepage',
     name: '模块页面',
     component: () => import('../view/homepage.vue')
-}, {
-    path: '/visualizing',
-    name: '大屏展示',
-    component: () => import('../view/visualizing.vue')
 }, {
     path: '/chatRoom',
     name: '学习训练平台',

src/store/actions.js

@@ -15,7 +15,7 @@ const actions = {
         })
         .catch(err => {
           console.log(err);
-          if (err instanceof Object && (err.code == 9003 || err.code == 9009)) {
+          if (err instanceof Object && (err.code == 9040 || err.code == 9041 || err.code == 9042)) {
             reject(err);
           } else {
             let homeRoute = generateHomeRoute([]);

src/view/home.vue

@@ -13,7 +13,7 @@
                     v-text="item.name">
                 </div>
             </div>
-            <h1><span>业务辅助分析系统</span></h1>
+            <h1><span>东部战区心理战训练系统</span></h1>
             <div class="home-date">
                 <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
                 <span class="week" v-text="myDate.week"></span>
@@ -136,7 +136,7 @@ export default {
                 // this.activeIndex = key + "";
                 this.$store.commit("activeIndex", key + "");
             } else {
-                window.open('#/visualizing');
+                // window.open('#/visualizing');
             }
         },
         handleCommand(command) {
@@ -219,7 +219,7 @@ export default {
                 // this.activeIndex = key + "";
                 this.$store.commit("activeIndex", index + "");
             } else {
-                window.open('#/visualizing');
+                // window.open('#/visualizing');
             }
         }
     },

src/view/homepage.vue

 <template>
     <div class="homepage">
         <div class="header">
-            <h1><span>业务辅助分析系统</span></h1>
+            <h1><span>东部战区心理战训练系统</span></h1>
             <div>
                 <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
                 <span class="week" v-text="myDate.week"></span>

src/view/login.vue

 <template>
   <div class="login">
     <div class="login-head">
-      <h1><span>业务辅助分析系统</span></h1>
+      <h1><span>东部战区心理战训练系统</span></h1>
       <div>
         <span class="date" v-text="myDate.day"></span>&emsp;&emsp;
         <span class="week" v-text="myDate.week"></span>
@@ -115,7 +115,7 @@ export default {
     }
   },
   activated() {
-    if (this.$route.params.code == 9003 || this.$route.params.code == 9009 || this.$route.params.code == 9008) {
+    if (this.$route.params.code == 9040 || this.$route.params.code == 9041 || this.$route.params.code == 9042) {
       this.$message({
         showClose: true,
         message: this.$route.params.message,

src/view/user/yhgl.vue

@@ -442,7 +442,8 @@ export default {
       this.index = index;
     },
     addNew() {
-      this.new_user = {};
+      //需要注意的是此处尽量不用直接赋值{}，会导致watch里面属性的时候出现无法输入的情况
+      Object.keys(this.new_user).forEach(key => this.new_user[key] = null);
       this.type = "add";
       this.centerDialogVisible = true;
     },
@@ -519,67 +520,58 @@ export default {
         });
     },
     submit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          startLoading();
-          post("api/rest/system/user/register", this.new_user)
-            .then(res => {
-              if (res != 1) {
-                return Promise.reject({ message: "用户新增失败" });
-              } else if (this.new_user.mail) {
-                return addUser({
-                  password: this.new_user.password,
-                  email: this.new_user.mail,
-                  uname: this.new_user.username,
-                  tel: this.new_user.telephone
-                });
-              } else {//没有输入邮箱
-                return Promise.resolve();
-              }
-            })
-            .then((data) => {
-              this.$message.success("新增成功！");
-              this.centerDialogVisible = false;
-              //再次查询用户名  重新赋值
-              this.queryUser();
-              endLoading();
-            })
-            .catch((err) => {
-              this.$message.warning(err.message);
-              endLoading();
-            });
+      startLoading();
+      this.$refs[formName].validate().then(res => {
+        if (this.new_user.mail) {
+          return addUser({
+            password: this.new_user.password,
+            email: this.new_user.mail,
+            uname: this.new_user.username,
+            tel: this.new_user.telephone
+          });
+        } else {//没有输入邮箱
+          return Promise.resolve();
+        }
+      }).then(res => {
+        post("api/rest/system/user/register", this.new_user)
+      }).then(res => {
+        this.$message.success("新增成功！");
+        this.centerDialogVisible = false;
+        //再次查询用户名  重新赋值
+        this.queryUser();
+        endLoading();
+      }).catch(err => {
+        endLoading();
+        if (typeof err == "boolean") {
+          this.$message.warning("数据验证失败");
         } else {
-          return false;
+          this.$message.warning(err.message);
         }
       });
     },
     submit_edit(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          post("api/rest/system/user/updateUser", this.edit_user)
-            .then(res => {
-              if (res != 1) {
-                return Promise.reject({ message: "用户新增失败" });
-              } else if (this.edit_user.mail) {
-                return addUser({
-                  password: "3z111111",
-                  email: this.edit_user.mail,
-                  uname: this.edit_user.username,
-                  tel: this.edit_user.telephone
-                });
-              } else {
-                return Promise.resolve();
-              }
-            })
-            .then((data) => {
-              this.$message.success("修改成功！");
-              (this.centerDialogVisible = false), this.queryUser();
-            })
-            .catch((err) => {
-              this.$message.warning(err.message);
-            });
+      this.$refs[formName].validate().then(res => {
+        if (this.edit_user.mail && !this.edit_user.mailReadOnly) {//本次编辑增加了邮箱（如果原本有邮箱则会设置只读）
+          return addUser({
+            password: "3z111111",
+            email: this.edit_user.mail,
+            uname: this.edit_user.username,
+            tel: this.edit_user.telephone
+          });
+        } else {//没有或者没有修改
+          return Promise.resolve();
+        }
+      }).then(res => {
+        res || (this.edit_user.mail = null); //没有注册邮箱此处设置为空
+        return post("api/rest/system/user/updateUser", this.edit_user);
+      }).then(res => {
+        this.$message.success("修改成功！");
+        (this.centerDialogVisible = false), this.queryUser();
+      }).catch(err => {
+        if (typeof err == "boolean") {
+          this.$message.warning("数据验证失败");
         } else {
-          return false;
+          this.$message.warning(err.message);
         }
       });
     },