diff --git a/pages/potentialRisk/potentialRisk.vue b/pages/potentialRisk/potentialRisk.vue index 711e16de..ac264f63 100644 --- a/pages/potentialRisk/potentialRisk.vue +++ b/pages/potentialRisk/potentialRisk.vue @@ -55,10 +55,14 @@ 整改负责人 - + + {{getUsernames()}} + + + + {{getUsernames()}} - - @@ -74,16 +78,18 @@ 要求完成时间 - + - {{dangerInfo.createTime}} - + {{dangerInfo.createTime}} + {{dangerInfo.createTime}} - + 报警抓拍 @@ -148,15 +154,15 @@ - - + + 全选 - - + + - 关闭 - - + 关闭 + + - + @@ -183,7 +189,7 @@ data() { return { dangerInfo: {}, - selectAll:false, + selectAll: false, alarmType: { 1: "烟感", 2: "明火", @@ -207,16 +213,16 @@ detailsId: '', changeUsers: [], userIds: [], - backupsUserIds:[] + backupsUserIds: [] } }, - watch:{ - userIds(n,o){ - console.log(n,"=====") - if(n.length==this.backupsUserIds.length){ - this.selectAll=true - }else{ - this.selectAll=false; + watch: { + userIds(n, o) { + console.log(n, "=====") + if (n.length == this.backupsUserIds.length) { + this.selectAll = true + } else { + this.selectAll = false; } } }, @@ -235,23 +241,23 @@ }, methods: { - selectAllEve(){ - this.selectAll=!this.selectAll; - if(this.selectAll){ - this.userIds=this.changeUsers.map((item)=>{ + selectAllEve() { + this.selectAll = !this.selectAll; + if (this.selectAll) { + this.userIds = this.changeUsers.map((item) => { return item.userId }) - console.log(this.userIds,"==this.userIds") - }else{ - this.userIds=[] + console.log(this.userIds, "==this.userIds") + } else { + this.userIds = [] } - + }, - selectDate(e){ - console.log(e,'date=====') - this.dangerInfo.createTime=e.detail.value; + selectDate(e) { + console.log(e, 'date=====') + this.dangerInfo.createTime = e.detail.value; }, - colse(){ + colse() { this.$refs.popup.close() }, // 多选整改人 @@ -367,12 +373,12 @@ }, success: res => { let typeList = res.result - - let tres= typeList.find(item => item.inspectTypeName == "安全检查"); - if(tres){ - _this.inspectTypeId=tres.id - } - + + let tres = typeList.find(item => item.inspectTypeName == "安全检查"); + if (tres) { + _this.inspectTypeId = tres.id + } + console.log(_this.inspectTypeId, '-----检查类型') } }) @@ -388,7 +394,7 @@ success: res => { _this.changeUsers = res.result _this.userIds = res.result[0].userId; - _this.backupsUserIds=_this.changeUsers.map((item)=>{ + _this.backupsUserIds = _this.changeUsers.map((item) => { return item.userId }) console.log(res.result, '-----检查人') @@ -453,22 +459,27 @@