|
|
|
|
@ -262,7 +262,11 @@ |
|
|
|
|
<InvestigationItem @select="select2"></InvestigationItem> |
|
|
|
|
</u-popup> |
|
|
|
|
<u-popup :show="showInvestigation2" @close="showInvestigation2 = false"> |
|
|
|
|
<InvestigationItem2 :json="showInvestigation2Item" @select="select3"></InvestigationItem2> |
|
|
|
|
<InvestigationItem2 |
|
|
|
|
:json="showInvestigation2Item" |
|
|
|
|
@show="showInvestigation2 = false" |
|
|
|
|
@select="select3" |
|
|
|
|
></InvestigationItem2> |
|
|
|
|
</u-popup> |
|
|
|
|
<!-- <u-popup :show="showInvestigation" @close="showInvestigation = false"> |
|
|
|
|
<view class="custom-pop-head"> |
|
|
|
|
@ -379,9 +383,7 @@ |
|
|
|
|
<view class="problem-item"> |
|
|
|
|
<view style="display: flex; justify-content: space-between"> |
|
|
|
|
<view style="width: 80%"> |
|
|
|
|
{{ item.bigCategoryName }}-{{ item.smallCategoryName }}-{{ |
|
|
|
|
item.hdTermName |
|
|
|
|
}} |
|
|
|
|
{{ item.dangerProblem }} |
|
|
|
|
</view> |
|
|
|
|
<view> |
|
|
|
|
<view class="check" @click="onHiddenDangerList(item)"> |
|
|
|
|
@ -402,13 +404,7 @@ |
|
|
|
|
</view> |
|
|
|
|
</view> |
|
|
|
|
<u-col :span="12"> |
|
|
|
|
<view |
|
|
|
|
class="problem-item add" |
|
|
|
|
@click=" |
|
|
|
|
showProblem = true; |
|
|
|
|
hiddenDangerList2 = []; |
|
|
|
|
" |
|
|
|
|
> |
|
|
|
|
<view class="problem-item add" @click="add"> |
|
|
|
|
<uni-icons |
|
|
|
|
type="plusempty" |
|
|
|
|
size="24" |
|
|
|
|
@ -435,16 +431,12 @@ |
|
|
|
|
<view class="right" @click="investigationHandle2">确认</view> |
|
|
|
|
</view> |
|
|
|
|
<view class="problem-box"> |
|
|
|
|
<view class="detail-item" @click="add"> |
|
|
|
|
<view class="detail-item" @click="addFL"> |
|
|
|
|
<uni-forms-item |
|
|
|
|
label="隐患问题" |
|
|
|
|
label-position="top" |
|
|
|
|
label-width="100px" |
|
|
|
|
style="display: flex; align-items: center" |
|
|
|
|
@click=" |
|
|
|
|
showProblemTreeSelect = true; |
|
|
|
|
showProblem = false; |
|
|
|
|
" |
|
|
|
|
/> |
|
|
|
|
|
|
|
|
|
<view v-if="this.hiddenDangerList2.length > 0" |
|
|
|
|
@ -452,20 +444,17 @@ |
|
|
|
|
this.hiddenDangerList2[1].itemname |
|
|
|
|
}}/{{ this.hiddenDangerList2[2].itemname }}</view |
|
|
|
|
> |
|
|
|
|
|
|
|
|
|
<!-- <u-input |
|
|
|
|
placeholder="请选择" |
|
|
|
|
border="none" |
|
|
|
|
type="textarea" |
|
|
|
|
v-else |
|
|
|
|
/> --> |
|
|
|
|
<view |
|
|
|
|
v-else |
|
|
|
|
@click=" |
|
|
|
|
showProblemTreeSelect = true; |
|
|
|
|
showProblem = false; |
|
|
|
|
" |
|
|
|
|
>请选择</view |
|
|
|
|
> |
|
|
|
|
<view v-else-if="this.dangerProblem">{{ |
|
|
|
|
this.dangerProblem |
|
|
|
|
}}</view> |
|
|
|
|
<view v-else>请选择</view> |
|
|
|
|
<!-- --> |
|
|
|
|
</view> |
|
|
|
|
<view class="detail-item"> |
|
|
|
|
@ -521,14 +510,16 @@ |
|
|
|
|
@click=" |
|
|
|
|
showProblemTreeSelect = false; |
|
|
|
|
showProblem = true; |
|
|
|
|
hiddenDangerList2 = []; |
|
|
|
|
" |
|
|
|
|
>取消</view |
|
|
|
|
> |
|
|
|
|
<view class="title">选择隐患</view> |
|
|
|
|
<view class="right" @click="showProblemTreeSelectHandle">确认</view> |
|
|
|
|
</view> |
|
|
|
|
<ProblemTreeItem @select="select"></ProblemTreeItem> |
|
|
|
|
<ProblemTreeItem |
|
|
|
|
:hiddenDangerList2="hiddenDangerList2" |
|
|
|
|
@select="select" |
|
|
|
|
></ProblemTreeItem> |
|
|
|
|
</u-popup> |
|
|
|
|
</view> |
|
|
|
|
<view class="blank" /> |
|
|
|
|
@ -701,12 +692,14 @@ export default { |
|
|
|
|
problemTreeSelectConfirmList: [], |
|
|
|
|
hiddenDangerList: [], |
|
|
|
|
hiddenDangerList2: [], |
|
|
|
|
hiddenDangerList3: [], |
|
|
|
|
dangerProblem: "", |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
showInvestigationTag(v) { |
|
|
|
|
this.showInvestigation2 = true; |
|
|
|
|
this.showInvestigation2Item = v |
|
|
|
|
this.showInvestigation2Item = v; |
|
|
|
|
}, |
|
|
|
|
select2(v, list) { |
|
|
|
|
this.showInvestigation = false; |
|
|
|
|
@ -726,28 +719,32 @@ export default { |
|
|
|
|
}, |
|
|
|
|
select3(v) { |
|
|
|
|
this.investigationSelectList.map((r) => { |
|
|
|
|
|
|
|
|
|
if (r.nid == v.nid) { |
|
|
|
|
r = v |
|
|
|
|
r = v; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
this.showInvestigation2Item = {} |
|
|
|
|
this.showInvestigation2 = false |
|
|
|
|
this.showInvestigation2Item = {}; |
|
|
|
|
this.showInvestigation2 = false; |
|
|
|
|
}, |
|
|
|
|
onHiddenDangerList(v) { |
|
|
|
|
this.showProblem = true |
|
|
|
|
console.log(this.problemTreeSelectConfirmList) |
|
|
|
|
this.showProblem = true; |
|
|
|
|
this.dangerProblem = v.dangerProblem; |
|
|
|
|
this.describe = { |
|
|
|
|
bigCategory: "", |
|
|
|
|
smallCategory: "", |
|
|
|
|
hdTerm: "", |
|
|
|
|
bigCategory: v.bigCategory, |
|
|
|
|
smallCategory: v.smallCategory, |
|
|
|
|
hdTerm: v.hdTerm, |
|
|
|
|
hdDesc: v.hdDesc, |
|
|
|
|
hdPic: "", |
|
|
|
|
hdPic: v.hdPic, |
|
|
|
|
hdInfo: v.hdInfo, |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
// this.fileList = [v.hdPic]; |
|
|
|
|
}, |
|
|
|
|
add() { |
|
|
|
|
this.showProblemTreeSelect = true; |
|
|
|
|
this.showProblem = false; |
|
|
|
|
this.showProblem = true; |
|
|
|
|
this.hiddenDangerList2 = []; |
|
|
|
|
this.dangerProblem = ''; |
|
|
|
|
this.describe = { |
|
|
|
|
bigCategory: "", |
|
|
|
|
smallCategory: "", |
|
|
|
|
@ -758,6 +755,19 @@ export default { |
|
|
|
|
}; |
|
|
|
|
this.fileList = []; |
|
|
|
|
}, |
|
|
|
|
addFL() { |
|
|
|
|
this.showProblemTreeSelect = true; |
|
|
|
|
this.showProblem = false; |
|
|
|
|
// this.describe = { |
|
|
|
|
// bigCategory: "", |
|
|
|
|
// smallCategory: "", |
|
|
|
|
// hdTerm: "", |
|
|
|
|
// hdDesc: "", |
|
|
|
|
// hdPic: "", |
|
|
|
|
// hdInfo: "", |
|
|
|
|
// }; |
|
|
|
|
// this.fileList = []; |
|
|
|
|
}, |
|
|
|
|
getBaseData(businessId) { |
|
|
|
|
this.$request |
|
|
|
|
.globalRequest( |
|
|
|
|
@ -800,14 +810,14 @@ export default { |
|
|
|
|
) |
|
|
|
|
.then((res) => { |
|
|
|
|
if (res.code === 200) { |
|
|
|
|
this.investigationSelectList.map(r => { |
|
|
|
|
r.extraConfigs = [] |
|
|
|
|
res.result.map(m =>{ |
|
|
|
|
if(r.nid == m.scenesId){ |
|
|
|
|
r.extraConfigs.push(m) |
|
|
|
|
this.investigationSelectList.map((r) => { |
|
|
|
|
r.extraConfigs = []; |
|
|
|
|
res.result.map((m) => { |
|
|
|
|
if (r.nid == m.scenesId) { |
|
|
|
|
r.extraConfigs.push(m); |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
@ -831,7 +841,7 @@ export default { |
|
|
|
|
) |
|
|
|
|
.then((res) => { |
|
|
|
|
if (res.code === 200) { |
|
|
|
|
console.log(res.result) |
|
|
|
|
console.log(res.result); |
|
|
|
|
this.hiddenDangerList = res.result; |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
@ -851,8 +861,17 @@ export default { |
|
|
|
|
// this.problemTreeSelectConfirmList.push(item) |
|
|
|
|
}, |
|
|
|
|
showProblemTreeSelectHandle() { |
|
|
|
|
this.showProblemTreeSelect = false; |
|
|
|
|
this.showProblem = true; |
|
|
|
|
if (this.hiddenDangerList3.length == 3) { |
|
|
|
|
this.showProblemTreeSelect = false; |
|
|
|
|
this.showProblem = true; |
|
|
|
|
this.hiddenDangerList2 = JSON.parse( |
|
|
|
|
JSON.stringify(this.hiddenDangerList3) |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
select(v) { |
|
|
|
|
this.hiddenDangerList3 = v; |
|
|
|
|
}, |
|
|
|
|
// 删除图片 |
|
|
|
|
deletePic(event) { |
|
|
|
|
@ -893,7 +912,6 @@ export default { |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
investigationHandle2() { |
|
|
|
|
|
|
|
|
|
this.hiddenDangerList.push({ |
|
|
|
|
bigCategory: this.hiddenDangerList2[0].id, |
|
|
|
|
bigCategoryName: this.hiddenDangerList2[0].itemname, |
|
|
|
|
@ -963,6 +981,7 @@ export default { |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
async afterRead(event, key) { |
|
|
|
|
console.log(key) |
|
|
|
|
// 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式 |
|
|
|
|
const id = this.uuid(); |
|
|
|
|
this[key].push({ |
|
|
|
|
@ -997,9 +1016,6 @@ export default { |
|
|
|
|
); |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
select(v) { |
|
|
|
|
this.hiddenDangerList2 = v; |
|
|
|
|
}, |
|
|
|
|
submit(temporary) { |
|
|
|
|
console.log(this.formData); |
|
|
|
|
console.log(this.investigationSelectList); |
|
|
|
|
@ -1009,7 +1025,8 @@ export default { |
|
|
|
|
r.extraConfigs.map((s) => { |
|
|
|
|
s.scenesId = r.nid; |
|
|
|
|
if (s.type == 4) { |
|
|
|
|
s.standar = s.fileList && s.fileList.length > 0 ? s.fileList[0].url : ""; |
|
|
|
|
s.standar = |
|
|
|
|
s.fileList && s.fileList.length > 0 ? s.fileList[0].url : ""; |
|
|
|
|
} |
|
|
|
|
s.fileList = ""; |
|
|
|
|
s.nid = ""; |
|
|
|
|
|
zhangqun
11 months ago