Merge branch 'main' into main

.env.development

@@ -5,11 +5,11 @@ VITE_APP_TITLE = 云平台管理系统
 VITE_APP_ENV = 'development'
 
 # 开发环境
- VITE_APP_BASE_API = 'https://fuyuanshen.com/backend'
+ #VITE_APP_BASE_API = 'https://fuyuanshen.com/backend'
-#  VITE_APP_BASE_API = 'https://www.cnxhyc.com/xh'
+ #VITE_APP_BASE_API = 'https://www.cnxhyc.com/jq'
 
 #代永飞接口
-#VITE_APP_BASE_API = 'http://457102h2d6.qicp.vip:24689'   
+VITE_APP_BASE_API = 'http://192.168.2.23:8000'   
 
 
 # 应用访问路径 例如使用前缀 /admin/

src/views/homeIndex/components/RealTimeAlarm.vue

@@ -22,7 +22,7 @@
                     }[item.deviceAction] }}
 
                 </div>
-                <div class="item-cell">{{ item.location }}</div>
+                <div class="item-cell loaction">{{ item.location }}</div>
             </div>
         </div>
     </div>
@@ -79,12 +79,31 @@ onMounted(() => {
     color: #fff;
 }
 
+/* Webkit浏览器滚动条样式 */
+.alarm-table-body::-webkit-scrollbar {
+    width: 8px;
+}
+
+.alarm-table-body::-webkit-scrollbar-track {
+    background: transparent;
+    border-radius: 4px;
+}
+
+.alarm-table-body::-webkit-scrollbar-thumb {
+    background: #267AD0;
+    border-radius: 4px;
+}
+
+.alarm-table-body::-webkit-scrollbar-thumb:hover {
+    background: #267AD0;
+}
+
 .alarm-item {
     display: flex;
     border-bottom: 1px dashed rgba(100, 150, 200, 0.3);
     font-size: 0.6vw;
     align-items: center;
-    padding: 0.5vw;
+    padding: 0.8vw;
 }
 
 .item-cell {
@@ -92,6 +111,9 @@ onMounted(() => {
     text-align: center;
 }
 
+// .item-cell.loaction{
+//     color: #267AD0;
+// }
 .alarm-event {
     color: #ff5252;
     /* 报警事件红色显示 */