From 40e997ec6d731d3fc7fd331891f72c67bf1e7674 Mon Sep 17 00:00:00 2001 From: xy <271556543@qq.com> Date: Tue, 19 Sep 2023 17:12:18 +0800 Subject: [PATCH] 2023-9-19 --- src/layout/index.vue | 7 +------ src/store/getters.js | 3 ++- src/store/modules/user.js | 15 +++++++++++++-- src/views/contract/contractList.vue | 18 +++++------------- vue.config.js | 2 +- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/layout/index.vue b/src/layout/index.vue index 47224f2..c7bd1fe 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -123,7 +123,7 @@ export default { active: 0, bookUrl: process.env.VUE_APP_OUT_Book, gdzcUrl: `${process.env.VUE_APP_OUT_GDZC}/member/oss_login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`, - oldUrl: `${process.env.VUE_APP_OUT_OLD}/login/oss_login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`, + oldUrl: `${process.env.VUE_APP_OUT_OLD}/login/oss_login?auth_token=${this.$store.getters.oa_token}`, goodsUrl: `${process.env.VUE_APP_OUT_GOODS}/admin/oss-login?id=${this.$store.state.user.userId}&username=${this.$store.state.user.username}`, }; }, @@ -174,11 +174,6 @@ export default { watch: { "$route.path": { handler: function (url) { - if (/^\/old/.test(url)) { - getOatoken().then(res => { - this.oldUrl = `${process.env.VUE_APP_OUT_OLD}/login/oss_login?auth_token=${res.auth_token}` - }) - } if(/^\/asset/.test(url)) { if(this.$store.state.app.sidebar.opened) { this.$store.commit('app/TOGGLE_SIDEBAR') diff --git a/src/store/getters.js b/src/store/getters.js index 4696b7b..ea89197 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -7,6 +7,7 @@ const getters = { roles: state => state.user.roles, permission_routes: state => state.permission.routes, system_routes:state => state.permission.systemMenu, - sidebar_menu_map:state => state.permission.sidebarMenuMap + sidebar_menu_map:state => state.permission.sidebarMenuMap, + oa_token:state => state.user.oaToken } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index de6d0f5..7799326 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -4,6 +4,7 @@ import { getInfo, loginOss } from '@/api/user' +import { getOatoken } from "@/api/oatoken" import { getToken, setToken, @@ -21,7 +22,8 @@ const getDefaultState = () => { username:'', avatar: '', department: {}, - roles: [] + roles: [], + oaToken: '' } } @@ -51,6 +53,9 @@ const mutations = { }, SET_DEPARTMENT: (state, department) => { state.department = department + }, + SET_OATOKEN: (state, token) => { + state.oaToken = token } } @@ -103,6 +108,7 @@ const actions = { console.log(response.access_token) commit('SET_TOKEN', response.access_token) setToken(response.access_token) + resolve() }).catch(error => { reject(error) @@ -137,7 +143,12 @@ const actions = { commit('SET_NAME', name) commit('SET_AVATAR', avatar) commit('SET_DEPARTMENT',department) - resolve(response) + + getOatoken().then(res => { + + commit('SET_OATOKEN',res.auth_token) + resolve(response) + }) }).catch(error => { reject(error) }) diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue index d3353f3..53c1346 100644 --- a/src/views/contract/contractList.vue +++ b/src/views/contract/contractList.vue @@ -1998,7 +1998,7 @@ export default { console.log(res) if (res && res.flow?.id) { window.open( - `http://hjjc-szemcold-test.ali251.langye.net/index.php?s=/flow/edit/id/${res.flow.id}`, + `http://hjjc-szemcold-test.ali251.langye.net/index.php?s=/flow/edit/id/${res.flow.id}&auth_token=${this.$store.getters.oa_token}`, "bidding", `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0` ) @@ -2254,9 +2254,7 @@ export default { out_zhaobiao_id: row.id, }; //let res = await getOatoken() - let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/30&id=${ - this.$store.state.user.userId - }&username=${this.$store.state.user.username}&out_zhaobiao_id=${ + let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/30&auth_token=${this.$store.getters.oa_token}&out_zhaobiao_id=${ row.id }&contract_json=${JSON.stringify(baseInfo)}`; let bidding = window.open( @@ -2288,9 +2286,7 @@ export default { }, ""), }; // let res = await getOatoken() - let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/8&id=${ - this.$store.state.user.userId - }&username=${this.$store.state.user.username}&out_caigou_id=${ + let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/8&auth_token=${this.$store.getters.oa_token}&out_caigou_id=${ row.id }&contract_json=${JSON.stringify(baseInfo)}`; let buyProcess = window.open( @@ -2310,9 +2306,7 @@ export default { //"承包商\\供应商":row.supply }; // let res = await getOatoken() - let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/9&id=${ - this.$store.state.user.userId - }&username=${this.$store.state.user.username}&out_contract_id=${ + let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/9&auth_token=${this.$store.getters.oa_token}&out_contract_id=${ row.id }&contract_json=${JSON.stringify(baseInfo)}`; let signProcess = window.open( @@ -2338,9 +2332,7 @@ export default { zongjia: row?.zongjia, //"承包商\\供应商":row.supply }; - let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/24&id=${ - this.$store.state.user.userId - }&username=${this.$store.state.user.username}&out_contract_id=${ + let url = `${process.env.VUE_APP_OUT_OLD}?s=/flow/add/modid/24&auth_token=${this.$store.getters.oa_token}&out_contract_id=${ row.id }&contract_json=${JSON.stringify(baseInfo)}`; let signProcess = window.open( diff --git a/vue.config.js b/vue.config.js index 3d5fdff..cf152d1 100644 --- a/vue.config.js +++ b/vue.config.js @@ -26,7 +26,7 @@ module.exports = { * Detail: https://cli.vuejs.org/config/#publicpath */ publicPath: '/admin/', - outputDir: '/Users/liuxiangyu/Work/h-huanjingjiance/app/hjjc-workbench-service/public/admin', + outputDir: './dist', assetsDir: 'static', lintOnSave: false, productionSourceMap: false,