diff --git a/.env.production b/.env.production index 6592f042f..17eebff32 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-cloud.elinkservice.cn/api +VUE_APP_API_SERVER = https://epdc-shibei.elinkservice.cn/api VUE_APP_NODE_ENV=prod VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/.env.production.uat b/.env.production.uat index 14457f27c..0e4ab2af8 100644 --- a/.env.production.uat +++ b/.env.production.uat @@ -1,4 +1,4 @@ NODE_ENV=production -VUE_APP_API_SERVER = https://epmet-test.elinkservice.cn/api +VUE_APP_API_SERVER = http://120.27.18.76/api VUE_APP_NODE_ENV=prod:uat VUE_APP_PUBLIC_PATH=epmet-oper \ No newline at end of file diff --git a/public/index.html b/public/index.html index 9e19414c1..a1ac2eb12 100644 --- a/public/index.html +++ b/public/index.html @@ -57,13 +57,13 @@ <% if (process.env.VUE_APP_NODE_ENV==='prod:uat' ) { %> <% } %> <% if (process.env.VUE_APP_NODE_ENV==='prod' ) { %> <% } %> diff --git a/src/App.vue b/src/App.vue index 6226e0aa3..dbd953b13 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,7 +19,7 @@ export default { methods: { i18nHandle (val, oldVal) { - Cookies.set('language', val) + localStorage.setItem('language', val) document.querySelector('html').setAttribute('lang', val) document.title = messages[val].brand.lg // 非登录页面,切换语言刷新页面 diff --git a/src/components/ren-process-detail/src/ren-process-detail.vue b/src/components/ren-process-detail/src/ren-process-detail.vue index 5eef7dfd2..0d0bfe91f 100644 --- a/src/components/ren-process-detail/src/ren-process-detail.vue +++ b/src/components/ren-process-detail/src/ren-process-detail.vue @@ -69,7 +69,7 @@ export default { // 获取流程(xml/image)url地址 getResourceURL () { var params = qs.stringify({ - 'token': Cookies.get('token'), + 'token': localStorage.getItem('token'), 'processInstanceId': this.dataForm.processInstanceId }) return `${window.SITE_CONFIG['apiURL']}/activiti/his/getInstImage?${params}` diff --git a/src/i18n/index.js b/src/i18n/index.js index 27bb75334..2491efa44 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -29,6 +29,6 @@ export const messages = { } export default new VueI18n({ - locale: Cookies.get('language') || 'zh-CN', + locale: localStorage.getItem('language') || 'zh-CN', messages }) diff --git a/src/js/ajax.js b/src/js/ajax.js index e8f95dc07..d147c4d86 100644 --- a/src/js/ajax.js +++ b/src/js/ajax.js @@ -45,9 +45,9 @@ function endLoading () { */ axios.interceptors.request.use( (config) => { - config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' - config.headers['token'] = Cookies.get('token') || '' - config.headers['Authorization'] = Cookies.get('token') || '' + config.headers['Accept-Language'] = localStorage.getItem('language') || 'zh-CN' + config.headers['token'] = localStorage.getItem('token') || '' + config.headers['Authorization'] = localStorage.getItem('token') || '' // 默认参数 var defaults = {} // 防止缓存,GET请求默认带_t参数 diff --git a/src/main.js b/src/main.js index 05b7580e0..6d65da32e 100644 --- a/src/main.js +++ b/src/main.js @@ -33,7 +33,9 @@ import getQueryPara from "dai-js/modules/getQueryPara"; // 兼容token传参登录 if (getQueryPara("token")) { console.log('token', getQueryPara("token")); - Cookies.set("token", getQueryPara("token")); + localStorage.setItem("token", getQueryPara("token")); + console.log('token222222', localStorage.getItem('token')); + } window.app = Object.assign( diff --git a/src/mixins/view-module.js b/src/mixins/view-module.js index cfc165b37..f881711c7 100644 --- a/src/mixins/view-module.js +++ b/src/mixins/view-module.js @@ -142,7 +142,7 @@ export default { // 导出 exportHandle () { var params = qs.stringify({ - 'token': Cookies.get('token'), + 'token': localStorage.getItem('token'), ...this.dataForm }) window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}` diff --git a/src/utils/request.js b/src/utils/request.js index 419f83ec4..d51a48a96 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,9 +15,9 @@ const http = axios.create({ * 请求拦截 */ http.interceptors.request.use(config => { - config.headers['Accept-Language'] = Cookies.get('language') || 'zh-CN' - config.headers['token'] = Cookies.get('token') || '' - config.headers['Authorization'] = Cookies.get('token') || '' + config.headers['Accept-Language'] = localStorage.getItem('language') || 'zh-CN' + config.headers['token'] = localStorage.getItem('token') || '' + config.headers['Authorization'] = localStorage.getItem('token') || '' // 默认参数 var defaults = {} // 防止缓存,GET请求默认带_t参数 diff --git a/src/views/components/tinymce/index.vue b/src/views/components/tinymce/index.vue index 8403b43cb..73c48e26a 100644 --- a/src/views/components/tinymce/index.vue +++ b/src/views/components/tinymce/index.vue @@ -137,7 +137,7 @@ export default { }) }, getUserToken () { - let token = Cookie.get('token') + let token = localStorage.getItem('token') // console.log('获取token', token) // return this.$store.getters['user/isLogin'] return token diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 890964127..08c7e2491 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -87,7 +87,7 @@ export default { // this.$nextTick(() => { // this.sendMessage() // }) - this.token = Cookie.get("token"); + this.token = localStorage.getItem("token"); this.customerId = localStorage.getItem("customerId"); }, methods: { @@ -100,7 +100,7 @@ export default { this.iframeUrl = url + "?token=" + - Cookie.get("token") + + localStorage.getItem("token") + "&customerId=" + localStorage.getItem("customerId"); return isURL(url); @@ -169,7 +169,7 @@ export default { console.log("iframe", iframe); // iframe.postMessage({ - // token: Cookie.get('token'), + // token: localStorage.getItem('token'), // customerId: localStorage.getItem('customerId') // }, '*') iframe.postMessage({ name: "lalalal" }, "*"); diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 24cd80bd2..febbcd0ca 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -46,9 +46,7 @@ mode="horizontal" class="aui-navbar__menu mr-auto z-div" > - + 首页 @@ -104,12 +102,11 @@ - {{ $t('updatePassword.title') }} + {{ + $t("updatePassword.title") + }} {{ - $t('logout') + $t("logout") }} @@ -127,119 +124,121 @@