From 3d3e4173c301fd36c16b9a25cd1f8c9f27257ed0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 24 十一月 2025 16:50:18 +0800
Subject: [PATCH] 新增当月总耗电、电视机样式调整、字体更换、副屏设备图裁剪放大、24小时柱状图更换为昨天晚上8点到今天晚上8点、报警色块位置调整
---
gmms/WebContent/bigScreen/allGlassScreenVice.html | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/gmms/WebContent/bigScreen/allGlassScreenVice.html b/gmms/WebContent/bigScreen/allGlassScreenVice.html
index a6f68a5..7687dd0 100644
--- a/gmms/WebContent/bigScreen/allGlassScreenVice.html
+++ b/gmms/WebContent/bigScreen/allGlassScreenVice.html
@@ -36,6 +36,8 @@
margin-bottom: 10vh;
margin-left: 2vh;
width: 12vw; /* 鍥哄畾鍝佺墝鍚嶅尯鍩熷搴︼紝閬垮厤鎸ゅ帇涓绘爣棰� */
+ display:none;
+
}
.main-title {
font-size: 5vh; /* 涓绘爣棰樺瓧浣撳ぇ灏忔寜灞忓箷姣斾緥锛屼笌鍘熷浘鍖归厤 */
@@ -45,7 +47,7 @@
white-space: nowrap; /* 绂佹鎹㈣锛屼繚鎸佷竴琛屾樉绀� */
overflow: hidden;
text-overflow: ellipsis;
- margin-left: -21vh;
+ /* margin-left: -21vh; */
}
.content {
width: 100%;
@@ -84,19 +86,20 @@
}
/* 浜х嚎鍥剧墖锛堜綅浜庢爣棰樹笅鏂癸級 */
.production-image {
- width: 103%;
+ width: 112%;
height: calc(100% - 8vh);
object-fit: contain;
margin-top: -10%;
}
.intro-text {
height: calc(100% - 8vh);
- font-size: 2.5vh;
+ font-size: 2.5vh;
line-height: 2.5;
overflow: auto;
/* 鏍稿績璋冩暣锛氭枃瀛楄寖鍥村悜鍙冲亸绉� */
margin-left: 15%; /* 鐩稿浜庣埗瀹瑰櫒鍙充晶鍖哄煙锛屽乏渚х暀15%绌虹櫧锛屾枃瀛楁暣浣撳彸绉� */
- max-width: 80%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
+ max-width: 100%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
+ margin-top: -44px;
}
.section-title2 {
height: 6vh; /* 鏍囬楂樺害缁熶竴锛屼笌鍘熷浘瀵归綈 */
@@ -106,7 +109,7 @@
text-align: center;
margin-bottom: 9vh;
margin-left: 15%; /* 鐩稿浜庣埗瀹瑰櫒鍙充晶鍖哄煙锛屽乏渚х暀15%绌虹櫧锛屾枃瀛楁暣浣撳彸绉� */
- max-width: 85%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
+ max-width: 100%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
}
</style>
</head>
@@ -123,8 +126,8 @@
<div class="right-section">
<div class="section-title2"><P style="margin-top: 5%;">浜屾湡椤圭洰绠�浠�</p></div>
<div class="intro-text">
- <p> 娴峰皵鏅鸿兘鍘ㄧ數鐑熷彴宸ュ巶浜屾湡鍏ㄨ嚜鍔ㄧ幓鐠冩櫤鑳界敓浜х嚎鏄捣灏旈泦鍥㈠叏璧勬姇璧勫缓璁俱�傜郴鍥藉唴锛堝巶鍐咃級绗簩鏉″叏鑷姩鍘ㄧ數鐜荤拑鏅鸿兘鐢熶骇绾裤�傝鍒掍骇鑳�150涓囩墖/骞淬��</p>
- <p> 鐢熶骇绾夸富瑕佺敱30澶氬彴濂楀叏鑷姩鍖栬澶囩粍鎴愶紝閫氳繃MES鐢熶骇绠＄悊绯荤粺璋冨害鐢熶骇绾胯澶囪繘琛屽叏鑷姩鐢熶骇锛屽皢鍘熺墖鐜荤拑浠庝粨鍌�-鑷姩涓婄嚎寮�濮嬶紝缁忚繃鍐峰姞宸ョ殑鍒�-纾�-閽�-娲楃瓑娴佺▼鍔犲伐锛屽啀杈呬互婵�鍏夊唴鍒�-楂樻俯涓濆嵃-閽㈠寲-浣庢俯浜屾涓濆嵃-瑕嗚啘-鍫嗗灈涓嬬嚎绛夊伐搴忎竴娆℃垚鍨嬶紝瀹炵幇鍏ㄦ祦绋嬫櫤鑳芥棤浜哄寲鐢熶骇銆�</p>
+ <p> 娴峰皵鏅鸿兘鍘ㄧ數鐑熷彴宸ュ巶浜屾湡鍏ㄨ嚜鍔ㄧ幓鐠冩櫤鑳界敓浜х嚎鏄捣灏旈泦鍥㈠叏璧勬姇璧勫缓璁俱�傜郴鍥藉唴锛堝巶鍐咃級绗簩鏉″叏鑷姩鍘ㄧ數鐜荤拑鏅鸿兘鐢熶骇绾裤�傝鍒掍骇鑳�150涓囩墖/骞淬��</p>
+ <p> 鐢熶骇绾夸富瑕佺敱30澶氬彴濂楀叏鑷姩鍖栬澶囩粍鎴愶紝閫氳繃MES鐢熶骇绠＄悊绯荤粺璋冨害鐢熶骇绾胯澶囪繘琛屽叏鑷姩鐢熶骇锛屽皢鍘熺墖鐜荤拑浠庝粨鍌�-鑷姩涓婄嚎寮�濮嬶紝缁忚繃鍐峰姞宸ョ殑鍒�-纾�-閽�-娲楃瓑娴佺▼鍔犲伐锛屽啀杈呬互婵�鍏夊唴鍒�-楂樻俯涓濆嵃-閽㈠寲-浣庢俯浜屾涓濆嵃-瑕嗚啘-鍫嗗灈涓嬬嚎绛夊伐搴忎竴娆℃垚鍨嬶紝瀹炵幇鍏ㄦ祦绋嬫櫤鑳芥棤浜哄寲鐢熶骇銆�</p>
</div>
</div>
</div>
--
Gitblit v1.8.0