diff --git a/src/assets/images/mountain-icon.png b/src/assets/images/mountain-icon.png index 7dadabe..b02640f 100644 Binary files a/src/assets/images/mountain-icon.png and b/src/assets/images/mountain-icon.png differ diff --git a/src/views/commandScreen/commandCenter/centerBottom.vue b/src/views/commandScreen/commandCenter/centerBottom.vue index a747c75..c6f06d4 100644 --- a/src/views/commandScreen/commandCenter/centerBottom.vue +++ b/src/views/commandScreen/commandCenter/centerBottom.vue @@ -601,17 +601,24 @@ onMounted(async () => { color: white !important; > div { - padding: 2px 0; + // padding: 2px 0; height: 13%; - font-size: 16px; - width: 200px; + // font-size: 16px; + font-size: 13px; + font-weight: normal; + line-height: 25px; + width: 140px; text-align: center; - background-color: #315296; + // background-color: #315296; + background: rgb(0,33,116); + background: linear-gradient(270deg, rgba(0,33,116,0.8) 0%, rgba(40,88,184,0.3) 96%); cursor: pointer; } .title-color { - background-color: #1449b6; + // background-color: #1449b6; + background: rgb(0,33,116); + background: linear-gradient(270deg, rgba(0,33,116,1) 0%, rgba(40,88,184,1) 96%); } } .notoDta { diff --git a/src/views/commandScreen/commandCenter/index.vue b/src/views/commandScreen/commandCenter/index.vue index 0213fca..9fce026 100644 --- a/src/views/commandScreen/commandCenter/index.vue +++ b/src/views/commandScreen/commandCenter/index.vue @@ -49,7 +49,7 @@ const openPeopleCountDialog = (index:any) => { height: 24.5%; } .leftBottom { - height: 65%; + height: 75.5%; margin: 3% 0 3% 0; } } @@ -62,13 +62,14 @@ const openPeopleCountDialog = (index:any) => { // margin-bottom: 3%; } .centerBottom { - height: 44.2%; + height: 45.85%; margin: 2% 0 0 0; } } .right { width: 26%; - height: 100%; + height: 109.2%; + transform: translateY(-70px); // .rightAll { // height: 32%; // } diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index ffb2483..6b6fa42 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -166,7 +166,7 @@ function drawBar() { top: "8%", right: "0", left:"5%", - bottom: "12%", + bottom: "10%", }, series: [{ @@ -249,7 +249,7 @@ onMounted(async () => { height: 92.5%; .contentTop { padding: 0 10px; - height: 40%; + height: 50%; // background-color: #fff; font-size: 13px; .line1{ @@ -309,7 +309,7 @@ onMounted(async () => { } .centerBottom { - height: 60%; + height: 50%; position: relative; .cbTop { diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index 526e2c5..4c658d7 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -1265,16 +1265,22 @@ onMounted(async () => { color: white !important; > div { - padding: 2px 0; - font-size: 16px; + // padding: 2px 0; + font-size: 13px; + line-height: 25px; width: 200px; + width: 140px; text-align: center; - background-color: #315296; + // background-color: #315296; + background: rgb(0,33,116); + background: linear-gradient(270deg, rgba(0,33,116,0.8) 0%, rgba(40,88,184,0.3) 96%); cursor: pointer; } .title-color { - background-color: #1449b6; + // background-color: #1449b6; + background: rgb(0,33,116); + background: linear-gradient(270deg, rgba(0,33,116,1) 0%, rgba(40,88,184,1) 96%); } } @@ -1362,7 +1368,7 @@ onMounted(async () => { } .ctContent { - height: 72%; + height: 80%; // background-color: darkred; } }