diff --git a/.env.development b/.env.development index 6806c5e..5b68771 100644 --- a/.env.development +++ b/.env.development @@ -8,12 +8,12 @@ ## 开发环境变量 # VUE_APP_HOST = "http://mdapi.junln.net/api/v1.0/" # VUE_APP_FILE_HOST = "http://mdapi.junln.net/api/" -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_HOST = "https://www.jichuanglanhai.com:88/api/v1.0/" +VUE_APP_FILE_HOST = "https://www.jichuanglanhai.com:88/api/" # 二期接口 -VUE_APP_RUOYI ='http://221.229.220.83:9028' +VUE_APP_RUOYI ='https://www.jichuanglanhai.com:88' # 图片前缀正式服务器 -VUE_APP_IMGURL ='http://221.229.220.83:9028' +VUE_APP_IMGURL ='https://www.jichuanglanhai.com:88' # 图片前缀本地服务器 # VUE_APP_IMGURL ='http://192.168.0.123:9028' diff --git a/.env.production b/.env.production index 9b95df1..5d8873d 100644 --- a/.env.production +++ b/.env.production @@ -1,12 +1,13 @@ ## 生产环境变量 # VUE_APP_HOST = "http://mdapi.junln.net/api/v1.0/" # VUE_APP_FILE_HOST = "http://mdapi.junln.net/api/" -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_HOST = "https://www.jichuanglanhai.com:88/api/v1.0/" +VUE_APP_FILE_HOST = "https://www.jichuanglanhai.com:88/api/" # VUE_APP_INTERFACE = "https://mdz.keyush.cn:8030" # 二期接口 -VUE_APP_RUOYI ='http://221.229.220.83:9028' +VUE_APP_RUOYI ='https://www.jichuanglanhai.com:88' # IOS和安卓访问 VUE_APP_INTERFACE = "http://39.101.188.84:89" @@ -15,3 +16,5 @@ 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/router/index.js b/src/router/index.js index 2647c20..bb7a4ec 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,7 +9,7 @@ import Vue from 'vue' import Router from 'vue-router' import Login from '@/views/Login' - +import store from '@/store' Vue.use(Router) // 引入其他路由文件 @@ -21,9 +21,13 @@ const routes = baseRoutes.concat(vxEwm) const router = new Router({ routes }) // 路由拦截 -// router.beforeEach((to, from, next) => { - -// next() -// }) +router.beforeEach((to, from, next) => { + store.commit('SET_IS_SHOW', { + text: to.name == '企业详情' ? '工业园' : '企业', + isShow: to.query.isShow || to.params.isShow, + }) + console.log(to) + next() +}) export default router diff --git a/src/router/vxEwm.js b/src/router/vxEwm.js index e2fc95c..e0df67c 100644 --- a/src/router/vxEwm.js +++ b/src/router/vxEwm.js @@ -23,7 +23,7 @@ let routes = [ component: () => import('@/views/vxEwm/enterprise/info.vue'), }, { - path: '/enterpriseData/check/info/:id', + path: '/enterpriseData/check/info', name: '巡检详情', component: () => import('@/views/vxEwm/enterprise/components/firmInfo.vue'), diff --git a/src/store.js b/src/store.js index 373fc24..2055247 100644 --- a/src/store.js +++ b/src/store.js @@ -9,7 +9,10 @@ export default new Vuex.Store({ enterpriseLoaction: false, msgShow: false, msgshowIsFirst: false, - isShow: false, + showBtnData: { + text: '', + isShow: false, + }, }, mutations: { MYSHOW(state, value) { @@ -24,8 +27,8 @@ export default new Vuex.Store({ SET_ENTERPRISE_SHOW(state, show) { state.enterpriseLoaction = show }, - SET_IS_SHOW(state, show) { - state.isShow = show + SET_IS_SHOW(state, data) { + state.showBtnData = data }, }, actions: {}, diff --git a/src/views/vxEwm/enterprise/components/firmInfo.vue b/src/views/vxEwm/enterprise/components/firmInfo.vue index 68011c8..0c9a1db 100644 --- a/src/views/vxEwm/enterprise/components/firmInfo.vue +++ b/src/views/vxEwm/enterprise/components/firmInfo.vue @@ -36,7 +36,7 @@
现场图片
-
+
diff --git a/src/views/vxEwm/enterprise/index.vue b/src/views/vxEwm/enterprise/index.vue index 521a821..edf6d8c 100644 --- a/src/views/vxEwm/enterprise/index.vue +++ b/src/views/vxEwm/enterprise/index.vue @@ -2,11 +2,19 @@
-
+
-
+
+ 返回{{ $store.state.showBtnData.text }} +
> @@ -30,10 +38,10 @@ export default { } }, created() { + console.log(this.$store.state.showBtnData, '值') document.title = this.$route.query.name || '企业' //修改浏览器标题 let windowBar = document.getElementById('statusBar') windowBar.style.height = 0 + 'px' - this.isShow = this.$route.query.isShow }, methods: { @@ -107,8 +115,8 @@ export default { transform: translate(-50%, -50%); z-index: 20; width: 90%; - height: 75%; - background-color: #FFFFFF; + height: 70%; + background-color: #ffffff; border-radius: 20px; overflow: hidden; box-sizing: border-box; @@ -130,8 +138,12 @@ export default { .back-home { width: 1.94rem; height: 0.5rem; - background: url('~@/assets/image/vxEwm/backHome.png'); - background-size: 100% 100%; + color: #177fd4; + font-weight: bold; + font-size: 0.22rem; + border-radius: 28px; + line-height: 0.52rem; + background-image: linear-gradient(to right, #accbee, #e7f0fd); } .app-download-hint { width: 4.11rem; diff --git a/src/views/vxEwm/enterprise/info.vue b/src/views/vxEwm/enterprise/info.vue index 73d73d7..2e4e11d 100644 --- a/src/views/vxEwm/enterprise/info.vue +++ b/src/views/vxEwm/enterprise/info.vue @@ -300,8 +300,8 @@ 打卡人:{{ item.reportPersonName }}
@@ -508,7 +508,11 @@ export default { // 检查详情 goInfo(item) { this.$router.push({ - path: '/enterpriseData/check/info/' + item.id, + path: '/enterpriseData/check/info/', + query: { + id: item.id, + isShow: true, + }, }) }, }, diff --git a/vue.config.js b/vue.config.js index 1aedcdd..95a8db4 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,7 +6,7 @@ * @FilePath: \MuduAPP\vue.config.js */ module.exports = { - publicPath: './', //APP打包 + publicPath: '/demo/mudu-vx/', //APP打包 // publicPath: '/demo/mudu-app-ceshi/', // publicPath: '/demo/mudu-app-zhengshi/',