diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index e633e0b..38cbacd 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -363,7 +363,7 @@ .lookTitle { display: flex; align-items: center; - margin: 10px 0; + // margin: 10px 0; .grid-content { display: flex; align-items: center; @@ -468,6 +468,10 @@ overflow: hidden; /* 隐藏超出范围的文本 */ text-overflow: ellipsis; /* 省略号 */ } + .value-value { + flex:1; + width: 100%; + } } .el-button { margin-left: 10px; diff --git a/src/components/eventPrompt/index.vue b/src/components/eventPrompt/index.vue index 8aa459f..e87efd0 100644 --- a/src/components/eventPrompt/index.vue +++ b/src/components/eventPrompt/index.vue @@ -34,16 +34,17 @@ export default { if(route.meta.title == '算法运行监测') { this.isTrue = true; this.getGetErrorMsg(); - // 一分钟 + // 一小时 timeOne = setInterval(()=>{ this.getGetErrorMsg(); },3600000) clearInterval(timeTwo) } else { + clearInterval(timeTwo) this.isTrue = false; - timeTwo = this.getLimitOneMsg(); + this.getLimitOneMsg(); // 一分钟 - setInterval(()=>{ + timeTwo = setInterval(()=>{ this.getLimitOneMsg(); },60000) clearInterval(timeOne) diff --git a/src/views/components/eventAudit.vue b/src/views/components/eventAudit.vue index 0776e93..dc777cd 100644 --- a/src/views/components/eventAudit.vue +++ b/src/views/components/eventAudit.vue @@ -18,7 +18,8 @@
概括名称:
- + + 修改标题
@@ -36,7 +37,7 @@
预警时间:
-
{{ audioInfo.firstWarnTime || audioInfo.caseDate }}
+
{{ audioInfo.firstWarnTimeDate || audioInfo.caseDate }}
@@ -117,6 +118,7 @@ 上报驾驶舱 退回重训练 + 审核通过 - {{ audioInfo.title }} - {{ audioInfo.titleBefore }} + {{ audioInfo.title }} + {{ audioInfo.titleBefore }} @@ -226,21 +228,56 @@ export default { }, // 上报驾驶舱/退回重训练 reported(id){ - this.$confirm(`确定要${id == 1 ? '重新上报驾驶仓' : '退回重训练'}吗?`, "警告", { + this.$confirm(`确定要${id == 1 ? '重新上报驾驶仓' : id == 2 ? '退回重训练' : id == 3 ? '审核通过':''}吗?`, "警告", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", }).then(() => { - eventChangeIsReport({isReport:id,caseSerial:this.multipleSelection,innerEventId:this.audioInfo.innerEventId}).then(res=>{ - // console.log(res); - this.multipleSelection = []; - this.$message({ - type: "success", - message: id == 1 ? '已上报驾驶舱' : '已退回重训练' + "!", - }); - this.$emit('closeDialog') - this.close(); - }) + if(id !== 3) { + if(this.multipleSelection.length > 0 || this.backupsInfo.title !== this.audioInfo.title) { + if(this.backupsInfo.title !== this.audioInfo.title) { + eventChangeIsReport({isReport:id,caseSerial:this.multipleSelection,innerEventId:this.audioInfo.innerEventId,newTitle:this.audioInfo.title,oldTitle:this.backupsInfo.title}).then(res=>{ + // console.log(res); + this.multipleSelection = []; + this.$message({ + type: "success", + message: id == 1 ? '已上报驾驶舱' : '已退回重训练' + "!", + }); + this.$emit('closeDialog') + this.close(); + }) + } else { + eventChangeIsReport({isReport:id,caseSerial:this.multipleSelection,innerEventId:this.audioInfo.innerEventId}).then(res=>{ + // console.log(res); + this.multipleSelection = []; + this.$message({ + type: "success", + message: id == 1 ? '已上报驾驶舱' : '已退回重训练' + "!", + }); + this.$emit('closeDialog') + this.close(); + }) + } + } else { + this.$message.error(`您未做任何操作,请修改后再${id == 1 ? '上报驾驶仓' : id == 2 ? '退回重训练' : ''}`); + } + } else { + if(this.backupsInfo.title !== this.audioInfo.title) { + this.$message.error(`您已修改标题,请上报驾驶舱或退回重训练`); + } else if(this.multipleSelection.length > 0) { + this.$message.error(`您已标记工单为不符合,请上报驾驶舱或退回重训练`); + } else { + eventChangeIsReport({isReport:id,innerEventId:this.audioInfo.innerEventId}).then(res=>{ + // console.log(res); + this.$message({ + type: "success", + message: "审核完成", + }); + this.$emit('closeDialog') + this.close(); + }) + } + } }) }, // 查看标题按钮 @@ -255,18 +292,18 @@ export default { titleBlur(){ this.disabled = true; if(this.backupsInfo.title !== this.audioInfo.title) { - this.InputLoading = true; - editTitle({title:this.audioInfo.title, innerEventId:this.audioInfo.innerEventId}).then(res=>{ - if(res.code == 200) { - this.$message({ - type: "success", - message: "标题修改成功!", - }); - this.InputLoading = false; - } - }).catch(err=>{ - this.InputLoading = false; - }) + // this.InputLoading = true; + // editTitle({title:this.audioInfo.title, innerEventId:this.audioInfo.innerEventId}).then(res=>{ + // if(res.code == 200) { + // this.$message({ + // type: "success", + // message: "标题修改成功!", + // }); + // this.InputLoading = false; + // } + // }).catch(err=>{ + // this.InputLoading = false; + // }) } }, // 获取页码 diff --git a/src/views/components/relevancyEventAudit.vue b/src/views/components/relevancyEventAudit.vue index 50708a9..984ee72 100644 --- a/src/views/components/relevancyEventAudit.vue +++ b/src/views/components/relevancyEventAudit.vue @@ -1,7 +1,7 @@