|
@@ -257,6 +257,7 @@
|
|
|
console.log('option', option);
|
|
|
if (option.item) {
|
|
|
let obj = JSON.parse(decodeURIComponent(option.item));
|
|
|
+ console.log('obj', obj);
|
|
|
this.$set(this, 'warnData', obj);
|
|
|
console.log('obj', obj);
|
|
|
this.$set(this, 'buildingId', obj.buildId);
|
|
@@ -266,8 +267,8 @@
|
|
|
this.$set(this.itemData, 'subjectId', obj.subId);
|
|
|
this.$set(this, 'groupId', obj.groupId);
|
|
|
this.$set(this, 'pageType', 2);
|
|
|
+ console.log('groupId', this.groupId);
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
onShow() {
|
|
|
if (this.warnData) {
|
|
@@ -347,19 +348,20 @@
|
|
|
});
|
|
|
},
|
|
|
async closeRiskPlan() {
|
|
|
+ console.log('this.groupId',this.groupId);
|
|
|
const {
|
|
|
data
|
|
|
} = await laboratoryPlanCloseRiskPlan({
|
|
|
eventId: this.groupId
|
|
|
});
|
|
|
if (data.code == 200) {
|
|
|
- this.planStatus = false;
|
|
|
uni.showToast({
|
|
|
title: '操作成功',
|
|
|
icon: "none",
|
|
|
mask: true,
|
|
|
duration: 2000
|
|
|
});
|
|
|
+ this.selectTriggerInfo();
|
|
|
}
|
|
|
},
|
|
|
//全屏疏散页面
|
|
@@ -473,23 +475,27 @@
|
|
|
}
|
|
|
if (type == 3) {
|
|
|
//标记实验室
|
|
|
+ let bigNum = 0;
|
|
|
for (let o = 0; o < self.fjListArray.length; o++) {
|
|
|
let num = 0;
|
|
|
for (let i = 0; i < data.data.length; i++) {
|
|
|
if (data.data[i].subId == self.fjListArray[o].subId) {
|
|
|
num++
|
|
|
- self.$set(this, 'groupId', data.data[i].groupId)
|
|
|
+ bigNum++
|
|
|
+ self.$set(this, 'groupId', data.data[i].eventId)
|
|
|
self.fjListArray[o].subName.replace('(预案发生)')
|
|
|
self.fjListArray[o].subName = '(预案发生) ' + self.fjListArray[o].subName
|
|
|
}
|
|
|
}
|
|
|
- if (num != 0) {
|
|
|
- self.planStatus = true; //如果有预案发生
|
|
|
- } else {
|
|
|
- self.planStatus = false; //如果有预案发生
|
|
|
+ if (num == 0) {
|
|
|
self.fjListArray[o].subName.replace('(预案发生)')
|
|
|
}
|
|
|
}
|
|
|
+ if (bigNum != 0) {
|
|
|
+ self.$set(self, 'planStatus', true)
|
|
|
+ } else {
|
|
|
+ self.$set(self, 'planStatus', false)
|
|
|
+ }
|
|
|
for (let o = 0; o < self.mapList.length; o++) {
|
|
|
if (self.mapList[o].type == 1) {
|
|
|
let num = 0;
|