admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：冲突

Browse Source
This commit is contained in:
”Rain“ 2024-06-11 21:48:57 +08:00
commit 38498c2892
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/config.js
View File

@ -16,10 +16,10 @@ var COMPANY = '' //通用
// COMPANY = 'sccr'//四川成润
// COMPANY = 'pssh'//坪山沙湖项目
// COMPANY = 'jlw'//金林湾
COMPANY = 'shzj' //上海张江
// COMPANY = 'shzj' //上海张江
// COMPANY = 'shjg'//上海优益（上海建工）
// COMPANY = 'agjt'//鞍钢集团
// COMPANY = 'zkax'//中科安信
COMPANY = 'zkax' //中科安信
var PROJECT = {
local_test: 'common', // 普通版

22
src/assets/js/http.js
View File

@ -169,6 +169,7 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
// axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖（最新）地址
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
<<<<<<< .mine
// 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:28888/' //郭圣雄本地
@ -188,6 +189,27 @@ if (process.env.NODE_ENV == "development") {
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
=======
// 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: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.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/' //沈阳和盈
// 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:8099/'//中建四局(沙湖)线上（最新）地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址
>>>>>>> .theirs
} else if (process.env.NODE_ENV == "debug") {
axios.defaults.baseURL = "https://www.ceshi.com";

7
src/views/projectFront/quality/inspectionLedger.vue
View File

@ -2374,7 +2374,7 @@ export default {
}else {
this.getReviewPeopleList(this.addForm1.regionId);
}
this.addForm1.reviewId = ""
// this.addForm1.reviewId = ""
},
deep:true,
},
@ -2385,7 +2385,7 @@ export default {
}else {
this.getReviewPeopleList(newVal);
}
this.addForm2.reviewId = ""
// this.addForm2.reviewId = ""
},
deep:true,
}
@ -3233,7 +3233,8 @@ export default {
let data = {
projectSn: this.projectSn,
// enterpriseTypeId: 7,
qualityRegionId: regionId[0].toString(),
// qualityRegionId: regionId[0].toString(),
qualityRegionId: regionId.toString(),
qualityRegionBindType: 2,
isSupervisingRoleName: 1,
};

12
src/views/projectFront/safeSame/inspectionLedger.vue
View File

@ -2356,7 +2356,7 @@ export default {
}else {
this.getReviewPeopleList(newVal);
}
this.addForm1.reviewId = ""
// this.addForm1.reviewId = ""
},
deep:true,
},
@ -2367,7 +2367,7 @@ export default {
}else {
this.getReviewPeopleList(newVal);
}
this.addForm2.reviewId = ""
// this.addForm2.reviewId = ""
},
deep:true,
}
@ -2425,7 +2425,10 @@ export default {
})
.catch(() => {});
},
editRow(obj){ // 编辑撤回数据(重新提交)
async editRow(obj){ // 编辑撤回数据(重新提交)
console.log("77777777777777777777777777777")
// await this.getReviewPeopleList(obj.regionId)
console.log("77777777777777777777777777777")
console.log(this.addForm1,777)
this.addTitle = "编辑";
this.recordType = obj.recordType;
@ -3187,7 +3190,8 @@ export default {
let data = {
projectSn: this.projectSn,
// enterpriseTypeId: 7,
qualityRegionId: regionId[0].toString(),
// qualityRegionId: regionId[0].toString(),
qualityRegionId: regionId.toString(),
qualityRegionBindType: 2,
isSupervisingRoleName: 1,
};