diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 74b8eb01..fd7c650b 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,7 +85,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // 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: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/' //沈阳和盈 @@ -93,7 +93,7 @@ if (process.env.NODE_ENV == 'development') { // 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:8099/'//中建四局(沙湖)线上(最新)地址 - axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢集团线上(最新)地址 + // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢集团线上(最新)地址 diff --git a/src/store/index.js b/src/store/index.js index b4d81501..614e3743 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -46,8 +46,8 @@ 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://192.168.34.221:28888/upload/image/',// 郭圣雄 // FILEURL:'http://192.168.34.221:28888/image/',//郭圣雄 // UPLOADURL:'http://jxj.zhgdyun.com:100/upload/image/',// 演示平台 @@ -57,15 +57,15 @@ export default new Vuex.Store({ // 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/projectFront/carManage/carManage.vue b/src/views/projectFront/carManage/carManage.vue index 5affc163..5c179f2b 100644 --- a/src/views/projectFront/carManage/carManage.vue +++ b/src/views/projectFront/carManage/carManage.vue @@ -447,7 +447,7 @@ import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage"; import { - selectAppWorkerListApi + getWorkerInfoList } from "@/assets/js/api/laborPerson"; export default { mounted() { @@ -818,9 +818,9 @@ export default { }) }, getAppWorkerList() { - selectAppWorkerListApi({ projectSn: this.$store.state.projectSn, personType: 1, inserviceType: 1 }).then(result => { - console.log('查询司机信息的数组', result) - this.appWorkerList = result.result; + getWorkerInfoList({ projectSn: this.$store.state.projectSn, pageNo: 1, pageSize: -1, inserviceType: 1 }).then(res => { + console.log('查询司机信息的数组', res) + this.appWorkerList = res.result.records; }) }, } diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index cb9181d5..446fe526 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -202,13 +202,13 @@ $t("message.laborMange.bulkImport") }} - + >