diff --git a/public/js/config.js b/public/js/config.js index 95b2d36b..6ded85e0 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -1,5 +1,5 @@ //-------项目配置标识------- -// var COMPANY = ""; //通用 +var COMPANY = ""; //通用 // var COMPANY='zhongjian'; //中建,和沃尔对接的插件版用这个企业 // var COMPANY='hezhan'; //合展-宿迁 // var COMPANY='nanchang'; //南昌地铁、衢州 @@ -21,6 +21,7 @@ COMPANY = "agjt"; //鞍钢集团 // COMPANY = 'zkax' //中科安信 // COMPANY = 'hfqc' //乌丹站舍(合肥启程) +// COMPANY = 'mulei' //木垒 var PROJECT = { local_test: "common", // 普通版 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 2dfb0951..503a752e 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -174,8 +174,8 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28890/' //郭圣雄本地 - axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 - // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 + // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 + axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234/' //郭圣雄远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 diff --git a/src/components/header.vue b/src/components/header.vue index 8342c4c5..abbd5bf0 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -107,9 +107,7 @@ v-show=" $route.path.indexOf('firm/') != -1 && $store.state.userInfo.companyBigScreen == 0 && - company != 'longguang' && - company != '' && - company != 'jlw' + !['longguang', 'jlw', 'mulei', ''].includes(company) " class="header-btn" @click="toOverview3()" @@ -757,6 +755,11 @@ export default { }, //龙光企业大屏 toOverview4() { + if(this.company === 'mulei') { + // 跳转指3D大屏 + window.open('http://10.11.13.202:6080/#/login?projectId=1'); + return + } //原型 2.0 // let routeUrl = this.$router.resolve({ // path: "/companyAdmin/longguangBigScreen", diff --git a/src/store/index.js b/src/store/index.js index 2463e3e1..116ff0dc 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -46,6 +46,8 @@ export default new Vuex.Store({ state: { PAGESIZRS: [10, 20, 30, 50], + // UPLOADURL: "http://10.11.13.202:6080/upload/image/", // 木垒 + // FILEURL: "http://10.11.13.202:6080/image/", //木垒 // UPLOADURL: 'http://192.168.9.249:9820/upload/image/', // 四川网城 // FILEURL: ' http://192.168.9.249:9820/image/', // 四川网城 // UPLOADURL: 'http://192.168.9.249:9809/upload/image/', // 同济 @@ -58,13 +60,13 @@ export default new Vuex.Store({ // FILEURL: ' http://101.43.164.214:11111/image/', // 百色 // UPLOADURL:'http://182.90.224.237:51234/upload/image/', // FILEURL:'http://182.90.224.237:51234/image/', - // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 - // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 - UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 - FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 - // WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) + UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 + FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 + // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 + // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 + WORKFLOWURL: "http://192.168.34.216:88/#/workspace/forms", //jiayu工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) CONTRACTORURL: process.env.NODE_ENV == "development" ? "http://192.168.34.129:5174/#/contractorApply" : `${window.location.protocol}//${window.location.host}/contractorApply/index.html#/contractorApply`, //罗峰承包商入场地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程