From 03cd344a15bf63bf7968dc77a026c77c78c304f4 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期三, 26 三月 2025 11:44:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/chongzhou-screen

---
 src/components/datascreen/HeaderPanel.vue |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/components/datascreen/HeaderPanel.vue b/src/components/datascreen/HeaderPanel.vue
index 5d52bfc..de8e6e9 100644
--- a/src/components/datascreen/HeaderPanel.vue
+++ b/src/components/datascreen/HeaderPanel.vue
@@ -2,8 +2,10 @@
   <div class="header">
     <!-- 左侧天气 -->
     <div class="weather">
-      <!-- <img :src="require(`@/assets/weather/${weatherInfo.icon}.png`)" alt="weather" class="weather-icon"> -->
-      <span class="weather-text">{{ weatherInfo.text }}</span>
+      <div class="mask"></div>
+      <div class="box"></div>
+      <iframe allowtransparency="true" frameborder="0" width="180" height="36" scrolling="no"
+        src="//tianqi.2345.com/plugin/widget/index.htm?s=3&z=3&t=1&v=0&d=3&bd=0&k=000000&f=ffffff&ltf=ffffff&htf=ffffff&q=1&e=1&a=1&c=60910&w=103&h=36&align=left" />
     </div>
 
     <!-- 中间标题 -->
@@ -76,15 +78,24 @@
     display: flex;
     margin-top: 61px;
 
-    .weather-icon {
-      width: 30px;
-      height: 30px;
-      margin-right: 10px;
+
+    .mask {
+      position: absolute;
+      width: 180px;
+      height: 36px;
+      z-index: 1;
+      filter: alpha(opacity=0);
+      opacity: 0;
+      background: #040A56
     }
 
-    .weather-text {
-      color: #fff;
-      font-size: 16px;
+    .box {
+      position: absolute;
+      width: 20px;
+      height: 36px;
+      left: 140px;
+      z-index: 1;
+      background: #040A56
     }
   }
 

--
Gitblit v1.7.1