diff --git a/public/js/config.js b/public/js/config.js index b5d0e08e..fde19c6d 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -11,7 +11,7 @@ var COMPANY = '' //通用 // COMPANY = 'hengtong'//瑞士恒通 // COMPANY = 'yunlian'//云联万物 // COMPANY = 'neimenggu'//内蒙古项目 -// COMPANY = 'zjsj'//中建四局 +COMPANY = 'zjsj'//中建四局 // COMPANY = 'zjwj'//中建五局 // COMPANY = 'sccr'//四川成润 // COMPANY = 'pssh'//坪山沙湖项目 @@ -26,7 +26,7 @@ var PROJECT = { online_gxlt: 'gxlt', // 广西联通 } -var PROJECT_TYPE = PROJECT.local_test +var PROJECT_TYPE = PROJECT.online_zjsj var headerShow = true // 是否显示头部 var tabsShow = true // 是否显示tabs if (COMPANY == 'xingxuan') { diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 1b2b505a..15309b9e 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,13 +83,13 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 - axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 + // 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://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 - // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 + axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 diff --git a/src/store/index.js b/src/store/index.js index 67abeeae..d76a5a6e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -46,19 +46,19 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl + ? baseUrl + : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/projectAdmin/fourEngin/command/leftTwo.vue b/src/views/projectAdmin/fourEngin/command/leftTwo.vue index 47c72752..707f22ff 100644 --- a/src/views/projectAdmin/fourEngin/command/leftTwo.vue +++ b/src/views/projectAdmin/fourEngin/command/leftTwo.vue @@ -64,10 +64,10 @@
- - - - + + + +
质量目标确保省优质奖，争创鲁班奖（国优）
安全目标确保双优工程、争创AAA工地
设计目标绿建三星、EarthCheck银奖认省部级勘察设计奖
科技目标省新技术示范、省绿色施工示范、局科技应用示范
质量目标确保省优质奖，争创鲁班奖（国优）
安全目标确保双优工程、争创AAA工地
设计目标绿建三星、EarthCheck银奖认证、省部级勘察设计奖
科技目标省科技、省绿色施工示范工程，局、集团科技示范项目