Merge branch 'master' of http://116.63.33.55/git/read_opc

chuanyi-admin/src/components/Breadcrumb/index.vue

@@ -56,6 +56,7 @@ export default {
       return toPath(params)
     },
     handleLink(item) {
+      console.log(item)
       const { redirect, path } = item
       if (redirect) {
         this.$router.push(redirect)

chuanyi-admin/src/store/modules/permission.js

@@ -23,7 +23,7 @@ function getRoute(item) {
     children: []
   }
   if (item.url === 'layout') {
-    route.component = resolve => (require([`@/layout`], resolve))
+    route.component = (resolve) => require([`@/layout`], resolve)
   } else {
     route.component = (resolve) => require([`@/views${item.url}`], resolve)
   }
@@ -79,13 +79,16 @@ const actions = {
    * @returns {Promise<unknown>}
    */
   GenerateRoutes({ commit }, roles) {
-    const roleIdList = []
-    roles.forEach(e => {
-      roleIdList.push(e.id)
-    })
-    return new Promise(resolve => {
+    let roleIdList = []
+    const rCode = roles.find((item) => item.roleCode === 'ManagerRole')
+    if (rCode) {
+      roleIdList = [1]
+    } else if (rCode === undefined) {
+      roleIdList = [2]
+    }
+    return new Promise((resolve) => {
       // 向后端请求路由数据
-      getRouters(roleIdList).then(res => {
+      getRouters(roleIdList).then((res) => {
         try {
           const menuList = res.data.menuTree
           const accessedRoutes = dynamicMenuRoutes(menuList)

chuanyi-admin/src/store/modules/user.js

@@ -22,10 +22,10 @@ const state = {
   }],
   // 用户类型
   userType: [{
-    'name': '客户端用户',
+    'name': '前端用户',
     'value': 0
   }, {
-    'name': '管理端用户',
+    'name': '后端用户',
     'value': 1
   }]
 }

chuanyi-admin/src/utils/errorCode.js

@@ -2,12 +2,12 @@ export default {
   '401': '认证失败，无法访问系统资源',
   '403': '当前操作没有权限',
   '404': '访问资源不存在',
-
-  '900': '初始化未完成，请稍候再试',
+  '500': '用户名或密码输入错误',
+  '900': '请检查网络',
   '901': '数据正在处理，请勿重复提交',
   '902': '下载文件出现错误，请联系管理员',
   '903': '正在下载文件，请稍候',
-  '904': '系统接口连接异常',
+  '904': '请检查网络',
   '905': '系统接口请求超时',
   '906': '用户数据异常，请重新登录',
 

chuanyi-admin/src/views/login/index.vue

@@ -25,7 +25,12 @@
           auto-complete="off"
         />
       </el-form-item>
-      <el-tooltip v-model="capsTooltip" content="已开启大写字母" placement="right" manual>
+      <el-tooltip
+        v-model="capsTooltip"
+        content="已开启大写字母"
+        placement="bottom-start"
+        manual
+      >
         <el-form-item prop="password">
           <span class="svg-container">
             <svg-icon icon-class="password" />
@@ -43,13 +48,23 @@
             @blur="capsTooltip = false"
             @keyup.enter.native="handleLogin"
           />
-          <span class="show-pwd" @click="showPwd">
+          <span
+            class="show-pwd"
+            @click="showPwd"
+          >
             <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
           </span>
         </el-form-item>
       </el-tooltip>
-      <el-form-item v-if="captchaEnabled" prop="code" class="code-div">
-        <div class="el-form-item" style="width: 63%;float: left;">
+      <el-form-item
+        v-if="captchaEnabled"
+        prop="code"
+        class="code-div"
+      >
+        <div
+          class="el-form-item"
+          style="width: 63%;float: left;"
+        >
           <span class="svg-container">
             <svg-icon icon-class="validCode" />
           </span>
@@ -64,7 +79,11 @@
           />
         </div>
         <div class="login-code">
-          <img :src="codeUrl" class="login-code-img" @click="getCode">
+          <img
+            :src="codeUrl"
+            class="login-code-img"
+            @click="getCode"
+          >
         </div>
       </el-form-item>
       <el-button
@@ -97,8 +116,8 @@ export default {
         uid: ''
       },
       loginRules: {
-        userName: [{ required: true, trigger: 'blur', message: '请输入您的帐号' }],
-        password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
+        userName: [{ required: true, trigger: ['blur', 'change'], message: '请输入您的用户名', pattern: '[^ \x22]+' }],
+        password: [{ required: true, trigger: ['blur', 'change'], message: '请输入您的密码', pattern: '[^ \x22]+' }],
         code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
       },
       passwordType: 'password',
@@ -175,17 +194,6 @@ export default {
               this.getCode()
             }
           })
-          // const pwd = encrypt(this.loginForm.password, this.publicKey)
-          // login(this.loginForm.username.trim(), pwd, this.loginForm.code, this.loginForm.uid).then(res => {
-          //   console.log(res)
-          //   setUserInfo(res.data.user, res.data.token)
-          //   this.$router.push({ path: this.redirect || '/', query: this.otherQuery })
-          // }).catch((e) => {
-          //   this.loading = false
-          //   if (this.captchaEnabled) {
-          //     this.getCode()
-          //   }
-          // })
         }
       })
     },
@@ -301,6 +309,5 @@ $dark_gray: #889aa4;
   .login-code-img {
     height: 38px;
   }
-
 }
 </style>

chuanyi-admin/src/views/system/user/index.vue

@@ -571,5 +571,4 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-
 </style>