From 2c546c53420e49b944bbc58429a66ac6c55950a9 Mon Sep 17 00:00:00 2001 From: Admin <978517621@qq.com> Date: 星期二, 06 九月 2022 16:55:15 +0800 Subject: [PATCH] Default Changelist --- src/views/riskWarningSys/warningBigScreen/components/message.vue | 24 ++++++------ src/views/riskWarningSys/warningBigScreen/indexs/index.vue | 52 +++++++++++++++++++++++++- src/views/newHome/index.vue | 40 +++++++++++++------ 3 files changed, 89 insertions(+), 27 deletions(-) diff --git a/src/views/newHome/index.vue b/src/views/newHome/index.vue index ca2e034..354e692 100644 --- a/src/views/newHome/index.vue +++ b/src/views/newHome/index.vue @@ -415,6 +415,24 @@ </script> <style scoped lang="scss"> + @keyframes showDown { + 100% { + position: absolute; + top: 60px; + } + } + @keyframes moveDown { + 100% { + position: absolute; + top: 0; + } + } + @keyframes moveRight { + 100% { + position: absolute; + left: 0; + } + } @media screen and (min-width: 1400px) { .gridCont { width: 100%; @@ -537,7 +555,6 @@ line-height: 30px; height: 40%; color: #072270; - margin-bottom: 1px; margin-bottom: 2px; } .enTit { @@ -710,35 +727,29 @@ display: flex; justify-content: center; box-shadow: 0 8px 32px rgba(0, 0, 0, 0.1); - animation: showDown 0.6s 1 ease forwards; - - @keyframes showDown { - 100% { - position: absolute; - top: 0; - } - } } .topPanelBg { position: absolute; width: 100%; height: 60px; - top: 0; + top: -60px; left: 0; background: rgba(255, 255, 255, 0.8); z-index: 9; + animation: moveDown 0.6s 1 ease forwards; } .topPanelCont { position: absolute; width: 100%; height: 60px; padding: 0 50px; - top: 0; + top: -60px; left: 0; display: flex; align-items: center; justify-content: space-between; z-index: 999; + animation: moveDown 0.6s 1 ease forwards; .topLogo { display: flex; @@ -790,26 +801,29 @@ } .leftCont { position: absolute; - left: 0; + left: -100px; top: 0; width: 240px; height: 100%; z-index: 99; background: url('../../assets/newMenu/leftbg.png') no-repeat center; background-size: 100% 100%; + animation: moveRight .8s 1 ease forwards; } .topCont { position: absolute; width: 100%; height: 200px; left: 0; - top: 60px; + top: 30px; padding: 0 40px 0 120px; z-index: 99999; display: flex; flex-direction: column; justify-content: center; align-items: flex-start; + animation: showDown 0.6s 1 ease forwards; + .topInfo { width: 100%; display: flex; diff --git a/src/views/riskWarningSys/warningBigScreen/components/message.vue b/src/views/riskWarningSys/warningBigScreen/components/message.vue index e2ab6ee..6f3b789 100644 --- a/src/views/riskWarningSys/warningBigScreen/components/message.vue +++ b/src/views/riskWarningSys/warningBigScreen/components/message.vue @@ -39,18 +39,18 @@ config:{ header: ['消息列表', '同比'], data: [ - ['一月预警消息SPI报告', '↑ 94%'], - ['二月预警消息SPI报告', '↑ 94%'], - ['三月预警消息SPI报告', '↑ 94%'], - ['四月预警消息SPI报告', '↑ 94%'], - ['五月预警消息SPI报告', '↑ 94%'], - ['六月预警消息SPI报告', '↑ 94%'], - ['七月预警消息SPI报告', '↑ 94%'], - ['八月预警消息SPI报告', '↑ 94%'], - ['九月预警消息SPI报告', '↑ 94%'], - ['十月预警消息SPI报告', '↑ 94%'], - ['十一月预警消息SPI报告', '↑ 94%'], - ['十二月预警消息SPI报告', '↑ 94%'] + ['一月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['二月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['三月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['四月预警消息SPI报告', '<span style="color:red;">↓ 43%</span>'], + ['五月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['六月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['七月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['八月预警消息SPI报告', '<span style="color:red;">↓ 65%</span>'], + ['九月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['十月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['十一月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'], + ['十二月预警消息SPI报告', '<span style="color:#4CF475;">↑ 94%</span>'] ], index: true, columnWidth: [60], diff --git a/src/views/riskWarningSys/warningBigScreen/indexs/index.vue b/src/views/riskWarningSys/warningBigScreen/indexs/index.vue index 87d78cc..a55b011 100644 --- a/src/views/riskWarningSys/warningBigScreen/indexs/index.vue +++ b/src/views/riskWarningSys/warningBigScreen/indexs/index.vue @@ -49,7 +49,16 @@ <div v-else>当前应急物资储备情况(总)</div> <dv-decoration8 :color="lineColor" :reverse="true" style="width:100%;" /> </div> - <div class="des-main"> + <div v-if="curChart===2" class="des-main"> + <div> + <h4>距上次【<span>{{trainDesc.title}}</span>】应急演练结束<span>{{trainDesc.total}}</span>天</h4> + <h4> + 应急演练分月情况汇总: + </h4> + <p v-for="(item,index) in trainDesc.list" :key="index">{{item.month}}应急演练次数:{{item.num}}次</p> + </div> + </div> + <div v-else class="des-main"> <div v-for="(item,index) in accidentDesc" :key="index"> <h4><span>{{item.title}}</span>共计:<span>{{item.total}}</span>起</h4> <h4> @@ -86,6 +95,7 @@ optionList: Array<any>; lineColor: Array<string>; accidentDesc: Array<any>; + trainDesc: Object; } export default defineComponent({ name: 'warningPage', @@ -182,7 +192,45 @@ total: 150, desc: '死亡人数:0人; 重伤人数:0人; 轻伤人数:0人; 直接经济损失:9万元' } - ] + ], + trainDesc:{ + title: '公司级', + total: 5, + list: [ + { + month: '一月份', + num: 23 + }, + { + month: '二月份', + num: 76 + }, + { + month: '三月份', + num: 152 + }, + { + month: '四月份', + num: 200 + }, + { + month: '五月份', + num: 49 + }, + { + month: '六月份', + num: 83 + }, + { + month: '七月份', + num: 102 + }, + { + month: '八月份', + num: 99 + } + ] + } }); // 页面载入时执行方法 -- Gitblit v1.9.2