diff --git a/dist.zip b/dist.zip index 0e875437..93c5f1bf 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/assets/js/http.js b/src/assets/js/http.js index b84c5450..aac7df86 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -37,7 +37,7 @@ if (process.env.NODE_ENV == 'development') { // 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 123456789 + // axios.defaults.baseURL = 'http://36.137.53.203:9090/'; // 南昌地铁 17512009894 123456789 gdjt 123456789 // axios.defaults.baseURL = 'http://192.168.34.125:6023/' // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南 @@ -56,7 +56,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; // // axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上 // axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁 - // axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期 + axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期 // axios.defaults.baseURL = 'http://124.71.178.44:30/'; // axios.defaults.baseURL = 'http://192.168.34.125:9090/'; // axios.defaults.baseURL = 'http://192.168.88.220:6023/'; diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue index 652d29ab..86a8cad7 100644 --- a/src/views/companyAdmin/companyDiagram.vue +++ b/src/views/companyAdmin/companyDiagram.vue @@ -1972,7 +1972,7 @@ export default { }, addOrganizationFn(data){ this.state = '' - console.log(data) + console.log('----------',data) // if(data.companyType==2){ // this.add2(data.companyId,data.companyType) // } diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue index c246e006..cc5fb1c3 100644 --- a/src/views/projectFront/laborManage/personDetails.vue +++ b/src/views/projectFront/laborManage/personDetails.vue @@ -2222,7 +2222,6 @@ export default { }, handleCheckAllChangeFace(val) { if (val) { - debugger this.workerInfo.ufaceDevId = []; this.ufaceDevAllList.forEach((item) => { if (!item.disabled) { diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index 2d29d9d9..1ce3e84c 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -2609,7 +2609,7 @@ export default { personSerial: '' } this.getUfaceDevList() - this.goTwo() + // this.goTwo() this.addPersonDialog = true this.personForm = JSON.parse(JSON.stringify(value)) this.personForm.sex = Number(value.sex) diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index 7199a76c..d2a26abe 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/src/views/projectFront/laborManage/personModule/laborComponent.vue @@ -2578,13 +2578,12 @@ export default { handleCheckAllChangeFace(val) { // console.log('全选',val); if (val) { - debugger this.personForm.ufaceDevId = []; this.ufaceDevAllList.forEach((item) => { this.personForm.ufaceDevId.push(item.id); }); } else { - this.ufaceDevAllList = [] + // this.ufaceDevAllList = [] this.personForm.ufaceDevId = []; } this.isIndeterminate2 = false;