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

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyunapp into bjxz-rain

Browse Source
This commit is contained in:
”Rain“ 2024-06-07 17:44:11 +08:00
commit dec276cf88
4 changed files with 74 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pages/alarmPage/disposition/disposition.vue
View File

@ -13,7 +13,7 @@
</headers> </headers>
</view> </view>
<view class="content"> <view class="content">
<!-- <view class="row-line"> <view class="row-line">
<view class="row-label"> <view class="row-label">
<text style="color: firebrick;">*</text> <text style="color: firebrick;">*</text>
<text>处置结果</text> <text>处置结果</text>
@ -25,7 +25,7 @@
</radio-group> </radio-group>
</view> </view>
</view> </view>
<view class="row-line" v-show="isDis === 'dis'"> <!-- <view class="row-line" v-show="isDis === 'dis'">
<view class="row-label"> <view class="row-label">
<text>描述</text> <text>描述</text>
</view> </view>
@ -74,10 +74,6 @@
<text style="display: flex;align-items: center;margin-left: 10px;">分</text> <text style="display: flex;align-items: center;margin-left: 10px;">分</text>
</view> </view>
</view> </view>
</view> </view>
<view class="confirm-btn" @click="confirm"> <view class="confirm-btn" @click="confirm">
<view class="inner-btn">确认</view> <view class="inner-btn">确认</view>
@ -131,19 +127,35 @@
console.log(">>>>>>>>>>>>>>>>>>>>>>>"); console.log(">>>>>>>>>>>>>>>>>>>>>>>");
console.log(this.selectedItem); console.log(this.selectedItem);
console.log(this.alarmItem); console.log(this.alarmItem);
if(this.workerId === '' || this.workerId === null || this.workerId === undefined){ let requestData = {}
uni.showToast({ if(this.isDis == 'dis'){
title: '请选择违章人员', requestData = {
icon: "none" ...this.alarmItem,
}) handleResult: 1,
return handleDone: true,
} projectSn: this.projectSn,
if(!this.deductScore){ workerInfoList: [{id: this.workerId}]
uni.showToast({ }
title: '请输入分数', if(this.workerId === '' || this.workerId === null || this.workerId === undefined){
icon: "none" uni.showToast({
}) title: '请选择违章人员',
return icon: "none"
})
return
}
if(!this.deductScore){
uni.showToast({
title: '请输入分数',
icon: "none"
})
return
}
}else{
requestData = {
...this.alarmItem,
handleResult: 2,
projectSn: this.projectSn,
}
} }
// if(this.isDis === 'dis') { // if(this.isDis === 'dis') {
// if(this.workerId === '' || this.workerId === null || this.workerId === undefined){ // if(this.workerId === '' || this.workerId === null || this.workerId === undefined){
@ -179,21 +191,16 @@
// this.alarmItem.handleResult = this.handleResult // this.alarmItem.handleResult = this.handleResult
// } // }
// this.handleResult = 1 // this.handleResult = 1
let requestData = {
...this.alarmItem,
handleResult: 1,
handleDone: true,
projectSn: this.projectSn,
workerInfoList: [{id: this.workerId}]
}
this.sendRequest({ this.sendRequest({
url: 'xmgl/aiAnalyseHardWareAlarmRecord/edit', // url: 'xmgl/aiAnalyseHardWareAlarmRecord/edit',
url: 'xmgl/aiAnalyseHardWareAlarmRecord/setFalsePositive',
method: "post", method: "post",
data: requestData, data: requestData,
success: res => { success: res => {
if (res.code == 200) { if (res.code == 200) {
console.log('res', res) console.log('res', res)
uni.navigateBack({delta: 1}) uni.navigateBack({delta: 2})
} }
} }
}) })
@ -221,8 +228,8 @@
}, },
cleanForm(){ cleanForm(){
this.workerId = '' this.workerId = ''
this.desc = '' // this.desc = ''
this.deductScore = '' // this.deductScore = ''
}, },
bindTextAreaBlur(e) { bindTextAreaBlur(e) {
this.desc = e.detail.value this.desc = e.detail.value

36
pages/alarmPage/shutting/shutting.vue
View File

@ -13,20 +13,23 @@
</headers> </headers>
</view> </view>
<view class="content"> <view class="content">
<!-- <view class="row-line"> <view class="row-line">
<view class="row-label"> <view class="row-label">
<text style="color: firebrick;">*</text> <text style="color: firebrick;">*</text>
<text>处置结果</text> <text>处置结果</text>
</view> </view>
<view class="row-content"> <view class="row-content">
<text style="color: #d8d8d8;">已处置</text> <!-- <text style="color: #d8d8d8;">已处置</text> -->
<radio-group @change="isShowContent" v-model="isDis"> <!-- <radio-group @change="isShowContent" v-model="alarmItem.handleResult"> -->
<radio value="dis" checked="true">已处置</radio> <radio-group v-model="alarmItem.handleResult">
<radio value="ign" disabled="true" style="">误报忽略</radio> <!-- <radio :value="1" checked="true">已处置</radio>
<radio :value="2" disabled="true" style="">误报忽略</radio> -->
<radio :disabled="true" :checked="alarmItem.handleResult == 1">已处置</radio>
<radio :disabled="true" :checked="alarmItem.handleResult == 2">误报忽略</radio>
</radio-group> </radio-group>
</view> </view>
</view> </view>
<view class="row-line" v-show="isDis === 'dis'"> <!-- <view class="row-line" v-show="alarmItem.handleResult === 1">
<view class="row-label"> <view class="row-label">
<text>描述</text> <text>描述</text>
</view> </view>
@ -34,7 +37,7 @@
<textarea style="background-color: #e1e1e1;" disabled :value="alarmItem.desc" @blur="bindTextAreaBlur" /> <textarea style="background-color: #e1e1e1;" disabled :value="alarmItem.desc" @blur="bindTextAreaBlur" />
</view> </view>
</view> --> </view> -->
<view class="row-line" v-show="isDis === 'dis'"> <view class="row-line" v-show="alarmItem.handleResult === 1">
<view class="row-label"> <view class="row-label">
<text style="color: firebrick;">*</text> <text style="color: firebrick;">*</text>
<text>违章人员</text> <text>违章人员</text>
@ -48,7 +51,7 @@
</select> --> </select> -->
</view> </view>
</view> </view>
<view class="row-line" v-show="isDis === 'dis'"> <view class="row-line" v-show="alarmItem.handleResult === 1">
<view class="row-label"> <view class="row-label">
<text style="color: firebrick;">*</text> <text style="color: firebrick;">*</text>
<text>扣</text> <text>扣</text>
@ -72,7 +75,7 @@
export default { export default {
data() { data() {
return { return {
isDis: 'dis', handleResult: '',
dispositionForm: { dispositionForm: {
workerId: '', workerId: '',
desc: '', desc: '',
@ -87,6 +90,7 @@
onLoad(option) { onLoad(option) {
this.alarmItem = JSON.parse(decodeURIComponent(option.item)); this.alarmItem = JSON.parse(decodeURIComponent(option.item));
this.alarmItem.deductScore = this.alarmItem.aiDeductRule.deductScore; this.alarmItem.deductScore = this.alarmItem.aiDeductRule.deductScore;
// this.handleResult = this.alarmItem.handleResult
console.log('alarmItem',this.alarmItem) console.log('alarmItem',this.alarmItem)
}, },
mounted() { mounted() {
@ -109,13 +113,13 @@
} }
}) })
}, },
isShowContent(e){ // isShowContent(e){
this.isDis = e.detail.value // this.handleResult = e.detail.value
if(this.isDis === 'ign'){ // if(this.handleResult === 2){
this.cleanForm() // this.cleanForm()
} // }
console.log(this.dispositionForm); // console.log(this.dispositionForm);
}, // },
cleanForm(){ cleanForm(){
this.dispositionForm.workerId = '' this.dispositionForm.workerId = ''
this.dispositionForm.desc = '' this.dispositionForm.desc = ''

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

@ -570,7 +570,7 @@
this.getCheckPointList(); this.getCheckPointList();
this.getIssueList(); this.getIssueList();
this.getPersonList(); this.getPersonList();
this.getReviewPeopleList(); // this.getReviewPeopleList();
// this.getPersonUpdateList(); // this.getPersonUpdateList();
this.getProgressListData() this.getProgressListData()
console.log('lll', option.taskId, option.itemId) console.log('lll', option.taskId, option.itemId)
@ -590,7 +590,10 @@
method: 'post', method: 'post',
data: { data: {
projectSn: this.projectSn, projectSn: this.projectSn,
enterpriseTypeId: 7, // enterpriseTypeId: 7,
qualityRegionId: this.form.regionId,
qualityRegionBindType: 2,
isSupervisingRoleName: 1
}, },
success: res => { success: res => {
console.log(res.result) console.log(res.result)
@ -749,7 +752,8 @@
url: 'xmgl/qualityRegion/list', url: 'xmgl/qualityRegion/list',
method: 'post', method: 'post',
data: { data: {
projectSn: this.projectSn projectSn: this.projectSn,
notSupervisingUnit: 1
}, },
success: res => { success: res => {
if (res.code == 200) { if (res.code == 200) {
@ -810,6 +814,7 @@
// this.changePeopleIndex = index // this.changePeopleIndex = index
// } // }
// }); // });
this.getReviewPeopleList()
} else if (type == 2) { } else if (type == 2) {
console.log('选择问题描述的数据', val); console.log('选择问题描述的数据', val);
//设置问题描述 //设置问题描述

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

@ -89,6 +89,7 @@
<textarea class="textarea" maxlength="-1" placeholder-class="cl" name="inspectContent" <textarea class="textarea" maxlength="-1" placeholder-class="cl" name="inspectContent"
@input='supplementTextarea' :value="form.dangerDesc" placeholder="请输入"></textarea> @input='supplementTextarea' :value="form.dangerDesc" placeholder="请输入"></textarea>
</view> </view>
<view class="type flex3" v-if="typeCheck == 'type1'"> <view class="type flex3" v-if="typeCheck == 'type1'">
<view class="name">整改要求：</view> <view class="name">整改要求：</view>
<textarea class="textarea" maxlength="-1" placeholder-class="cl" name="inspectContent" <textarea class="textarea" maxlength="-1" placeholder-class="cl" name="inspectContent"
@ -572,7 +573,7 @@
this.getCheckPointList(); this.getCheckPointList();
this.getIssueList(); this.getIssueList();
this.getPersonList(); this.getPersonList();
this.getReviewPeopleList(); // this.getReviewPeopleList();
// this.getPersonUpdateList(); // this.getPersonUpdateList();
this.getProgressListData() this.getProgressListData()
console.log('lll', option.taskId, option.itemId) console.log('lll', option.taskId, option.itemId)
@ -594,7 +595,10 @@
method: 'post', method: 'post',
data: { data: {
projectSn: this.projectSn, projectSn: this.projectSn,
enterpriseTypeId: 7, // enterpriseTypeId: 7,
qualityRegionId: this.form.regionId,
qualityRegionBindType: 2,
isSupervisingRoleName: 1
}, },
success: res => { success: res => {
console.log(res.result) console.log(res.result)
@ -753,7 +757,8 @@
url: 'xmgl/qualityRegion/list', url: 'xmgl/qualityRegion/list',
method: 'post', method: 'post',
data: { data: {
projectSn: this.projectSn projectSn: this.projectSn,
notSupervisingUnit: 1
}, },
success: res => { success: res => {
if (res.code == 200) { if (res.code == 200) {
@ -817,6 +822,7 @@
// this.changePeopleIndex = index // this.changePeopleIndex = index
// } // }
// }); // });
this.getReviewPeopleList()
} else if (type == 2) { } else if (type == 2) {
console.log('选择问题描述的数据', val); console.log('选择问题描述的数据', val);
//设置问题描述 //设置问题描述