From ab49fcf5e16a6a7c54454353b53272a2a2636e0c Mon Sep 17 00:00:00 2001 From: laozt <2721205210@qq.com> Date: Mon, 1 Apr 2024 15:42:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 1 - src/App.vue | 2 +- src/api/mudu/park.js | 10 ++++ src/api/request.js | 2 +- src/api/request2.js | 2 +- src/router/index.js | 3 +- src/router/vxEwm.js | 19 +++++++ src/util/refresh.js | 2 +- src/views/vxEwm/build/build/index.vue | 56 ++++++++++--------- src/views/vxEwm/enterprise/index.vue | 39 ++++++++----- src/views/vxEwm/enterprise/info.vue | 2 +- .../garden/park/components/enterpriseList.vue | 2 +- .../garden/park/components/statistics.vue | 4 +- src/views/vxEwm/garden/park/index.vue | 2 +- 15 files changed, 96 insertions(+), 54 deletions(-) diff --git a/.env.development b/.env.development index 6806c5e..1f25506 100644 --- a/.env.development +++ b/.env.development @@ -11,9 +11,9 @@ VUE_APP_HOST = "http://221.229.220.83:8007/api/v1.0/" VUE_APP_FILE_HOST = "http://221.229.220.83:8007/api/" # 二期接口 -VUE_APP_RUOYI ='http://221.229.220.83:9028' +VUE_APP_RUOYI ='http://192.168.0.124:9028' # 图片前缀正式服务器 -VUE_APP_IMGURL ='http://221.229.220.83:9028' +VUE_APP_IMGURL ='http://192.168.0.124:9028' # 图片前缀本地服务器 # VUE_APP_IMGURL ='http://192.168.0.123:9028' diff --git a/.env.production b/.env.production index 5d8873d..6bdc444 100644 --- a/.env.production +++ b/.env.production @@ -17,4 +17,3 @@ VUE_APP_IMGURL ='http://221.229.220.83:9028' VUE_APP_VERSION = "3.2.8" VUE_APP_VERSION2 = "3.2.8" -一期 \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index bd75d75..0bf002c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ export default { var designWidth = 750 // 设计图的宽度 var baseFontsize = 120 // cssrem插件设置的基础px var realFontsize = (window.screen.width / designWidth) * baseFontsize // 计算实际字号 - console.log(realFontsize, '基准') + // console.log(realFontsize, '基准') // console.log(realFontsize) document.getElementsByTagName('html')[0].style.fontSize = realFontsize + 'px' diff --git a/src/api/mudu/park.js b/src/api/mudu/park.js index 16d22fb..dcfae4d 100644 --- a/src/api/mudu/park.js +++ b/src/api/mudu/park.js @@ -39,6 +39,16 @@ export function listManagement(query) { params: query }) } + + //查询园区负责人列表 + export function listEnterpriseBuildPark(query) { + return request({ + url: '/mudu/enterprisebuildpark', + method: 'get', + params: query + }) + } + // // 园区详情 enterprise/parkinfo/ // export function getParkinfo(id) { // return request.get('enterprise/parkinfo/' + id) diff --git a/src/api/request.js b/src/api/request.js index 2b56ec8..cfa5200 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -87,7 +87,7 @@ request.interceptors.response.use( const isSucceed = await refreshToken() if (isSucceed) { //重新请求 - console.log('重新刷新') + // console.log('重新刷新') errorData.config.headers.Authorization = 'Bearer ' + localStorage.getItem('mudu_token') //替换token let result = await request.request(errorData.config) //重新请求 diff --git a/src/api/request2.js b/src/api/request2.js index 47b5d77..b4ecf8c 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -78,7 +78,7 @@ request.interceptors.response.use( } }, (error) => { - console.log(error.response) + // console.log(error.response) if (error.response && error.response.status === 401) { Toast({ message: '登录过期，请重新登录', diff --git a/src/router/index.js b/src/router/index.js index 4b5d887..05ad13c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -22,9 +22,8 @@ const router = new Router({ routes }) // 路由拦截 router.beforeEach((to, from, next) => { - console.log('值', to) store.commit('SET_IS_SHOW', { - text: to.name == '企业详情' ? '工业园' : '企业', + text: to.name == '企业详情' ? '工业园' : to.name == '企业详情2' ? '楼栋': '企业', isShow: to.query.isShow || to.params.isShow, }) console.log(to) diff --git a/src/router/vxEwm.js b/src/router/vxEwm.js index 16fed89..af987d6 100644 --- a/src/router/vxEwm.js +++ b/src/router/vxEwm.js @@ -42,6 +42,25 @@ let routes = [ }, ], }, + { + path: '/enterpriseData2', + name: '企业信息', + component: () => import('@/views/vxEwm/enterprise/index.vue'), + redirect: '/enterpriseData2/info', + children: [ + { + path: '/enterpriseData2/info', + name: '企业详情2', + component: () => import('@/views/vxEwm/enterprise/info.vue'), + }, + { + path: '/enterpriseData2/check/info', + name: '巡检详情', + component: () => + import('@/views/vxEwm/enterprise/components/firmInfo.vue'), + }, + ], + }, ] // { diff --git a/src/util/refresh.js b/src/util/refresh.js index a3ecf83..e597ff2 100644 --- a/src/util/refresh.js +++ b/src/util/refresh.js @@ -21,6 +21,6 @@ export async function refreshToken() { } export function isRefreshRequest(config) { - console.log(config.__isRefreshToken) + // console.log(config.__isRefreshToken) return !!config.__isRefreshToken //两个取反，变成boolean } diff --git a/src/views/vxEwm/build/build/index.vue b/src/views/vxEwm/build/build/index.vue index a21dc58..fa1eb27 100644 --- a/src/views/vxEwm/build/build/index.vue +++ b/src/views/vxEwm/build/build/index.vue @@ -1,16 +1,14 @@