diff --git a/src/assets/js/http.js b/src/assets/js/http.js index afcd6894..88e50c0c 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -33,20 +33,15 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://14.29.220.211:6023/' // axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光 // axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/' - // axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321 - // axios.defaults.baseURL = 'http://192.168.34.125:6023/' // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 // tag: 本地 // axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地 - // axios.defaults.baseURL = 'http://192.168.34.116:6023/' // 邱平毅本地1 - // axios.defaults.baseURL = 'http://192.168.34.116:18070/' // 邱平毅本地2 - // axios.defaults.baseURL = 'http://192.168.34.125:6023' // 邱平毅本地3 + // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地 - // axios.defaults.baseURL = 'http://ue6a4s.natappfree.cc' // 邱平毅vpn本地 // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋 - axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 + // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上 // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1 // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上 @@ -77,9 +72,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456 // axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789 // axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789 - // axios.defaults.baseURL = 'http://139.9.66.234:7072/' //三江集团测试环境 - // axios.defaults.baseURL = 'http://116.169.63.183:7070' //三江集团正式环境 - // axios.defaults.baseURL = 'http://182.90.224.147:18170' //郭圣雄本地 + axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上 // axios.defaults.baseURL = 'http://58.250.210.9:9090' //深汕线上 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/store/index.js b/src/store/index.js index d782fbb4..67fb30ea 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,9 +48,9 @@ export default new Vuex.Store({ 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/", //测试 + // UPLOADURL: + // window.location.protocol + "//" + window.location.host + "/upload/image", // + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //测试 // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', /* 2022-05-16 */ // tag: 部署河南项目时,需要打开这两行代码 @@ -76,6 +76,8 @@ export default new Vuex.Store({ // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 // UPLOADURL: 'http://139.9.66.234:7072/upload/image',//三江集团 // FILEURL: 'http://139.9.66.234:7072/image/',//三江集团 + UPLOADURL: 'http://182.90.224.147:18170/upload/image',//三江集团 + FILEURL: 'http://182.90.224.147:18170/image/',//三江集团 ACCOUNTTYPE: [ "系统管理员", diff --git a/src/views/projectAdmin/dataBoard/laborManage.vue b/src/views/projectAdmin/dataBoard/laborManage.vue index 60923e5d..570c84f4 100644 --- a/src/views/projectAdmin/dataBoard/laborManage.vue +++ b/src/views/projectAdmin/dataBoard/laborManage.vue @@ -1,189 +1,211 @@