n20-common-lib 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Layout/HeaderWrap/indexN.vue

@@ -150,11 +150,21 @@
             <i class="el-icon-caret-right m-l-auto m-r-0"></i>
           </div>
         </el-dropdown-item>
-        <el-dropdown-item command="systemSet">
-          <div class="flex-box flex-v">
-            <span>{{ '系统设置' | $lc }}</span>
-            <i class="el-icon-caret-right m-l-auto m-r-0"></i>
-          </div>
+        <el-dropdown-item _command="systemSet">
+          <el-dropdown trigger="hover" size="medium" placement="left-start" style="width: 100%" @command="setUserFn">
+            <div class="flex-box flex-v">
+              <span>{{ '系统设置' | $lc }}</span>
+              <i class="el-icon-caret-right m-l-auto m-r-0"></i>
+            </div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item v-if="!hideTheme" command="setTheme">
+                <span>{{ '主题设置' | $lc }}</span>
+              </el-dropdown-item>
+              <el-dropdown-item command="setWorkplace">
+                <span>{{ '工作台设置' | $lc }}</span>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
         </el-dropdown-item>
         <el-dropdown-item v-if="!inBack" command="toBack">
           <div class="flex-box flex-v">
@@ -402,6 +412,9 @@ export default {
         case 'switchUser':
           this.switchUser()
           break
+        case 'setWorkplace':
+          this.$router.push('/dashboard/setWorkplace')
+          break
         case 'systemSet':
           this.systemSet()
           break

package/src/components/LoginTemporary/form.vue

@@ -43,6 +43,15 @@
           </el-input>
           不自动填充密码End -->
         </el-form-item>
+        <el-form-item class="m-b" :label="'图形验证码' | $lc" prop="imageCode">
+          <br />
+          <div class="flex-box">
+            <el-input v-model="form.imageCode" class="flex-item m-r-s" :placeholder="'请输入图形验证码' | $lc" />
+            <el-button plain class="p-a-0" @click="getImgCode">
+              <img v-if="imageUrl" :src="imageUrl" style="width: 80px; height: 30px; margin-bottom: -2px" />
+            </el-button>
+          </div>
+        </el-form-item>
         <el-button class="m-t" type="primary" native-type="submit" style="width: 100%">{{ '登　录' | $lc }}</el-button>
       </el-form>
     </div>
@@ -197,6 +206,7 @@ export default {
         username: [{ required: true, message: '请输入账号!', trigger: 'blur' }],
         password: [{ required: true, message: '请输入密码!', trigger: 'blur' }],
         code: [{ required: true, message: '请输入验证码!', trigger: 'blur' }],
+        imageCode: [{ required: true, message: '请输入图形验证码!', trigger: 'blur' }],
         phone: [
           { required: true, message: '请输入手机号!', trigger: 'blur' },
           {
@@ -207,14 +217,22 @@ export default {
         ]
       },
       codeNum: $lc('验证码'),
-      getAzCount: 0
+      getAzCount: 0,
+      imageUrl: undefined
     }
   },
   watch: {
     loginTypes() {
       this.theType = this.loginTypes[0]
+    },
+    theType: {
+      handler() {
+        this.getImgCode()
+      },
+      immediate: true
     }
   },
+  mounted() {},
   methods: {
     // 忘记密码
     forgetPw() {
@@ -232,6 +250,14 @@ export default {
         this.theType = this.loginTypes[0]
       }
     },
+    getImgCode() {
+      if (this.theType === 'account') {
+        this.imageUrl && URL.revokeObjectURL(this.imageUrl)
+        axios.get('/bems/prod_1.0/uas/api/authorization/captcha/image', null, { responseType: 'blob' }).then((blob) => {
+          this.imageUrl = URL.createObjectURL(blob)
+        })
+      }
+    },
     // 发送短信
     outTime(num) {
       clearTimeout(this.setTimeNum)
@@ -338,13 +364,19 @@ export default {
     },
     // 账号/密码登录
     async passwordLogin() {
-      let { username, password, code } = this.form
+      let { username, password, code, imageCode } = this.form
       await this.authorizationCode(username, password, code)
       // 请求该账号要不要强制验证码登录
       this.loadingAdd()
       let cL = await axios.post(
         '/bems/prod_1.0/uas/api/authorization/checkLogin',
-        { grantType: 'password', username, password: this.pwd, code },
+        {
+          grantType: 'password',
+          username,
+          password: this.pwd,
+          code,
+          imageCode: imageCode || undefined
+        },
         {
           loading: this.loadingSub
         }
@@ -405,7 +437,8 @@ export default {
               password: this.pwd,
               code,
               sign,
-              certDn
+              certDn,
+              imageCode: imageCode || undefined
             },
             {
               loading: this.loadingSub
@@ -424,7 +457,13 @@ export default {
       axios
         .post(
           '/bems/prod_1.0/uas/api/authorization/login',
-          { grantType: 'password', username, password: this.pwd, code },
+          {
+            grantType: 'password',
+            username,
+            password: this.pwd,
+            code,
+            imageCode: imageCode || undefined
+          },
           { loading: this.loadingSub }
         )
         .then((res) => {

package/src/components/LoginTemporary/index.vue

@@ -111,7 +111,15 @@ export default {
   },
   computed: {
     loginTypes() {
-      return this.pageData.LOGIN_MODE?.pmValue?.split(',') || this.jsonData.loginTypes || ['account']
+      let LOGIN_MODE = this.pageData.LOGIN_MODE?.pmValue
+      if (LOGIN_MODE) {
+        try {
+          LOGIN_MODE = JSON.parse(LOGIN_MODE)
+        } catch (error) {
+          LOGIN_MODE = LOGIN_MODE.split(',')
+        }
+      }
+      return LOGIN_MODE || this.jsonData.loginTypes || ['account']
     },
     loginBg() {
       if (this.pageData.BgImage) {

package/src/components/LoginTemporary/indexN.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="width: 100vw; height: 100vh; overflow: hidden">
+  <div v-if="!OL" style="width: 100vw; height: 100vh; overflow: hidden">
     <div v-if="alV" v-loading="alV" class="login-wrap">
       <loginForm
         ref="login-form"
@@ -115,6 +115,7 @@
       @to-login="inspectionV = false"
     />
   </div>
+  <OLogin v-else />
 </template>
 
 <script>
@@ -129,9 +130,12 @@ import loginForm from './form.vue'
 import retrievePw from './retrievePw.vue'
 import Inspection from './inspection/index.vue'
 import IconMap from './systemIconMap'
+import OLogin from './index.vue'
+
 export default {
   name: 'Login',
   components: {
+    OLogin,
     loginForm,
     retrievePw,
     Inspection
@@ -171,7 +175,8 @@ export default {
     this.realUrl = realUrl
     return {
       wrapStyle: '',
-      logUrl: 'www.baidu.com',
+      OL: false, // 切换到旧的登录页
+      logUrl: window.location.host,
       jsonData: {
         loginTypes: ['account'],
         loginBg: undefined,
@@ -333,7 +338,15 @@ export default {
       const { _layoutData = {}, loginSetting } = await getJsonc('/server-config.jsonc')
       let _loginSetting = loginSetting || _layoutData.loginSetting
       if (_loginSetting !== 'JSON') {
-        let res = await this.$axios.post('/bems/portal/portalSysLoginCon/getCuurSysSetting', { logUrl: this.logUrl })
+        let por = this.$axios.post(
+          '/bems/portal/portalSysLoginCon/getCuurSysSetting',
+          { logUrl: this.logUrl },
+          { noMsg: true }
+        )
+        por.catch((err) => {
+          this.watchOLogin()
+        })
+        let res = await por
         let list = res.data || []
 
         for (let k in this.form) {
@@ -436,6 +449,10 @@ export default {
     },
     selSystem(item) {
       this.sltSys = item
+    },
+    // 切换到旧的登录页
+    watchOLogin() {
+      this.OL = true
     }
   }
 }

package/src/components/LoginTemporary/utils.js

@@ -17,7 +17,8 @@ export function siteTree2menus(siteTree) {
       pmid: item.pmid,
       sortnum: item.sortnum ? Number(item.sortnum) : item.menuid,
       appNo: item.appNo || undefined,
-      title: item.label
+      title: item.label,
+      isBackmenu: item.iSbackMenu
     }
     if (/^http(s)?:|\/\//.test(item.pageurl)) {
       menuObj.href = item.pageurl