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 | 72 ++++++++++++++++++++++++++++++-----
1 files changed, 61 insertions(+), 11 deletions(-)
diff --git a/src/views/doublePrevent/dpIndex/index.vue b/src/views/doublePrevent/dpIndex/index.vue
index 74820af..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;
@@ -401,7 +416,19 @@
}
}
- @media screen and (max-width: 1366px){
+ @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;
@@ -422,22 +449,44 @@
}
}
}
+
+ @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: 16px;
+ }
+ div{
+ font-size: 14px;
+ }
+ }
+ .levelItem{
+ font-size: 12px;
+
+ span{
+ margin-bottom: 10px;
+ font-size: 16px;
+ font-weight: bolder;
+ }
+ }
+ }
.home-container {
height: 100%;
box-sizing: border-box;
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;
@@ -445,6 +494,7 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ box-sizing: border-box;
.item-head{
display: flex;
--
Gitblit v1.9.2