修改登录和导航

src/layout/components/TagsView/index.vue

@@ -34,9 +34,9 @@ export default {
     visitedViews () {
       return this.$store.state.tagsView.visitedViews
     },
-    // routes() {
-    //   return this.$store.state.permission.routes
-    // }
+    routes () {
+      return this.$store.state.user.roles
+    }
   },
   watch: {
     $route () {
@@ -51,10 +51,12 @@ export default {
       }
     }
   },
-  mounted () {
-    this.initTags()
-    this.addTags()
-    this.beforeUnload()
+  created () {
+    if (this.routes && this.routes.length) {
+      this.initTags()
+      this.addTags()
+      this.beforeUnload()
+    }
   },
   methods: {
     beforeUnload () {

src/layout/index.vue

@@ -16,7 +16,10 @@
     <Dialog width="496px" customClass="dataStoreInfoDialog" :flag="pwdflag">
       <div class="dialog-public-background">
         <div class="title">修改密码</div>
-        <div class="message"><span class="el-icon-s-opportunity mg"></span>密码长度:{{PwdLengthBegin}}-{{PwdLengthEnd}}位字符；密码规则:必须包含{{PwdMessage}}</div>
+        <div class="message">
+          <div class="m1"><span class="el-icon-s-opportunity mg"></span>密码长度：{{PwdLengthBegin}}-{{PwdLengthEnd}}位字符</div>
+          <div class="m2">密码规则：必须包含{{PwdMessage}}</div>
+        </div>
         <div class="content">
           <el-form :model="dataForm" :rules="dataRules" ref="dataForm" class="demo-dataForm">
             <el-form-item label="旧密码" prop="old">
@@ -184,13 +187,24 @@ export default {
           display: none;
         }
       }
+      .content {
+        margin-top: 70px;
+      }
       .message {
         position: absolute;
         top: 85px;
+        color: #333;
+        font-weight: 500;
         .mg {
           margin-right: 8px;
           color: #e6a23c;
         }
+        .m1 {
+          margin-bottom: 8px;
+        }
+        .m2 {
+          padding-left: 22px;
+        }
       }
     }
   }

src/store/modules/user.js

@@ -110,6 +110,7 @@ const actions = {
         removeToken('codeToken');
         removeToken('systemSet');
         removeToken('FirstLogin');
+        removeToken('userAuthList');
         resetRouter();
         commit('RESET_STATE');
         commit('SET_ROLES', []);

src/views/dashboard/index.vue

@@ -191,6 +191,41 @@ export default {
         this.inputFlag = false
       }
     },
+    paramsType (t, num, url, name) {
+      let type = 'application/json'
+      let result = ''
+      if (t == 'json') {
+        type = 'application/json'
+      }
+      if (num == 1) {
+        result = axios.get(url, {
+          params: {
+            [name]: sessionStorage.getItem('userName'),
+          },
+          data: {
+            unused: 0 //解决请求头无Content-Type
+          },
+          headers: {
+            'token': sessionStorage.getItem('token'),
+            'Content-Type': type
+          }
+        })
+      } else {
+        result = axios.post(url, {
+          [name]: sessionStorage.getItem('userName')
+        }, {
+          headers: {
+            'token': sessionStorage.getItem('token'),
+            'Content-Type': type
+          }
+        })
+      }
+      result.then(res => {
+        console.log(res)
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     //应用跳转
     toApp (item) {
       if (item.appUrl) {
@@ -198,42 +233,31 @@ export default {
         const datas = item.inputs
         const arrs = []
         if (datas && datas.length) {
-          datas.forEach(item => {
-            const obj = {}
-            if (item.AppInputName == 'token' || item.AppInputName == 'Token' || item.AppInputName == 'TOKEN') {
-              obj[item.AppInputName] = sessionStorage.getItem('token')
-            } else if (item.AppInputName == 'loginName' || item.AppInputName == 'userName') {
-              obj[item.AppInputName] = sessionStorage.getItem('userName')
-            }
-            arrs.push(obj)
-          })
+          const [a1, a2] = [...datas]
           if (item.requestType == 1) {
-            const getParams = Object.assign(...arrs)
-            axios.get(item.appUrl, {
-              params: getParams
-            }).then(res => {
-              console.log(res)
-            }).catch(err => {
-              console.log(err)
-            })
-          } else if (item.requestType == 2) {
-            const bodyType = item.bodyType
-            let type = 'application/json'
-            if (bodyType == 'json') {
-              type = 'application/json'
+            if (a1.AppInputName == 'token' && a1.AppInputSite == 'Header' && a2.AppInputSite == 'Body') {
+              this.paramsType(item.bodyType, item.requestType, item.appUrl, a2.AppInputName)
+            } else {
+              datas.forEach(item => {
+                const obj = {}
+                if (item.AppInputName == 'token' || item.AppInputName == 'Token' || item.AppInputName == 'TOKEN') {
+                  obj[item.AppInputName] = sessionStorage.getItem('token')
+                } else if (item.AppInputName == 'loginName' || item.AppInputName == 'userName') {
+                  obj[item.AppInputName] = sessionStorage.getItem('userName')
+                }
+                arrs.push(obj)
+              })
+              const getParams = Object.assign(...arrs)
+              axios.get(item.appUrl, {
+                params: getParams
+              }).then(res => {
+                console.log(res)
+              }).catch(err => {
+                console.log(err)
+              })
             }
-            axios.post(item.appUrl, {
-              userName: sessionStorage.getItem('userName')
-            }, {
-              headers: {
-                'token': sessionStorage.getItem('token'),
-                'Content-Type': type
-              }
-            }).then(res => {
-              console.log(res)
-            }).catch(err => {
-              console.log(err)
-            })
+          } else if (item.requestType == 2) {
+            this.paramsType(item.bodyType, item.requestType, item.appUrl, a2.AppInputName)
           }
         }
       }

src/views/login/index.vue

@@ -159,7 +159,7 @@ export default {
                       arrs.push('dashboard'); //进入首页手动添加权限
                       setToken('userAuthList', arrs);
                       this.$store.dispatch('user/setPowerList', arrs);
-                      this.$router.push({ path: this.redirect || "/" });
+                      this.$router.push({ path: '/dashboard' || "/" });
                     } else {
                       setToken('userAuthList', []);
                       this.$store.dispatch('user/setPowerList', []);

src/views/noPower/index.vue

@@ -11,7 +11,10 @@
     <Dialog width="496px" customClass="dataStoreInfoDialog" :flag="pwdflag">
       <div class="dialog-public-background">
         <div class="title">修改密码</div>
-        <div class="message"><span class="el-icon-s-opportunity mg"></span>密码长度:{{PwdLengthBegin}}-{{PwdLengthEnd}}位字符；密码规则:必须包含{{PwdMessage}}</div>
+        <div class="message">
+          <div class="m1"><span class="el-icon-s-opportunity mg"></span>密码长度：{{PwdLengthBegin}}-{{PwdLengthEnd}}位字符</div>
+          <div class="m2">密码规则：必须包含{{PwdMessage}}</div>
+        </div>
         <div class="content">
           <el-form :model="dataForm" :rules="dataRules" ref="dataForm" class="demo-dataForm">
             <el-form-item label="旧密码" prop="old">
@@ -189,13 +192,24 @@ export default {
           display: none;
         }
       }
+      .content {
+        margin-top: 70px;
+      }
       .message {
         position: absolute;
         top: 85px;
+        color: #333;
+        font-weight: 500;
         .mg {
           margin-right: 8px;
           color: #e6a23c;
         }
+        .m1 {
+          margin-bottom: 8px;
+        }
+        .m2 {
+          padding-left: 22px;
+        }
       }
     }
   }

src/views/organizationManagement/components/organizationEdit.vue

@@ -24,8 +24,8 @@
             </el-form-item>
             <el-form-item prop="id" label="组织类型">
               <el-select v-model="form.id" placeholder="请选择">
-                <el-option label="集团内" :value="1"></el-option>
-                <el-option label="集团外" :value="0"></el-option>
+                <el-option label="集团内" value="1"></el-option>
+                <el-option label="集团外" value="0"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="描述">