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 @@