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

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-04-29 15:58:49 +08:00
parent 1a12f64d40
commit 54e6b6d32f
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,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://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://47.93.215.234:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址

28
src/store/index.js
View File

@ -48,24 +48,24 @@ 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/',//郭圣雄
// WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
// UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
// FILEURL:'http://jxj.zhgdyun.com:15551/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/", //正式环境
// WORKFLOWURL: 'http://182.90.224.237:9811/#/workspace/forms',//测试平台工作流地址
WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址
WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://182.90.224.237:9814/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl

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

@ -2419,6 +2419,8 @@ export default {
}
this.addForm1.notifyPerson = data.intendanceIds ? data.intendanceIds.split(',') : []
console.log(' this.addForm1.notifyPerson================', this.addForm1.notifyPerson);
this.subcontractList = data.enterpriseInfos;
this.crewUpdateList = data.systemUsers;
} else if (this.recordType == 2) {
let pathLabels =
this.$refs['addFormRegion2'].getCheckedNodes()[0].pathLabels
@ -2609,7 +2611,7 @@ export default {
this.getPositionList()
this.getDescribeClassifyList()
this.getPeopleList()
this.getPeopleUpdateList();
// this.getPeopleUpdateList();
this.getRoutineInspect()
this.close()
this.rectifyRecordList = []
@ -2754,17 +2756,17 @@ export default {
if (type != 1) {
this.showEnterpriseDialog = true
}
let data = {
// enterpriseTypeId: this.subcontractType,
pageNo: 1,
pageSize: 999,
projectSn: this.projectSn
}
getSubcontractListApi(data).then((res) => {
if (res.code == 200) {
this.subcontractList = res.result.records
}
})
// let data = {
// // enterpriseTypeId: this.subcontractType,
// pageNo: 1,
// pageSize: 999,
// projectSn: this.projectSn
// }
// getSubcontractListApi(data).then((res) => {
// if (res.code == 200) {
// this.subcontractList = res.result.records
// }
// })
},
//切换分包公司类型
changeSubcontractType(val) {
@ -2785,7 +2787,7 @@ export default {
}
this.addForm1.changeId = "";
this.getPeopleList();
this.getPeopleUpdateList();
// this.getPeopleUpdateList();
this.showEnterpriseDialog = false
},