diff --git a/src/common/dic.js b/src/common/dic.js index 1e7af10..c30bd37 100644 --- a/src/common/dic.js +++ b/src/common/dic.js @@ -382,12 +382,13 @@ export const companyEnum = [ ] export const addressColumn = [ - {value: '95', label: "绵竹市"}, - {value: '185', label: "广汉市"}, - {value: '143', label: "旌阳区"}, - {value: '150', label: "罗江区"}, - {value: '42', label: "什邡市"}, - {value: '156', label: "中江县"}, - {value: '44139628', label: "经济技术开发区"}, - {value: '79194151', label: "德阳市开发区"}, + {value: '4', label: "馆陶县"}, + {value: '5', label: "馆陶镇"}, + {value: '6', label: "房寨镇"}, + {value: '7', label: "魏僧寨镇"}, + {value: '8', label: "柴堡镇"}, + {value: '9', label: "寿山寺"}, + {value: '10', label: " 王桥乡"}, + {value: '11', label: "路桥乡"}, + {value: '12', label: "南徐村乡"}, ] diff --git a/src/router/axios.js b/src/router/axios.js index fc72eff..25d0b3e 100644 --- a/src/router/axios.js +++ b/src/router/axios.js @@ -61,10 +61,10 @@ axios.interceptors.response.use( if (statusWhiteList.includes(status)) return Promise.reject(res); //如果是401则跳转到登录页面 if (status === 401) { - store.dispatch('FedLogOut').then(() => { - window.location.href = process.env.VUE_APP_LOGIN_NEXT - }); - // store.dispatch('FedLogOut').then(() => router.push({path: '/login'})); + // store.dispatch('FedLogOut').then(() => { + // window.location.href = process.env.VUE_APP_LOGIN_NEXT + // }); + store.dispatch('FedLogOut').then(() => router.push({path: '/login'})); } // 如果请求为500统一处理 const err = new Error(message) diff --git a/src/views/workstation/workbench/index.vue b/src/views/workstation/workbench/index.vue index fe7abd0..f44f6a9 100644 --- a/src/views/workstation/workbench/index.vue +++ b/src/views/workstation/workbench/index.vue @@ -7,16 +7,16 @@
- + + + + + + + + + +
diff --git a/vue.config.js b/vue.config.js index 10fdba1..367db0e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,7 +24,7 @@ module.exports = { port: 1888, proxy: { "/api": { - target: 'http://192.168.1.115:8000', + target: 'http://39.98.184.58:8000', ws: true, changeOrigin: true, pathRewrite: {