admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

flx:优化安全质量模块

Browse Source
This commit is contained in:
Rain_ 2025-11-28 17:57:38 +08:00
parent a4abb019ad
commit 05af2cd835
9 changed files with 233 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.js
View File

@ -59,8 +59,8 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 // 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:28890/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地 // 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:8111/' //郭圣雄本地
Vue.prototype.url_config = 'http://192.168.34.221:19112/' //郭圣雄本地 // 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://182.90.224.237:51234/' //郭圣雄本地
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目 // Vue.prototype.url_config = 'http://183.249.224.118:9000/'// 嘉兴项目

15
pages/projectEnd/qualityManage/addIssue.vue
View File

@ -683,7 +683,11 @@
}, },
onSubmitType(type) { onSubmitType(type) {
if (type == 1) { 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.getQualityRegionConstructionDrawById();
this.constructionAreasShow = false; this.constructionAreasShow = false;
} }
@ -697,13 +701,13 @@
reelectClick() { reelectClick() {
if (!this.form.regionDrawId) { if (!this.form.regionDrawId) {
uni.showToast({ uni.showToast({
title: '施工图纸不存在！', title: '请先选择施工图纸！',
icon: "none", icon: "none",
}); });
return return
} }
uni.navigateTo({ 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 = { let data = {
projectSn: this.projectSn, projectSn: this.projectSn,
// enterpriseTypeId: 7, // enterpriseTypeId: 7,
qualityRegionId: this.form.regionIds.join(','), qualityRegionIdForReview: this.form.regionIds.join(','),
// qualityRegionBindType: 2, // qualityRegionBindType: 2,
// isSupervisingRoleName: 1 // isSupervisingRoleName: 1
} }
@ -1138,6 +1142,7 @@
notSupervisingUnit: 1, notSupervisingUnit: 1,
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize: -1,
securityType: 2,
}, },
success: res => { success: res => {
if (res.code == 200) { if (res.code == 200) {
@ -1536,7 +1541,7 @@
data: { data: {
projectSn: this.projectSn, projectSn: this.projectSn,
enterpriseId: this.unitEnterpriseId.join(','), enterpriseId: this.unitEnterpriseId.join(','),
safeQualityRegionIdForDuty: this.form.regionIds.join(","), qualityRegionIdForDuty: this.form.regionIds.join(","),
}, },
success: res => { success: res => {
console.log(res.result) console.log(res.result)

2
pages/projectEnd/qualityManage/details.vue
View File

@ -257,7 +257,7 @@
return return
} }
uni.navigateTo({ 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() { getDicProjectTypeList() {

118
pages/projectEnd/qualityManage/editIssue.vue
View File

@ -412,7 +412,7 @@
@confirm="(val)=>checkPointBtn(val,7)" idKey='userId' :range="personUpdateList" rangeKey="realName" @confirm="(val)=>checkPointBtn(val,7)" idKey='userId' :range="personUpdateList" rangeKey="realName"
confirmColor="#4e8af7" :selectParent="true" /> confirmColor="#4e8af7" :selectParent="true" />
<canversCom style="opacity: 0;" v-if="openImg" @imgUrl="imgUrl" :imgList="imgList"></canversCom> <canversCom style="opacity: 0;" v-if="openImg" @imgUrl="imgUrl" :imgList="imgList"></canversCom>
<u-popup :mask-close-able="false" v-model="constructionAreasShow" :closeable="false" mode="bottom"> <u-popup :mask-close-able="false" v-model="constructionAreasShow" :closeable="false" mode="bottom">
<view class="content-popup"> <view class="content-popup">
<view class="content-popup_header"> <view class="content-popup_header">
<view>请选择施工图纸</view> <view>请选择施工图纸</view>
@ -691,7 +691,11 @@
}, },
onSubmitType(type) { onSubmitType(type) {
if (type == 1) { 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.getQualityRegionConstructionDrawById();
this.constructionAreasShow = false; this.constructionAreasShow = false;
} }
@ -705,13 +709,13 @@
reelectClick() { reelectClick() {
if (!this.form.regionDrawId) { if (!this.form.regionDrawId) {
uni.showToast({ uni.showToast({
title: '施工图纸不存在！', title: '请先选择施工图纸！',
icon: "none", icon: "none",
}); });
return return
} }
uni.navigateTo({ 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(",") : [], reviewIds: res.result.reviewIds ? res.result.reviewIds.split(",") : [],
verifyManIds: res.result.verifyManIds ? res.result.verifyManIds.split(",") : verifyManIds: res.result.verifyManIds ? res.result.verifyManIds.split(",") :
[], [],
drawingPointData: drawingPointData: res.result.drawingPointData && isJSON(res.result
res.result.drawingPointData && isJSON(res.result.drawingPointData) .drawingPointData) ?
? JSON.parse(res.result.drawingPointData) JSON.parse(res.result.drawingPointData) :
: [], [],
}; };
that.checkPointName = that.form.regionName; that.checkPointName = that.form.regionName;
that.issueName = that.form.dangerItemContent; that.issueName = that.form.dangerItemContent;
@ -1011,7 +1015,7 @@
let data = { let data = {
projectSn: this.projectSn, projectSn: this.projectSn,
// enterpriseTypeId: 7, // enterpriseTypeId: 7,
qualityRegionId: this.form.regionIds.join(','), qualityRegionIdForReview: this.form.regionIds.join(','),
// qualityRegionBindType: 2, // qualityRegionBindType: 2,
// isSupervisingRoleName: 1 // isSupervisingRoleName: 1
} }
@ -1238,6 +1242,7 @@
notSupervisingUnit: 1, notSupervisingUnit: 1,
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize: -1,
securityType: 2,
}, },
success: res => { success: res => {
if (res.code == 200) { if (res.code == 200) {
@ -1619,7 +1624,7 @@
data: { data: {
projectSn: this.projectSn, projectSn: this.projectSn,
enterpriseId: this.unitEnterpriseId.join(','), enterpriseId: this.unitEnterpriseId.join(','),
safeQualityRegionIdForDuty: this.form.regionIds.join(","), qualityRegionIdForDuty: this.form.regionIds.join(","),
}, },
success: res => { success: res => {
console.log(res.result) console.log(res.result)
@ -2145,6 +2150,99 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.content-popup {
.content-popup_main {
padding: 26rpx 0;
>view {
width: 100%;
height: 80rpx;
background-color: #FFFFFF;
font-weight: 500;
font-size: 30rpx;
color: #1A1A1A;
display: flex;
align-items: center;
justify-content: center;
}
>view:not(:first-child) {
margin-top: 20rpx;
}
.popup_main_active {
background-color: rgba(81, 129, 246, 0.1);
color: #5181F6;
}
}
uni-scroll-view {
margin: 26rpx 0;
}
.content-popup_header {
padding: 40rpx 26rpx 26rpx;
display: flex;
align-items: center;
justify-content: space-between;
font-weight: 500;
>view:first-child {
font-size: 30rpx;
color: #1A1A1A;
}
>view:last-child {
font-size: 28rpx;
color: #808080;
display: flex;
align-items: center;
.u-icon {
margin-left: 12rpx;
}
}
}
.tree-search {
padding: 0rpx 26rpx;
.tree-search-input {
border-radius: 48rpx;
}
}
.confrim-btn {
padding: 18rpx 26rpx;
background-color: #FFFFFF;
box-shadow: 0rpx -8rpx 8rpx 0rpx rgba(0, 0, 0, 0.05);
display: flex;
>view {
width: 50%;
height: 76rpx;
font-weight: 500;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: center;
}
>view:first-child {
background-color: rgba(81, 129, 246, 0.1);
border-radius: 6rpx 0rpx 0rpx 6rpx;
color: #5181F6;
}
>view:last-child {
background-color: #5181F6;
border-radius: 0rpx 6rpx 6rpx 0rpx;
color: #FFFFFF;
}
}
}
.confrim-btn { .confrim-btn {
padding: 18rpx 26rpx; padding: 18rpx 26rpx;
background-color: #FFFFFF; background-color: #FFFFFF;

5
pages/projectEnd/qualityManage/hiddenTroubleComponents/addHazardousWorkDistribution.vue
View File

@ -856,7 +856,7 @@
let data = { let data = {
projectSn: this.projectSn, projectSn: this.projectSn,
// enterpriseTypeId: 7, // enterpriseTypeId: 7,
qualityRegionId: this.form.regionIds.join(','), qualityRegionIdForReview: this.form.regionIds.join(','),
// qualityRegionBindType: 2, // qualityRegionBindType: 2,
// isSupervisingRoleName: 1 // isSupervisingRoleName: 1
} }
@ -1043,6 +1043,7 @@
notSupervisingUnit: 1, notSupervisingUnit: 1,
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize: -1,
securityType: 2,
}, },
success: res => { success: res => {
if (res.code == 200) { if (res.code == 200) {
@ -1460,7 +1461,7 @@
data: { data: {
projectSn: this.projectSn, projectSn: this.projectSn,
enterpriseId: this.unitEnterpriseId.join(','), enterpriseId: this.unitEnterpriseId.join(','),
safeQualityRegionIdForDuty: this.form.regionIds.join(","), qualityRegionIdForDuty: this.form.regionIds.join(","),
}, },
success: res => { success: res => {
console.log(res.result) console.log(res.result)

1
pages/projectEnd/qualityManage/hiddenTroubleComponents/hazardousWorkDistribution.vue
View File

@ -583,6 +583,7 @@
projectSn: this.projectDetail.projectSn, projectSn: this.projectDetail.projectSn,
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize: -1,
securityType: 2,
}; };
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityRegion/tree/page', url: 'xmgl/qualityRegion/tree/page',

1
pages/projectEnd/qualityManage/hiddenTroubleComponents/hiddenTroubleList.vue
View File

@ -595,6 +595,7 @@
projectSn: this.projectDetail.projectSn, projectSn: this.projectDetail.projectSn,
pageNo: 1, pageNo: 1,
pageSize: -1, pageSize: -1,
securityType: 2,
}; };
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityRegion/tree/page', url: 'xmgl/qualityRegion/tree/page',

10
pages/projectEnd/safeSame/addIssue.vue
View File

@ -683,7 +683,11 @@
}, },
onSubmitType(type) { onSubmitType(type) {
if (type == 1) { 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.getQualityRegionConstructionDrawById();
this.constructionAreasShow = false; this.constructionAreasShow = false;
} }
@ -697,7 +701,7 @@
reelectClick() { reelectClick() {
if (!this.form.regionDrawId) { if (!this.form.regionDrawId) {
uni.showToast({ uni.showToast({
title: '施工图纸不存在！', title: '请先选择施工图纸！',
icon: "none", icon: "none",
}); });
return return
@ -912,7 +916,7 @@
let data = { let data = {
projectSn: this.projectSn, projectSn: this.projectSn,
// enterpriseTypeId: 7, // enterpriseTypeId: 7,
qualityRegionId: this.form.regionIds.join(','), safeQualityRegionIdForReview: this.form.regionIds.join(','),
// qualityRegionBindType: 2, // qualityRegionBindType: 2,
// isSupervisingRoleName: 1 // isSupervisingRoleName: 1
} }

103
pages/projectEnd/safeSame/editIssue.vue
View File

@ -691,7 +691,11 @@
}, },
onSubmitType(type) { onSubmitType(type) {
if (type == 1) { 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.getQualityRegionConstructionDrawById();
this.constructionAreasShow = false; this.constructionAreasShow = false;
} }
@ -705,7 +709,7 @@
reelectClick() { reelectClick() {
if (!this.form.regionDrawId) { if (!this.form.regionDrawId) {
uni.showToast({ uni.showToast({
title: '施工图纸不存在！', title: '请先选择施工图纸！',
icon: "none", icon: "none",
}); });
return return
@ -1011,7 +1015,7 @@
let data = { let data = {
projectSn: this.projectSn, projectSn: this.projectSn,
// enterpriseTypeId: 7, // enterpriseTypeId: 7,
qualityRegionId: this.form.regionIds.join(','), safeQualityRegionIdForReview: this.form.regionIds.join(','),
// qualityRegionBindType: 2, // qualityRegionBindType: 2,
// isSupervisingRoleName: 1 // isSupervisingRoleName: 1
} }
@ -2145,6 +2149,99 @@
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.content-popup {
.content-popup_main {
padding: 26rpx 0;
>view {
width: 100%;
height: 80rpx;
background-color: #FFFFFF;
font-weight: 500;
font-size: 30rpx;
color: #1A1A1A;
display: flex;
align-items: center;
justify-content: center;
}
>view:not(:first-child) {
margin-top: 20rpx;
}
.popup_main_active {
background-color: rgba(81, 129, 246, 0.1);
color: #5181F6;
}
}
uni-scroll-view {
margin: 26rpx 0;
}
.content-popup_header {
padding: 40rpx 26rpx 26rpx;
display: flex;
align-items: center;
justify-content: space-between;
font-weight: 500;
>view:first-child {
font-size: 30rpx;
color: #1A1A1A;
}
>view:last-child {
font-size: 28rpx;
color: #808080;
display: flex;
align-items: center;
.u-icon {
margin-left: 12rpx;
}
}
}
.tree-search {
padding: 0rpx 26rpx;
.tree-search-input {
border-radius: 48rpx;
}
}
.confrim-btn {
padding: 18rpx 26rpx;
background-color: #FFFFFF;
box-shadow: 0rpx -8rpx 8rpx 0rpx rgba(0, 0, 0, 0.05);
display: flex;
>view {
width: 50%;
height: 76rpx;
font-weight: 500;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: center;
}
>view:first-child {
background-color: rgba(81, 129, 246, 0.1);
border-radius: 6rpx 0rpx 0rpx 6rpx;
color: #5181F6;
}
>view:last-child {
background-color: #5181F6;
border-radius: 0rpx 6rpx 6rpx 0rpx;
color: #FFFFFF;
}
}
}
.confrim-btn { .confrim-btn {
padding: 18rpx 26rpx; padding: 18rpx 26rpx;
background-color: #FFFFFF; background-color: #FFFFFF;