|
|
|
@ -111,11 +111,11 @@
|
|
|
|
|
</el-footer>
|
|
|
|
|
</el-container>
|
|
|
|
|
<el-aside
|
|
|
|
|
style="background-color: rgba(0,0,0,0.3);overflow: auto;margin-bottom: 0;height: calc(100vh - 84px);;padding:12px 0 "
|
|
|
|
|
style="background-color: rgba(0,0,0,0.3);overflow: hidden;margin-bottom: 0;height: calc(100vh - 84px);;padding:12px 0 "
|
|
|
|
|
width="350px">
|
|
|
|
|
<div ref="warningRefP" style="height:100%;padding:0 24px">
|
|
|
|
|
<div ref="warningRefP" style="height:100%;padding:0 24px">i
|
|
|
|
|
<TransitionGroup class="container" name="fade" tag="div">
|
|
|
|
|
<div v-for="(i,index) in warringList" :key='index' ref="warningRef"
|
|
|
|
|
<div v-for="(i,index) in warringList" :key='i' ref="warningRef"
|
|
|
|
|
style="position:relative;color:#fff;height: 120px;">
|
|
|
|
|
<img src="../assets/icons/highTemperature.png"
|
|
|
|
|
style="width: 40px;height: 40px;position: absolute;top: 10px;left: 0px">
|
|
|
|
@ -230,7 +230,7 @@ export default {
|
|
|
|
|
first = true
|
|
|
|
|
clearInterval(timeout)
|
|
|
|
|
}
|
|
|
|
|
if(this.warringWaitList.length > 0) {
|
|
|
|
|
if (this.warringWaitList.length > 0) {
|
|
|
|
|
this.warringList.splice(this.warringList.length, 0, this.warringWaitList.splice(0, 1)[0])
|
|
|
|
|
}
|
|
|
|
|
i++
|
|
|
|
@ -238,9 +238,14 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
timeoutF()
|
|
|
|
|
setInterval(() => {
|
|
|
|
|
console.log(1)
|
|
|
|
|
if (first && this.warringWaitList.length > 0) {
|
|
|
|
|
this.warringList.splice(1, 0)
|
|
|
|
|
this.warringList.splice(this.warringList.length, 0, this.warringWaitList.splice(0, 1)[0])
|
|
|
|
|
if (this.warringList.length >= listLength) {
|
|
|
|
|
this.warringList.splice(0, 1)
|
|
|
|
|
}
|
|
|
|
|
setTimeout(() => {
|
|
|
|
|
this.warringList.splice(this.warringList.length, 0, this.warringWaitList.splice(0, 1)[0])
|
|
|
|
|
}, 500)
|
|
|
|
|
}
|
|
|
|
|
}, 1000)
|
|
|
|
|
|
|
|
|
@ -251,7 +256,7 @@ export default {
|
|
|
|
|
})
|
|
|
|
|
setInterval(() => {
|
|
|
|
|
this.setInfo()
|
|
|
|
|
}, 6 * 1000 * 1000)
|
|
|
|
|
}, 10 * 1000)
|
|
|
|
|
// })
|
|
|
|
|
},
|
|
|
|
|
beforeDestroy() {
|
|
|
|
@ -631,22 +636,18 @@ export default {
|
|
|
|
|
box-sizing: border-box;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 1. 声明过渡效果 */
|
|
|
|
|
.fade-move,
|
|
|
|
|
.fade-enter-active,
|
|
|
|
|
.fade-leave-active {
|
|
|
|
|
transition: all 0.5s cubic-bezier(0.55, 0, 0.1, 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 2. 声明进入和离开的状态 */
|
|
|
|
|
.fade-enter-from,
|
|
|
|
|
.fade-leave-to {
|
|
|
|
|
opacity: 0;
|
|
|
|
|
transform: scaleY(0.01) translate(30px, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 3. 确保离开的项目被移除出了布局流
|
|
|
|
|
以便正确地计算移动时的动画效果。 */
|
|
|
|
|
.fade-leave-active {
|
|
|
|
|
position: absolute;
|
|
|
|
|
}
|
|
|
|
|