From 39b7e692b990b350c2faa012b95075f2db3bb535 Mon Sep 17 00:00:00 2001 From: chengdandan <2549057906@qq.com> Date: Fri, 19 May 2023 09:49:27 +0800 Subject: [PATCH] 20230519 --- src/views/alarm.vue | 121 ++++++++++++++++++++++++++++++++++++++++++-- src/views/index.vue | 5 +- 2 files changed, 119 insertions(+), 7 deletions(-) diff --git a/src/views/alarm.vue b/src/views/alarm.vue index 79819df..03f34d3 100644 --- a/src/views/alarm.vue +++ b/src/views/alarm.vue @@ -101,11 +101,126 @@ export default { intervalTime1: null, //定时器 intervalTime2: null, //定时器 //报警数组 一级 - warnList1: [], + warnList1: [ + { + id: "1", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "一级", + }, + { + id: "2", + icon: require("../assets/images/jieNengImg/warnBlue.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "一级", + }, + { + id: "3", + icon: require("../assets/images/jieNengImg/warnWhite.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "一级", + }, + { + id: "4", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "一级", + }, + ], //报警数组 二级 - warnList2: [], + warnList2: [ { + id: "1", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "二级", + }, + { + id: "2", + icon: require("../assets/images/jieNengImg/warnBlue.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "二级", + }, + { + id: "3", + icon: require("../assets/images/jieNengImg/warnWhite.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "二级", + }, + { + id: "4", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "二级", + },], //报警数组 三级 - warnList3: [], + warnList3: [ + { + id: "1", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + }, + { + id: "2", + icon: require("../assets/images/jieNengImg/warnBlue.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + }, + { + id: "3", + icon: require("../assets/images/jieNengImg/warnWhite.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + }, + { + id: "4", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + },{ + id: "4", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + },{ + id: "4", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + },{ + id: "4", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + },{ + id: "4", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + },{ + id: "4", + icon: require("../assets/images/jieNengImg/warnRed.png"), + time: "2023年03月12日 15:45:10", + cause: "设备故障", + risk: "三级", + }, + ], courtList: [ { name: "空闲中", diff --git a/src/views/index.vue b/src/views/index.vue index 865a610..c7f1f51 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1712,7 +1712,6 @@ export default { step = 1 element.scrollTop = 0 } else { - // if ( // element.scrollTop === 0 || // element.scrollTop === element.scrollHeight - element.offsetHeight @@ -1736,9 +1735,7 @@ export default { that.interval = null }, mouseLeave() { - if (this.interval == null) { - this.autoScrollindex(67, 50, 0, document.getElementById('warnList')) - } + this.autoScrollindex(67, 50, 0, document.getElementById('warnList')) }, }, beforeDestroy() {