diff --git a/main.js b/main.js index 336922a9..68ce4451 100644 --- a/main.js +++ b/main.js @@ -59,8 +59,8 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 // Vue.prototype.url_config = 'http://192.168.34.221:28890/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地 - // Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地 - Vue.prototype.url_config = 'http://192.168.34.221:19112/' //郭圣雄本地 + Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地 + // Vue.prototype.url_config = 'http://192.168.34.221:19112/' //郭圣雄本地 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目 diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue index 15e3122a..dcb29050 100644 --- a/pages/projectEnd/qualityManage/addIssue.vue +++ b/pages/projectEnd/qualityManage/addIssue.vue @@ -683,7 +683,11 @@ }, onSubmitType(type) { if (type == 1) { - this.form.regionDrawId = this.constructionAreasList.join(','); + const dataId = this.constructionAreasList.join(','); + if(dataId != this.form.regionDrawId) { + this.form.drawingPointData = []; + } + this.form.regionDrawId = dataId; this.getQualityRegionConstructionDrawById(); this.constructionAreasShow = false; } @@ -697,13 +701,13 @@ reelectClick() { if (!this.form.regionDrawId) { uni.showToast({ - title: '施工图纸不存在！', + title: '请先选择施工图纸！', icon: "none", }); return } uni.navigateTo({ - url: `./ImageAnnotation?regionDrawId=${this.form.regionDrawId}&drawingPointData=${JSON.stringify(this.form.drawingPointData)}` + url: `/pages/projectEnd/safeSame/ImageAnnotation?regionDrawId=${this.form.regionDrawId}&drawingPointData=${JSON.stringify(this.form.drawingPointData)}` }) }, // 区域 @@ -912,7 +916,7 @@ let data = { projectSn: this.projectSn, // enterpriseTypeId: 7, - qualityRegionId: this.form.regionIds.join(','), + qualityRegionIdForReview: this.form.regionIds.join(','), // qualityRegionBindType: 2, // isSupervisingRoleName: 1 } @@ -1138,6 +1142,7 @@ notSupervisingUnit: 1, pageNo: 1, pageSize: -1, + securityType: 2, }, success: res => { if (res.code == 200) { @@ -1536,7 +1541,7 @@ data: { projectSn: this.projectSn, enterpriseId: this.unitEnterpriseId.join(','), - safeQualityRegionIdForDuty: this.form.regionIds.join(","), + qualityRegionIdForDuty: this.form.regionIds.join(","), }, success: res => { console.log(res.result) diff --git a/pages/projectEnd/qualityManage/details.vue b/pages/projectEnd/qualityManage/details.vue index 9796a096..7a9ed136 100644 --- a/pages/projectEnd/qualityManage/details.vue +++ b/pages/projectEnd/qualityManage/details.vue @@ -257,7 +257,7 @@ return } uni.navigateTo({ - url: `./ImageAnnotation?regionDrawId=${this.basicInfo.regionDrawId}&drawingPointData=${this.basicInfo.drawingPointData}&viewMode=${'detail'}` + url: `/pages/projectEnd/safeSame/ImageAnnotation?regionDrawId=${this.basicInfo.regionDrawId}&drawingPointData=${this.basicInfo.drawingPointData}&viewMode=${'detail'}` }) }, getDicProjectTypeList() { diff --git a/pages/projectEnd/qualityManage/editIssue.vue b/pages/projectEnd/qualityManage/editIssue.vue index 258ddb65..de11c8de 100644 --- a/pages/projectEnd/qualityManage/editIssue.vue +++ b/pages/projectEnd/qualityManage/editIssue.vue @@ -412,7 +412,7 @@ @confirm="(val)=>checkPointBtn(val,7)" idKey='userId' :range="personUpdateList" rangeKey="realName" confirmColor="#4e8af7" :selectParent="true" /> - + 请选择施工图纸 @@ -691,7 +691,11 @@ }, onSubmitType(type) { if (type == 1) { - this.form.regionDrawId = this.constructionAreasList.join(','); + const dataId = this.constructionAreasList.join(','); + if(dataId != this.form.regionDrawId) { + this.form.drawingPointData = []; + } + this.form.regionDrawId = dataId; this.getQualityRegionConstructionDrawById(); this.constructionAreasShow = false; } @@ -705,13 +709,13 @@ reelectClick() { if (!this.form.regionDrawId) { uni.showToast({ - title: '施工图纸不存在！', + title: '请先选择施工图纸！', icon: "none", }); return } uni.navigateTo({ - url: `./ImageAnnotation?regionDrawId=${this.form.regionDrawId}&drawingPointData=${JSON.stringify(this.form.drawingPointData)}` + url: `/pages/projectEnd/safeSame/ImageAnnotation?regionDrawId=${this.form.regionDrawId}&drawingPointData=${JSON.stringify(this.form.drawingPointData)}` }) }, // 区域 @@ -792,10 +796,10 @@ reviewIds: res.result.reviewIds ? res.result.reviewIds.split(",") : [], verifyManIds: res.result.verifyManIds ? res.result.verifyManIds.split(",") : [], - drawingPointData: - res.result.drawingPointData && isJSON(res.result.drawingPointData) - ? JSON.parse(res.result.drawingPointData) - : [], + drawingPointData: res.result.drawingPointData && isJSON(res.result + .drawingPointData) ? + JSON.parse(res.result.drawingPointData) : + [], }; that.checkPointName = that.form.regionName; that.issueName = that.form.dangerItemContent; @@ -1011,7 +1015,7 @@ let data = { projectSn: this.projectSn, // enterpriseTypeId: 7, - qualityRegionId: this.form.regionIds.join(','), + qualityRegionIdForReview: this.form.regionIds.join(','), // qualityRegionBindType: 2, // isSupervisingRoleName: 1 } @@ -1238,6 +1242,7 @@ notSupervisingUnit: 1, pageNo: 1, pageSize: -1, + securityType: 2, }, success: res => { if (res.code == 200) { @@ -1619,7 +1624,7 @@ data: { projectSn: this.projectSn, enterpriseId: this.unitEnterpriseId.join(','), - safeQualityRegionIdForDuty: this.form.regionIds.join(","), + qualityRegionIdForDuty: this.form.regionIds.join(","), }, success: res => { console.log(res.result) @@ -2145,6 +2150,99 @@