From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/doublePrevent/dpIndex/index.vue | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/src/views/doublePrevent/dpIndex/index.vue b/src/views/doublePrevent/dpIndex/index.vue
index af4b5db..562af77 100644
--- a/src/views/doublePrevent/dpIndex/index.vue
+++ b/src/views/doublePrevent/dpIndex/index.vue
@@ -339,6 +339,9 @@
}
window.addEventListener('resize', myChart.resize);
+ setTimeout(()=>{
+ myChart.resize
+ },500)
}
const toRiskEve = ()=>{
@@ -379,6 +382,18 @@
$homeNavLengh: 8;
@media screen and (min-width: 1366px) {
+ .main-cont {
+ width: 100%;
+ height: 100%;
+ display: grid;
+ margin-bottom: 40px;
+ box-sizing: border-box;
+ grid-gap: 20px;
+ grid-template-columns: repeat(3, 1fr);
+ grid-template-rows: repeat(2, 1fr);
+ grid-auto-flow: row;
+ justify-content: center;
+ }
.item-head{
height: 25px;
line-height: 25px;
@@ -402,6 +417,18 @@
}
@media screen and (min-width: 1024px) and (max-width: 1366px){
+ .main-cont {
+ width: 100%;
+ height: 100%;
+ display: grid;
+ margin-bottom: 40px;
+ box-sizing: border-box;
+ grid-gap: 15px;
+ grid-template-columns: repeat(3, 1fr);
+ grid-template-rows: repeat(2, 1fr);
+ grid-auto-flow: row;
+ justify-content: center;
+ }
.item-head{
height: 20px;
line-height: 20px;
@@ -424,14 +451,23 @@
}
@media screen and (max-width: 1024px) {
+ .main-cont {
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ margin-bottom: 40px;
+ box-sizing: border-box;
+ justify-content: center;
+ }
.item-head{
height: 20px;
line-height: 20px;
span{
- font-size: 13px;
+ font-size: 16px;
}
div{
- font-size: 12px;
+ font-size: 14px;
}
}
.levelItem{
@@ -450,16 +486,7 @@
overflow: hidden;
.main-cont {
- width: 100%;
- height: 100%;
- display: grid;
- margin-bottom: 40px;
- box-sizing: border-box;
- grid-gap: 20px;
- grid-template-columns: repeat(3, 1fr);
- grid-template-rows: repeat(2, 1fr);
- grid-auto-flow: row;
- justify-content: center;
+
.table-item{
border-radius: 8px;
background: #fff;
--
Gitblit v1.9.2