From 2963a635cf3885def5a1a7222404252f02ad1916 Mon Sep 17 00:00:00 2001
From: huangjp <huangjp@sinocat.com.cn>
Date: Tue, 22 Jul 2025 15:13:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E7=89=88=E6=9C=AC=E5=A4=A9?=
 =?UTF-8?q?=E6=B0=94=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=A7=E5=B1=8F=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A4=A9?=
 =?UTF-8?q?=E6=B0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en.js                    |  2 +-
 src/layout/components/Navbar.vue  | 58 ++++++++++++++++++++++++++++---
 src/views/new-screen-zz/index.vue |  4 +--
 3 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/lang/en.js b/src/lang/en.js
index 0885bb2..4e7e11a 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -89,7 +89,7 @@ export default {
     sure: 'Sure',
     cancel: 'Cancel',
     more: 'More',
-    tem: 'Temperature',
+    tem: 'TEMP',
     xxxq: 'Message details',
     pleaseInput: 'Please input',
     sureRead: 'Confirm has been read',
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 0dafe24..49606bd 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -88,9 +88,9 @@
       class="others-wrapper"
       :style="{ 'min-width': clientWidth > 800 && language === 'zh' ? '520px' : '200px' }"
     >
-      <div v-if="weatherData && clientWidth > 600 && language === 'zh'" class="weather">
+      <div v-if="weatherData && clientWidth > 600" class="weather">
         <div v-if="+stationId !== 1069" class="item">
-          <img :src="weather[weatherData.skyCon]" alt>
+          <img :src="weatheren[weatherData.code]" alt>
         </div>
         <div
           v-if="weatherData && +stationId !== 1069"
@@ -104,7 +104,7 @@
           <div class="item">
             <div class="weather-text">{{ weatherData.skyCon }}</div>
             <div class="weather-text">
-              {{ $t('navbar.tem') }}{{ fixNumber(weatherData.minTemperature) }}℃-{{
+              {{ $t('navbar.tem') }} {{ fixNumber(weatherData.minTemperature) }}℃-{{
                 fixNumber(weatherData.maxTemperature)
               }}℃
             </div>
@@ -401,6 +401,56 @@ export default {
       yuzhuanqing,
       zhongxue,
       zhongyu,
+      weatheren: {
+        1000: qing,
+        1003: duoyun,
+        1006: duoyun,
+        1009: yintian,
+        1030: wu,
+        1063: xiaoyu,
+        1066: xiaoxue,
+        1069: yujiaxue,
+        1072: yujiaxue,
+        1087: leiyu,
+        1114: daxue,
+        1117: daxue,
+        1135: wu,
+        1147: wu,
+        1150: xiaoyu,
+        1153: xiaoyu,
+        1168: yujiaxue,
+        1171: yujiaxue,
+        1180: xiaoyu,
+        1183: xiaoyu,
+        1186: zhongyu,
+        1189: zhongyu,
+        1192: dayu,
+        1195: dayu,
+        1198: yujiaxue,
+        1201: yujiaxue,
+        1204: leiyu,
+        1207: leiyu,
+        1210: xiaoxue,
+        1213: xiaoxue,
+        1216: zhongxue,
+        1219: zhongxue,
+        1222: daxue,
+        1225: daxue,
+        1237: yujiaxue,
+        1240: xiaoyu,
+        1243: dayu,
+        1246: baoyu,
+        1249: yujiaxue,
+        1252: yujiaxue,
+        1255: zhongxue,
+        1258: daxue,
+        1261: yujiaxue,
+        1264: yujiaxue,
+        1273: leiyu,
+        1276: leiyu,
+        1279: yujiaxue,
+        1282: yujiaxue
+      },
       weather: {
         晴: qing,
         少云: duoyun,
@@ -1049,7 +1099,7 @@ export default {
         height: 100%;
         display: flex;
         align-items: center;
-
+        flex-wrap: wrap;
         // padding-right: 15px;
         .iconfont {
           font-size: 40px;
diff --git a/src/views/new-screen-zz/index.vue b/src/views/new-screen-zz/index.vue
index 6f0d30d..29624c0 100644
--- a/src/views/new-screen-zz/index.vue
+++ b/src/views/new-screen-zz/index.vue
@@ -10,7 +10,7 @@
             <span class="title-text">中自智慧储能管控平台</span>
             <div class="right-title">
               <span>{{ time }}</span>
-              <span class="weather">{{ weatherInfo ? weatherInfo.skyCon : '' }} {{ weatherInfo? weatherInfo.minTemperature :'' }}℃ ~  {{ weatherInfo ? weatherInfo.maxTemperature : '' }}℃</span>
+              <!-- <span class="weather">{{ weatherInfo ? weatherInfo.skyCon : '' }} {{ weatherInfo? weatherInfo.minTemperature :'' }}℃ ~  {{ weatherInfo ? weatherInfo.maxTemperature : '' }}℃</span> -->
 
             </div>
 
@@ -142,7 +142,7 @@ export default {
         this.$refs.RightTopRef.getData(this.deptId)
         this.$refs.RightCenterRef.getData(this.deptId)
         this.$refs.RightRightRef.getData(this.deptId)
-        this.getWeatherInfo()
+        // this.getWeatherInfo() 国外大屏不展示天气
         this.$refs.MapCenterRef.getStationNum(this.deptId)
         this.$refs.MapCenterRef.getData(this.deptId)
         this.$refs.MapCenterRef.getLeftData(this.deptId)