智能审阅页面改为默认首页

package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@archser/layout-ui": {
-      "version": "0.8.2",
-      "resolved": "http://peeek.cn:7001/@archser/layout-ui/download/@archser/layout-ui-0.8.2.tgz",
-      "integrity": "sha1-rzt1dsTVPVP2TZfUw22rguDMlIs=",
+      "version": "0.8.3",
+      "resolved": "http://peeek.cn:7001/@archser/layout-ui/download/@archser/layout-ui-0.8.3.tgz",
+      "integrity": "sha1-WBE3GFed/sMCUyJ57CULBnIUXxo=",
       "requires": {
         "axios": "^0.19.0",
         "core-js": "^2.6.5",
@@ -2431,6 +2431,12 @@
         "resolve": "^1.4.0"
       }
     },
+    "babel-plugin-transform-remove-console": {
+      "version": "6.9.4",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-transform-remove-console/-/babel-plugin-transform-remove-console-6.9.4.tgz",
+      "integrity": "sha512-88blrUrMX3SPiGkT1GnvVY8E/7A+k6oj3MNvUtTIxJflFzXTw1bHkuJ/y039ouhFMp2prRn5cQGzokViYi1dsg==",
+      "dev": true
+    },
     "babel-polyfill": {
       "version": "6.26.0",
       "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",

package.json

@@ -8,7 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@archser/layout-ui": "^0.8.2",
+    "@archser/layout-ui": "^0.8.3",
     "babel-polyfill": "^6.26.0",
     "core-js": "^2.6.10",
     "crypto-js": "^4.0.0",
@@ -27,6 +27,7 @@
     "@vue/cli-plugin-eslint": "^3.12.1",
     "@vue/cli-service": "^4.1.2",
     "babel-eslint": "^10.0.3",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.2.3",
     "vue-template-compiler": "^2.6.10"
@@ -41,7 +42,9 @@
       "eslint:recommended"
     ],
     "rules": {
-      "no-unused-vars": "off"
+      "no-unused-vars": "off",
+      "no-console": "off",
+      "no-debugger": "off"
     },
     "parserOptions": {
       "parser": "babel-eslint"

src/api/login.js

@@ -6,6 +6,19 @@ const SERVICE_URL = '/aserver'
  * @param {*} params 
  * @returns 
  */
+ export const getSystemUrl = params => {
+  return axios.request({
+    url: SERVICE_URL + '/getSystemUrl',
+    data: params,
+    method: 'post'
+  })
+}
+
+/**
+ * LiuKexin 20210311 根据用户名获取设置首页
+ * @param {*} params 
+ * @returns 
+ */
 export const getUserHome = params => {
   return axios.request({
     url: SERVICE_URL + '/getUserHome',

src/views/login/Login.vue

@@ -111,7 +111,7 @@ import qs from 'qs'
 import ModifyModal from './modify-modal'
 // import { sm2 } from 'sm-crypto'
 import {Encrypt} from './secert'
-import { snVerify, ruleValidate, registered,getUserHome } from '@/api/login'
+import { snVerify, ruleValidate, registered,getUserHome,getSystemUrl } from '@/api/login'
 import Sidentify from './Sidentify.vue'
 export default {
   name: '',
@@ -121,6 +121,7 @@ export default {
   },
   data() {
     return {
+      appUrl: "",
       showModifyModal: false,
       loginBg: {
         backgroundImage: 'url(login-bg.jpg)',
@@ -269,26 +270,32 @@ export default {
             this.isHaveHome = false
           }
         }).then(()=>{
+          getSystemUrl({app:params.app}).then((res) => {
+            if (res.data.state == 'ok') {
+              this.appUrl = res.data.url
+            } else {
+              this.$Notice.error({ title: '提示', desc: res.data.msg })
+            }
+          })
           /**LiuKexin 20210311 根据用户名获取设置的首页 end */
           params.username = Encrypt(params.username);
           params.password = Encrypt(params.password);
-          this.login(params)
-          .then((res) => {
+          this.login(params).then((res) => {
             if (res.data.state === 'ok') {
               let verify = res.data.verify
               if (verify) {
                 /**LiuKexin 20210311 区分默认首页和设置首页的callback start */
                 let callback = res.data.callback
                 if (callback) {
+                  
                   document.location.href = this.isHaveHome
                     ?
-                    callback.split("#")[0] + "?token="+ res.data.token+"#"+callback.split("#")[1]
+                    this.appUrl+callback.split("#")[0] + "?token="+ res.data.token+"#"+callback.split("#")[1]
                     :
-                    callback + '?token=' + res.data.token
+                    this.appUrl+callback + '?token=' + res.data.token
                 /**LiuKexin 20210311 区分默认首页和设置首页的callback end */
                 } else {
-                  document.location.href =
-                    this.form.callback + '?token=' + res.data.token
+                  document.location.href = this.appUrl+this.form.callback + '?token=' + res.data.token
                 }
                 this.setSuccess()
               } else {
@@ -336,10 +343,7 @@ export default {
     },
     login({ app, callback, username, password }) {
       return this.$http.post('/aserver/login', {
-        app,
-        callback,
-        username,
-        password,
+        app,callback,username,password,
       })
     },
     setSuccess(msg = '登录成功') {

vue.config.js

@@ -58,7 +58,7 @@ module.exports = {
   devServer: {
     proxy: {
       '/aserver': {
-        target: 'http://localhost:11048/'
+        target: 'http://localhost:11038/'
       }
     },
   }