From 9797d3d1ba7a9266afa34c14312e10a12456eab1 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 27 Aug 2024 09:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/home/countFlopOne1.vue     | 22 +++++++++------
 .../src/components/home/countFlopTwo1.vue     | 27 ++++++++++++-------
 sgzb-screen/src/components/home/leftOne1.vue  |  2 +-
 sgzb-screen/src/components/home/leftTwo1.vue  |  2 +-
 sgzb-screen/src/components/home/new-map.vue   |  2 +-
 .../newHome/components/drawer-project.vue     | 22 +++++++++++++++
 6 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/sgzb-screen/src/components/home/countFlopOne1.vue b/sgzb-screen/src/components/home/countFlopOne1.vue
index 8a9adf0d..9a3d95ae 100644
--- a/sgzb-screen/src/components/home/countFlopOne1.vue
+++ b/sgzb-screen/src/components/home/countFlopOne1.vue
@@ -2,7 +2,9 @@
   <div class="count-title">
     <p>
       {{ sonTitle }}
+      <dv-decoration-6 style="width: 40%; height: 20px" />
     </p>
+
     <div class="count-flop" :key="compKey">
       <div
         :class="item != ',' ? 'count-flop-box' : 'count-flop-point'"
@@ -73,20 +75,24 @@ export default {
   src: url('../../assets/css/DS-Digital/DS-DIGI-1.ttf');
 }
 .count-title {
-  font-size: 16px;
+  font-size: 18px;
   color: #1fd1ff;
   font-weight: 500;
   letter-spacing: 2px;
   font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
   line-height: 21px;
-  //   margin-left: 31px;
+  // margin-left: 31px;
+  p {
+    display: flex;
+    align-items: center;
+  }
 }
 .count-flop {
   display: inline-block;
   /* 可更改 */
-  height: 48px;
-  line-height: 48px;
-  font-size: 30px;
+  height: 56px;
+  line-height: 56px;
+  font-size: 48px;
   color: #4898f1;
   font-weight: bold;
   text-align: center;
@@ -102,8 +108,8 @@ export default {
 }
 
 .count-flop-box {
-  width: 38px;
-  height: 45px;
+  width: 49px;
+  height: 56px;
   background: url(../../assets/img/myImage/number_box.png) no-repeat center;
   background-size: 100% 100%;
   color: #fff;
@@ -130,7 +136,7 @@ export default {
   width: 100%;
   animation-fill-mode: forwards !important;
   color: #fff;
-  font-size: 36px;
+  font-size: 48px;
   font-family: electronicFont;
   font-weight: bold;
 }
diff --git a/sgzb-screen/src/components/home/countFlopTwo1.vue b/sgzb-screen/src/components/home/countFlopTwo1.vue
index 85f367aa..4bf43b0c 100644
--- a/sgzb-screen/src/components/home/countFlopTwo1.vue
+++ b/sgzb-screen/src/components/home/countFlopTwo1.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="count-title">
-    <p>{{ sonTitle }}</p>
+    <p>
+      {{ sonTitle }}
+
+      <dv-decoration-3 style="width: 40%; height: 20px" />
+    </p>
     <div class="count-flop" :key="compKey">
       <div
         :class="item != ',' ? 'count-flop-box' : 'count-flop-point'"
@@ -78,19 +82,24 @@ export default {
   src: url('../../assets/css/DS-Digital/DS-DIGI-1.ttf');
 }
 .count-title {
-  font-size: 16px;
+  font-size: 18px;
   color: #f7b500;
   font-weight: 500;
   letter-spacing: 2px;
   font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
   line-height: 21px;
-  //   margin-left: 31px;
+  // margin-left: 31px;
+
+  p {
+    display: flex;
+    align-items: center;
+  }
 }
 .count-flop {
   display: inline-block;
-  height: 48px;
-  line-height: 48px;
-  font-size: 30px;
+  height: 56px;
+  line-height: 56px;
+  font-size: 48px;
   color: #4898f1;
   font-weight: bold;
   text-align: center;
@@ -112,8 +121,8 @@ export default {
   box-shadow: inset 0 0 0.6rem #69b1ff;
   border: 2px solid #66bef4;
   margin: 0.15vw; */
-  width: 38px;
-  height: 45px;
+  width: 49px;
+  height: 56px;
   background: url(../../assets/img/myImage/number_box_two.png) no-repeat center;
   background-size: 100% 100%;
   color: #fff;
@@ -140,7 +149,7 @@ export default {
   width: 100%;
   animation-fill-mode: forwards !important;
   color: #fff;
-  font-size: 36px;
+  font-size: 48px;
   font-family: electronicFont;
   font-weight: bold;
 }
diff --git a/sgzb-screen/src/components/home/leftOne1.vue b/sgzb-screen/src/components/home/leftOne1.vue
index 93ce681a..82c0fe9c 100644
--- a/sgzb-screen/src/components/home/leftOne1.vue
+++ b/sgzb-screen/src/components/home/leftOne1.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import CountFlopOne from './countFlopOne.vue'
+import CountFlopOne from './countFlopOne1.vue'
 import { getMaterialReqDataApi } from '../../api/screen'
 
 export default {
diff --git a/sgzb-screen/src/components/home/leftTwo1.vue b/sgzb-screen/src/components/home/leftTwo1.vue
index 4c292494..dcd501e2 100644
--- a/sgzb-screen/src/components/home/leftTwo1.vue
+++ b/sgzb-screen/src/components/home/leftTwo1.vue
@@ -40,7 +40,7 @@
 </template>
 
 <script>
-import CountFlopTwo from './countFlopTwo.vue'
+import CountFlopTwo from './countFlopTwo1.vue'
 import { getMaterialReturnDataApi } from '../../api/screen'
 export default {
   name: 'accessRatePage',
diff --git a/sgzb-screen/src/components/home/new-map.vue b/sgzb-screen/src/components/home/new-map.vue
index 12eeeb4b..11b96cc5 100644
--- a/sgzb-screen/src/components/home/new-map.vue
+++ b/sgzb-screen/src/components/home/new-map.vue
@@ -105,7 +105,7 @@ export default {
             //   title: points[i].typeModelName, // 信息窗口标题
             // }
             // const mapHtml = `<div style="height: 35px;line-height: 35px;letter-spacing: 1px;font-size: 16px"><span>设备编码：</span>${points[i].maCode}</div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备状态：${points[i].maStatus}</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>领用工程：${points[i].projectName}</span></div><div style='border-bottom: 2px dashed #3484ff;margin:15px 0'></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备编码：${points[i].iotId}</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备状态：在用/电量/${points[i].voltagepercent}%</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>当前位置：</span></div>`
-            const mapHtml = `<div class='my-info-window'><h3 class='my-info-window-title'>${points[i].typeModelName}</h3><div class='my-info-window-content'><div style="height: 35px;line-height: 35px;letter-spacing: 1px;font-size: 16px"><span>设备编码：</span>${points[i].maCode}</div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备状态：${points[i].maStatus}</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>领用工程：${points[i].projectName}</span></div><div style='border-bottom: 2px dashed #3484ff;margin:15px 0'></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备编码：${points[i].iotId}</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备状态：在用/ 电量${points[i].voltagepercent}%</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>当前位置：</span></div></div></div>`
+            const mapHtml = `<div class='my-info-window'><h3 class='my-info-window-title'>${points[i].typeModelName}</h3><div class='my-info-window-content'><div style="height: 35px;line-height: 35px;letter-spacing: 1px;font-size: 16px"><span>设备编码：</span>${points[i].maCode}</div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备状态：${points[i].maStatus}</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>领用工程：${points[i].projectName}</span></div><div style='border-bottom: 2px dashed #3484ff;margin:15px 0'></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备编码：${points[i].iotId}</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>设备状态：在用/ 电量${points[i].voltagepercent}%</span></div><div style="height: 35px;line-height: 35px;letter-spacing: 1px;;font-size: 16px"><span>当前位置：${points[i].iotLocationVo.address}</span></div></div></div>`
             let infoWindow = new BMapGL.InfoWindow(mapHtml) // 创建信息窗口对象
             // marker.openInfoWindow(infoWindow) // 打开信息窗口
             // 可以绑定点击事件打开信息窗口
diff --git a/sgzb-screen/src/views/newHome/components/drawer-project.vue b/sgzb-screen/src/views/newHome/components/drawer-project.vue
index 881ef2b8..abb1149d 100644
--- a/sgzb-screen/src/views/newHome/components/drawer-project.vue
+++ b/sgzb-screen/src/views/newHome/components/drawer-project.vue
@@ -248,6 +248,8 @@ export default {
     border-right: 1px dashed #0098ee;
     color: #fff;
     background-color: #030c3c;
+    display: flex;
+    flex-direction: column;
 
     h4 {
       font-weight: normal;
@@ -305,10 +307,12 @@ export default {
 
     .device-list {
       list-style: none;
+      flex: 1;
       margin: 20px 0 0 0;
       padding: 0;
       display: flex;
       flex-direction: column;
+      overflow-y: auto;
 
       li {
         margin-bottom: 8px;
@@ -463,4 +467,22 @@ export default {
 //     color: #fff;
 //   }
 // }
+
+//定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸
+*::-webkit-scrollbar {
+  width: 5px;
+  height: 5px;
+}
+
+//定义滑块 内阴影+圆角
+*::-webkit-scrollbar-thumb {
+  border-radius: 1em;
+  background-color: rgba(230, 237, 248, 0.3);
+}
+
+//定义滚动条轨道 内阴影+圆角
+*::-webkit-scrollbar-track {
+  border-radius: 1em;
+  background-color: rgba(230, 237, 248, 0.1);
+}
 </style>