From 9e7b3170f8441baa718bf0d31b15e7699c1fae58 Mon Sep 17 00:00:00 2001 From: Vce Date: Tue, 11 Jun 2024 21:38:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectFront/quality/inspectionLedger.vue | 7 ++++--- src/views/projectFront/safeSame/inspectionLedger.vue | 12 ++++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue index 99e3cdda..e5530299 100644 --- a/src/views/projectFront/quality/inspectionLedger.vue +++ b/src/views/projectFront/quality/inspectionLedger.vue @@ -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, }; diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index 0f717973..cf28abc1 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -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, }; From 27b400978f531d5835d89aab7d0c5d1912538e38 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Tue, 11 Jun 2024 21:43:42 +0800 Subject: [PATCH 2/2] 1 --- public/js/config.js | 4 ++-- src/assets/js/http.js | 38 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index b0e0a3fd..5e4a71cd 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -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', // 普通版 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 93ac0adb..01d7a8c2 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -169,25 +169,25 @@ 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/' //金林湾测试线上 - 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/' //中科安信正式地址 + // 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/' //中科安信正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com";