From 7627c015b7c07ffc5d0dd02a7f7a883fbd13c0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=AE=8F=E6=9D=B0?= <1943105267@qq.com> Date: Fri, 15 Mar 2024 16:48:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=AE=B0=E5=BD=95=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/api/request.js | 1 + src/router/index.js | 3 +- src/store.js | 8 + src/util/refresh.js | 1 + src/views/Login.vue | 497 ------------------ .../vxEwm/enterprise/components/firmInfo.vue | 1 + src/views/vxEwm/enterprise/index.vue | 13 +- src/views/vxEwm/enterprise/info.vue | 3 +- .../garden/park/components/enterpriseList.vue | 2 +- src/views/vxEwm/garden/park/index.vue | 3 + 11 files changed, 31 insertions(+), 503 deletions(-) delete mode 100644 src/views/Login.vue diff --git a/src/App.vue b/src/App.vue index 4be8afa..be33d5c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -64,7 +64,7 @@ body { z-index: 2000; } ::-webkit-scrollbar { - display: none; /*隐藏滚轮*/ + // display: none; /*隐藏滚轮*/ } // 输入框填充密码背景 input:-webkit-autofill, diff --git a/src/api/request.js b/src/api/request.js index 8b9140d..2b56ec8 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -82,6 +82,7 @@ request.interceptors.response.use( }, async (error) => { let errorData = error.response + if (errorData.status === 401 && !isRefreshRequest(errorData.config)) { const isSucceed = await refreshToken() if (isSucceed) { diff --git a/src/router/index.js b/src/router/index.js index bb7a4ec..4b5d887 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -8,7 +8,7 @@ // 总路由 import Vue from 'vue' import Router from 'vue-router' -import Login from '@/views/Login' + import store from '@/store' Vue.use(Router) // 引入其他路由文件 @@ -22,6 +22,7 @@ const router = new Router({ routes }) // 路由拦截 router.beforeEach((to, from, next) => { + console.log('值', to) store.commit('SET_IS_SHOW', { text: to.name == '企业详情' ? '工业园' : '企业', isShow: to.query.isShow || to.params.isShow, diff --git a/src/store.js b/src/store.js index 2055247..72674a3 100644 --- a/src/store.js +++ b/src/store.js @@ -13,8 +13,16 @@ export default new Vuex.Store({ text: '', isShow: false, }, + parkId: null, + enterpriseId: null, }, mutations: { + SET_PERK_ID(state, parkId) { + state.parkId = parkId + }, + SET_ENTERPRISE_ID(state, enterpriseId) { + state.enterpriseId = enterpriseId + }, MYSHOW(state, value) { state.myShow = value }, diff --git a/src/util/refresh.js b/src/util/refresh.js index 98a51e1..a3ecf83 100644 --- a/src/util/refresh.js +++ b/src/util/refresh.js @@ -21,5 +21,6 @@ export async function refreshToken() { } export function isRefreshRequest(config) { + console.log(config.__isRefreshToken) return !!config.__isRefreshToken //两个取反，变成boolean } diff --git a/src/views/Login.vue b/src/views/Login.vue deleted file mode 100644 index 0073ea4..0000000 --- a/src/views/Login.vue +++ /dev/null @@ -1,497 +0,0 @@ - - - - - - diff --git a/src/views/vxEwm/enterprise/components/firmInfo.vue b/src/views/vxEwm/enterprise/components/firmInfo.vue index 08b7614..a87d403 100644 --- a/src/views/vxEwm/enterprise/components/firmInfo.vue +++ b/src/views/vxEwm/enterprise/components/firmInfo.vue @@ -209,6 +209,7 @@ div { .info-content { height: calc(100% - 0.1rem); overflow-y: auto; + padding: 0 0.15rem; .list-item { display: flex; // align-items: center; diff --git a/src/views/vxEwm/enterprise/index.vue b/src/views/vxEwm/enterprise/index.vue index 59110fb..b7b0598 100644 --- a/src/views/vxEwm/enterprise/index.vue +++ b/src/views/vxEwm/enterprise/index.vue @@ -48,8 +48,17 @@ export default { }, methods: { backHome() { - console.log('sasasa') - this.$router.back() + if (this.$store.state.showBtnData.text == '工业园') { + this.$router.replace({ + path: '/park', + query: { id: this.$store.state.parkId }, + }) + } else { + this.$router.replace({ + path: '/enterpriseData/info', + query: { id: this.$store.state.enterpriseId, isShow: true }, + }) + } }, handlerDownload() { let temp = document.createElement('a') // 创建a标签 diff --git a/src/views/vxEwm/enterprise/info.vue b/src/views/vxEwm/enterprise/info.vue index 40a0997..f09a894 100644 --- a/src/views/vxEwm/enterprise/info.vue +++ b/src/views/vxEwm/enterprise/info.vue @@ -372,6 +372,7 @@ export default { mounted() { let enterpriseId = this.$route.query.id this.enterpriseId = this.$route.query.id + this.$store.commit('SET_ENTERPRISE_ID', this.enterpriseId) this.getIdInfo(enterpriseId) this.getYinHuan(enterpriseId) this.getJianChaNum(enterpriseId) @@ -520,7 +521,7 @@ export default { }, // 检查详情 goInfo(item) { - this.$router.push({ + this.$router.replace({ path: '/enterpriseData/check/info/', query: { id: item.id, diff --git a/src/views/vxEwm/garden/park/components/enterpriseList.vue b/src/views/vxEwm/garden/park/components/enterpriseList.vue index 01bb8ae..19b487e 100644 --- a/src/views/vxEwm/garden/park/components/enterpriseList.vue +++ b/src/views/vxEwm/garden/park/components/enterpriseList.vue @@ -89,7 +89,7 @@ export default { this.getList() }, onInfoClcik(item) { - this.$router.push({ + this.$router.replace({ path: '/enterpriseData', query: { id: item.id, diff --git a/src/views/vxEwm/garden/park/index.vue b/src/views/vxEwm/garden/park/index.vue index bc66587..76c8d0f 100644 --- a/src/views/vxEwm/garden/park/index.vue +++ b/src/views/vxEwm/garden/park/index.vue @@ -252,6 +252,8 @@ export default { } }) + this.$store.commit('SET_PERK_ID', this.$route.query.id) + this.loading = Toast.loading('加载中...') this.$nextTick(() => { this.getList() @@ -484,6 +486,7 @@ div { .container-box { height: calc(100% - 0.5rem); overflow-y: auto; + padding: 0 0.1rem; } .tab-type { padding-bottom: 0.2rem;