|
|
|
@ -376,7 +376,7 @@ |
|
|
|
<view class="title">存在隐患</view> |
|
|
|
<view class="title">存在隐患</view> |
|
|
|
<u-row :gutter="0" justify="flex-start" style="flex-wrap: wrap"> |
|
|
|
<u-row :gutter="0" justify="flex-start" style="flex-wrap: wrap"> |
|
|
|
<view |
|
|
|
<view |
|
|
|
v-for="item in hiddenDangerList" |
|
|
|
v-for="(item,index) in hiddenDangerList" |
|
|
|
:key="item" |
|
|
|
:key="item" |
|
|
|
style="width: 100%" |
|
|
|
style="width: 100%" |
|
|
|
> |
|
|
|
> |
|
|
|
@ -386,7 +386,7 @@ |
|
|
|
{{ item.dangerProblem }} |
|
|
|
{{ item.dangerProblem }} |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
<view> |
|
|
|
<view> |
|
|
|
<view class="check" @click="onHiddenDangerList(item)"> |
|
|
|
<view class="check" @click="onHiddenDangerList(item,index)"> |
|
|
|
<image |
|
|
|
<image |
|
|
|
style="width: 10px; height: 16px" |
|
|
|
style="width: 10px; height: 16px" |
|
|
|
src="../../static/scimg/right6.png" |
|
|
|
src="../../static/scimg/right6.png" |
|
|
|
@ -438,11 +438,10 @@ |
|
|
|
label-width="100px" |
|
|
|
label-width="100px" |
|
|
|
style="display: flex; align-items: center" |
|
|
|
style="display: flex; align-items: center" |
|
|
|
/> |
|
|
|
/> |
|
|
|
|
|
|
|
<view v-if="hiddenDangerList2.length > 0" |
|
|
|
<view v-if="this.hiddenDangerList2.length > 0" |
|
|
|
>{{ hiddenDangerList2[0].itemname }}/{{ |
|
|
|
>{{ this.hiddenDangerList2[0].itemname }}/{{ |
|
|
|
hiddenDangerList2[1].itemname |
|
|
|
this.hiddenDangerList2[1].itemname |
|
|
|
}}/{{ hiddenDangerList2[2].itemname }}</view |
|
|
|
}}/{{ this.hiddenDangerList2[2].itemname }}</view |
|
|
|
|
|
|
|
> |
|
|
|
> |
|
|
|
|
|
|
|
|
|
|
|
<!-- <u-input |
|
|
|
<!-- <u-input |
|
|
|
@ -451,8 +450,8 @@ |
|
|
|
type="textarea" |
|
|
|
type="textarea" |
|
|
|
v-else |
|
|
|
v-else |
|
|
|
/> --> |
|
|
|
/> --> |
|
|
|
<view v-else-if="this.dangerProblem">{{ |
|
|
|
<view v-else-if="dangerProblem">{{ |
|
|
|
this.dangerProblem |
|
|
|
dangerProblem |
|
|
|
}}</view> |
|
|
|
}}</view> |
|
|
|
<view v-else>请选择</view> |
|
|
|
<view v-else>请选择</view> |
|
|
|
<!-- --> |
|
|
|
<!-- --> |
|
|
|
@ -475,6 +474,7 @@ |
|
|
|
label-position="top" |
|
|
|
label-position="top" |
|
|
|
label-width="200px" |
|
|
|
label-width="200px" |
|
|
|
/> |
|
|
|
/> |
|
|
|
|
|
|
|
|
|
|
|
<u-upload |
|
|
|
<u-upload |
|
|
|
:fileList="fileList" |
|
|
|
:fileList="fileList" |
|
|
|
@afterRead="(e) => afterRead(e, 'fileList')" |
|
|
|
@afterRead="(e) => afterRead(e, 'fileList')" |
|
|
|
@ -694,10 +694,16 @@ export default { |
|
|
|
hiddenDangerList2: [], |
|
|
|
hiddenDangerList2: [], |
|
|
|
hiddenDangerList3: [], |
|
|
|
hiddenDangerList3: [], |
|
|
|
dangerProblem: "", |
|
|
|
dangerProblem: "", |
|
|
|
|
|
|
|
//隐患新增或者编辑判断标识 |
|
|
|
|
|
|
|
addInvestigationInfo:{ |
|
|
|
|
|
|
|
type:'', |
|
|
|
|
|
|
|
index:0 |
|
|
|
|
|
|
|
} |
|
|
|
}; |
|
|
|
}; |
|
|
|
}, |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
methods: { |
|
|
|
showInvestigationTag(v) { |
|
|
|
showInvestigationTag(v) { |
|
|
|
|
|
|
|
console.log(v) |
|
|
|
this.showInvestigation2 = true; |
|
|
|
this.showInvestigation2 = true; |
|
|
|
this.showInvestigation2Item = v; |
|
|
|
this.showInvestigation2Item = v; |
|
|
|
}, |
|
|
|
}, |
|
|
|
@ -726,8 +732,11 @@ export default { |
|
|
|
this.showInvestigation2Item = {}; |
|
|
|
this.showInvestigation2Item = {}; |
|
|
|
this.showInvestigation2 = false; |
|
|
|
this.showInvestigation2 = false; |
|
|
|
}, |
|
|
|
}, |
|
|
|
onHiddenDangerList(v) { |
|
|
|
onHiddenDangerList(v,index) { |
|
|
|
console.log(this.problemTreeSelectConfirmList) |
|
|
|
this.addInvestigationInfo={ |
|
|
|
|
|
|
|
type:'edit', |
|
|
|
|
|
|
|
index:index |
|
|
|
|
|
|
|
} |
|
|
|
this.showProblem = true; |
|
|
|
this.showProblem = true; |
|
|
|
this.dangerProblem = v.dangerProblem; |
|
|
|
this.dangerProblem = v.dangerProblem; |
|
|
|
this.describe = { |
|
|
|
this.describe = { |
|
|
|
@ -738,10 +747,22 @@ export default { |
|
|
|
hdPic: v.hdPic, |
|
|
|
hdPic: v.hdPic, |
|
|
|
hdInfo: v.hdInfo, |
|
|
|
hdInfo: v.hdInfo, |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
console.log(v) |
|
|
|
// this.fileList = [v.hdPic]; |
|
|
|
let newArr=[] |
|
|
|
|
|
|
|
try{ |
|
|
|
|
|
|
|
newArr= v.dangerProblem.split('/') |
|
|
|
|
|
|
|
}catch(e){ |
|
|
|
|
|
|
|
newArr=['','',''] |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.hiddenDangerList2=[{id:v.bigCategory,itemname:newArr[0]}, |
|
|
|
|
|
|
|
{id:v.smallCategory,itemname:newArr[1]}, |
|
|
|
|
|
|
|
{id:v.hdTerm,itemname:newArr[2]}] |
|
|
|
|
|
|
|
// console.log(this.hiddenDangerList2) |
|
|
|
|
|
|
|
this.fileList = [{url:v.hdPic}]; |
|
|
|
}, |
|
|
|
}, |
|
|
|
add() { |
|
|
|
add() { |
|
|
|
|
|
|
|
// this.addInvestigationInfo.type='add' |
|
|
|
|
|
|
|
this.$set(this.addInvestigationInfo,'type','add') |
|
|
|
this.showProblem = true; |
|
|
|
this.showProblem = true; |
|
|
|
this.hiddenDangerList2 = []; |
|
|
|
this.hiddenDangerList2 = []; |
|
|
|
this.dangerProblem = ''; |
|
|
|
this.dangerProblem = ''; |
|
|
|
@ -868,6 +889,7 @@ export default { |
|
|
|
JSON.stringify(this.hiddenDangerList3) |
|
|
|
JSON.stringify(this.hiddenDangerList3) |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
console.log(this.hiddenDangerList2) |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
select(v) { |
|
|
|
select(v) { |
|
|
|
@ -912,7 +934,8 @@ export default { |
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
}, |
|
|
|
investigationHandle2() { |
|
|
|
investigationHandle2() { |
|
|
|
this.hiddenDangerList.push({ |
|
|
|
if(this.hiddenDangerList2.length>0){ |
|
|
|
|
|
|
|
let form={ |
|
|
|
bigCategory: this.hiddenDangerList2[0].id, |
|
|
|
bigCategory: this.hiddenDangerList2[0].id, |
|
|
|
bigCategoryName: this.hiddenDangerList2[0].itemname, |
|
|
|
bigCategoryName: this.hiddenDangerList2[0].itemname, |
|
|
|
smallCategory: this.hiddenDangerList2[1].id, |
|
|
|
smallCategory: this.hiddenDangerList2[1].id, |
|
|
|
@ -920,9 +943,17 @@ export default { |
|
|
|
hdTerm: this.hiddenDangerList2[2].id, |
|
|
|
hdTerm: this.hiddenDangerList2[2].id, |
|
|
|
hdTermName: this.hiddenDangerList2[2].itemname, |
|
|
|
hdTermName: this.hiddenDangerList2[2].itemname, |
|
|
|
hdDesc: this.describe.hdDesc, |
|
|
|
hdDesc: this.describe.hdDesc, |
|
|
|
hdPic: this.fileList.url, |
|
|
|
hdPic: this.fileList.length>0?this.fileList[0].url:'', |
|
|
|
hdInfo: this.describe.hdInfo, |
|
|
|
hdInfo: this.describe.hdInfo, |
|
|
|
}); |
|
|
|
dangerProblem:this.hiddenDangerList2[0].itemname+'/'+ this.hiddenDangerList2[1].itemname+'/'+ this.hiddenDangerList2[2].itemname |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(this.addInvestigationInfo.type=='add'){ |
|
|
|
|
|
|
|
this.hiddenDangerList.push(form); |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
this.$set(this.hiddenDangerList,this.addInvestigationInfo.index,form) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
this.showProblem = false; |
|
|
|
this.showProblem = false; |
|
|
|
}, |
|
|
|
}, |
|
|
|
investigationDetailHandle() { |
|
|
|
investigationDetailHandle() { |
|
|
|
@ -1004,6 +1035,7 @@ export default { |
|
|
|
url: resultInfo.result, |
|
|
|
url: resultInfo.result, |
|
|
|
}) |
|
|
|
}) |
|
|
|
); |
|
|
|
); |
|
|
|
|
|
|
|
console.log(this[key]) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
this.$.toast("上传失败"); |
|
|
|
this.$.toast("上传失败"); |
|
|
|
this[key].splice( |
|
|
|
this[key].splice( |
|
|
|
@ -1019,7 +1051,13 @@ export default { |
|
|
|
submit(temporary) { |
|
|
|
submit(temporary) { |
|
|
|
console.log(this.formData); |
|
|
|
console.log(this.formData); |
|
|
|
console.log(this.investigationSelectList); |
|
|
|
console.log(this.investigationSelectList); |
|
|
|
console.log(this.hiddenDangerList); |
|
|
|
console.log({ |
|
|
|
|
|
|
|
...this.formData, |
|
|
|
|
|
|
|
businessId: this.businessId, |
|
|
|
|
|
|
|
extraConfigs: extraConfigs, |
|
|
|
|
|
|
|
describe: this.hiddenDangerList, |
|
|
|
|
|
|
|
temporary, |
|
|
|
|
|
|
|
}); |
|
|
|
let extraConfigs = []; |
|
|
|
let extraConfigs = []; |
|
|
|
this.investigationSelectList.map((r) => { |
|
|
|
this.investigationSelectList.map((r) => { |
|
|
|
r.extraConfigs.map((s) => { |
|
|
|
r.extraConfigs.map((s) => { |
|
|
|
@ -1310,6 +1348,8 @@ export default { |
|
|
|
width: 100%; |
|
|
|
width: 100%; |
|
|
|
padding: 20rpx; |
|
|
|
padding: 20rpx; |
|
|
|
box-sizing: border-box; |
|
|
|
box-sizing: border-box; |
|
|
|
|
|
|
|
max-height: calc(100vh - 100px); |
|
|
|
|
|
|
|
overflow: auto; |
|
|
|
.detail-item { |
|
|
|
.detail-item { |
|
|
|
margin-bottom: 20rpx; |
|
|
|
margin-bottom: 20rpx; |
|
|
|
} |
|
|
|
} |
|
|
|
|
zhangqun
11 months ago