From edc2ac91ef657a15c5688f25d8b653121fa9ed6e Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 20 十一月 2025 16:56:15 +0800
Subject: [PATCH] 增加新副屏显示，增加主屏24小时产量图、值班表显示，回车进行修改
---
gmms/WebContent/bigScreen/allGlassScreenVice2.jsp | 0
gmms/WebContent/bigScreen/allGlassScreenVice.html | 132 +++++++++
gmms/WebContent/bigScreen/allGlassScreen.jsp | 649 +++++++++++++++++++++++++++++++++++----------
3 files changed, 632 insertions(+), 149 deletions(-)
diff --git a/gmms/WebContent/bigScreen/allGlassScreen.jsp b/gmms/WebContent/bigScreen/allGlassScreen.jsp
index 0caf365..f58e0fd 100644
--- a/gmms/WebContent/bigScreen/allGlassScreen.jsp
+++ b/gmms/WebContent/bigScreen/allGlassScreen.jsp
@@ -6,142 +6,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style>
- html,body{
- width: 100%;
- height: 100%;
- padding: 0;
- margin: 0;
- overflow: hidden;
- }
- #header1 {
- width: 100%;
- height: 5%;
- background-color: white;
- display: inline-block;
- text-align: center;
- font-size: 40px;
- }
- #header {
- width: 100%;
- height: 25%;
- background-color: white;
- display: flex;
- }
- #footer {
- width: 100%;
- height: 70%;
- overflow: visible; /* 纭繚璁惧鍥句笂绉诲悗涓嶈鑷韩瀹瑰櫒瑁佸壀 */
-
- }
- #main1 {
- margin-left:1%;
- width: 14%;
- height: 100%;
- }
- #main2 {
- width: 20%;
- height: 100%;
- }
- #main4 {
- width: 20%;
- height: 100%;
- }
- #main3 {
- width: 45%;
- height: 100%;
- display: flex;
- }
- #main1-1 {
- width: 100%;
- height: 25%;
- }
- #main1-2 {
- width: 100%;
- height: 25%;
- }
- #main3-1 {
- width: 50%;
- height: 100%;
- }
- #main3-2 {
- width: 50%;
- height: 100%;
-
- }
- #main4-1 {
- width: 100%;
- height: 30%;
-
- }
- #main4-2 {
- width: 100%;
- height: 30%;
-
- }
- #main4-3 {
- width: 100%;
- height: 30%;
-
- }
- #main1-1-1 {
- font-size: 25px;
- margin-top: 2%;
- }
- #main1-2-1 {
- font-size: 25px;
- margin-top: 2%;
- }
- #main3-1-1 {
- width: 100%;
- height: 20%;
- }
- #main3-1-2 {
- width: 100%;
- height: 80%;
- }
- #main3-2-1 {
- width: 100%;
- height: 20%;
- }
- #main3-2-2 {
- width: 100%;
- height: 80%;
- }
-
-
- .boli {
- opacity:0.5;
-
- }
-
-
-
- .divGrenn{
- background-color:green;
- display:block
- }
- .divRed{
- background-color:red;
- display:block
- }
- .divYellow{
- background-color:yellow;
- display:block
- }
- .divnull{
- display:none
- }
- /* -45
- -50
- */
- #A4 {
- width: 65px;
- height: 55px;
- position: Absolute;
- top: 775px;
- left: 1250px
- }
#warn-734,#warn-743{
top: 555px !important;
left: 1421px !important;
@@ -875,6 +740,258 @@
height: 18px !important;
position: Absolute;
}
+
+ html,body{
+ width: 100%;
+ height: 100%;
+ padding: 0;
+ margin: 0;
+ overflow: hidden;
+
+ }
+ #header1 {
+ width: 100%;
+ height: 5%;
+ background-color: white;
+ display: inline-block;
+ text-align: center;
+ font-size: 40px;
+ }
+ #header {
+ width: 100%;
+ height: 20%;
+ background-color: white;
+ display: flex;
+ }
+ #center {
+ width: 100%;
+ height: 60%;
+ overflow: visible; /* 纭繚璁惧鍥句笂绉诲悗涓嶈鑷韩瀹瑰櫒瑁佸壀 */
+
+ }
+ #footer {
+ width: 100%;
+ height: 20%;
+ overflow: visible; /* 纭繚璁惧鍥句笂绉诲悗涓嶈鑷韩瀹瑰櫒瑁佸壀 */
+
+ }
+ #main1 {
+ margin-left:1%;
+ width: 14%;
+ height: 100%;
+ }
+ #main2 {
+ width: 20%;
+ height: 100%;
+ }
+ #main4 {
+ width: 20%;
+ height: 100%;
+ }
+ #main3 {
+ width: 45%;
+ height: 100%;
+ display: flex;
+ }
+ #main1-1 {
+ width: 100%;
+ height: 25%;
+ }
+ #main1-2 {
+ width: 100%;
+ height: 25%;
+ }
+ #main3-1 {
+ width: 50%;
+ height: 100%;
+ }
+ #main3-2 {
+ width: 50%;
+ height: 100%;
+
+ }
+ #main4-1 {
+ width: 100%;
+ height: 30%;
+
+ }
+ #main4-2 {
+ width: 100%;
+ height: 30%;
+
+ }
+ #main4-3 {
+ width: 100%;
+ height: 30%;
+
+ }
+ #main1-1-1 {
+ font-size: 25px;
+ margin-top: 2%;
+ }
+ #main1-2-1 {
+ font-size: 25px;
+ margin-top: 2%;
+ }
+ #main3-1-1 {
+ width: 100%;
+ height: 20%;
+ }
+ #main3-1-2 {
+ width: 100%;
+ height: 80%;
+ }
+ #main3-2-1 {
+ width: 100%;
+ height: 20%;
+ }
+ #main3-2-2 {
+ width: 100%;
+ height: 80%;
+ }
+
+
+ .boli {
+ opacity:0.5;
+
+ }
+ .divGrenn{
+ background-color:green;
+ display:block
+ }
+ .divRed{
+ background-color:red;
+ display:block
+ }
+ .divYellow{
+ background-color:yellow;
+ display:block
+ }
+ .divnull{
+ display:none
+ }
+ /* -45
+ -50
+ */
+ #A4 {
+ width: 65px;
+ height: 55px;
+ position: Absolute;
+ top: 775px;
+ left: 1250px
+ }
+ /* 搴曢儴 */
+ #footer {
+ width: 100%;
+ height: 20%;
+ overflow: visible;
+ display: flex; /* 妯悜甯冨眬 */
+ background-color: white; /* 涓巋eader鑳屾櫙缁熶竴 */
+ box-sizing: border-box;
+ padding: 10px;
+}
+
+/* 浜ч噺鏌辩姸鍥惧鍣ㄦ牱寮� */
+#production-chart-wrap {
+ height: 100%;
+ box-sizing: border-box;
+ padding: 10px;
+}
+
+#production-chart-title {
+ font-size: 16px;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 5px;
+ text-align: center;
+}
+
+#production-chart-container {
+ width: 100%;
+ height: calc(100% - 30px); /* 鍑忓幓鏍囬楂樺害 */
+}
+
+#staff-container {
+ width: 30%;
+ height: 100%;
+ box-sizing: border-box;
+ padding: 10px;
+ background-color: white;
+}
+
+#staff-title {
+ font-size: 16px;
+ font-weight: bold;
+ color: #333;
+ margin-bottom: 5px;
+ text-align: center;
+}
+
+/* 婊氬姩瀹瑰櫒锛氳鏁拌秴鍑烘椂鏄剧ず婊氬姩鏉� */
+#staff-scroll-wrapper {
+ padding-right: 5px; /* 棰勭暀婊氬姩鏉″搴︼紝閬垮厤鍐呭琚伄鎸� */
+}
+
+#staff-table-wrapper {
+ gap: 0px; /* 涓ょ粍琛ㄦ牸闂磋窛 */
+ width: 100%; /* 鍗犳弧婊氬姩瀹瑰櫒瀹藉害 */
+}
+
+/* 瀛愯〃鏍兼牱寮忥紙姣忕粍涓ゅ垪锛屽叡鍥涘垪锛� */
+.staff-subtable {
+ width: 50%; /* 姣忕粍鍗�50%瀹藉害锛屽洓鍒楁�诲崰婊�30%瀹瑰櫒 */
+ border-collapse: collapse;
+ text-align: center;
+ font-size: 14px;
+}
+
+.staff-subtable th, .staff-subtable td {
+ border: 1px solid #ddd;
+ padding: 6px 3px;
+ width: 50%; /* 缁勫唴涓ゅ垪绛夊 */
+}
+
+.staff-subtable th {
+ background-color: #f0f0f0;
+ font-size: 13px;
+}
+
+.staff-subtable input {
+ width: 100%;
+ height: 20px;
+ padding: 0 3px;
+ font-size: 13px;
+ text-align: center;
+ box-sizing: border-box;
+}
+
+/* 婊氬姩鏉℃牱寮忎紭鍖栵紙鍙�夛級 */
+#staff-scroll-wrapper::-webkit-scrollbar {
+ width: 6px;
+}
+#staff-scroll-wrapper::-webkit-scrollbar-thumb {
+ background-color: #ddd;
+ border-radius: 3px;
+}
+/* 鍘婚櫎杈撳叆妗嗚竟妗嗗強鑱氱劍杞粨 */
+.staff-subtable input {
+ width: 100%;
+ height: 20px;
+ padding: 0 3px;
+ font-size: 13px;
+ text-align: center;
+ box-sizing: border-box;
+ border: none;
+ /* 鍘婚櫎鑱氱劍鏃剁殑榛樿杞粨锛堟祻瑙堝櫒鑷甫锛� */
+ outline: none;
+ /* 鍙�夛細娣诲姞鑳屾櫙鑹查�忔槑锛岃杈撳叆妗嗘洿铻嶅叆琛ㄦ牸 */
+ background: transparent;
+}
+.staff-subtable input:hover {
+ background-color: #f5f5f5; /* 娴呯伆鑹茶儗鏅� */
+}
+.staff-subtable input.saving {
+ background-color: #fff3cd; /* 娴呴粍鑹茶儗鏅彁绀� */
</style>
<title>澶у睆鏄剧ず</title>
</head>
@@ -909,8 +1026,8 @@
</div>
</div>
</div>
- <div id="footer">
- <img style="width: 100%;height: 100%;" src="../img/浜屾湡澶у睆.png">
+ <div id="center">
+ <img style="width: 100%;height: 100%;" src="../img/鏂颁簩鏈熷ぇ灞�.png">
<div v-if="warning && warning.length > 0">
<div
v-for="warnItem in warning"
@@ -919,21 +1036,59 @@
:id="'warn-' + warnItem['0_id']"
v-show="warnItem['4_state'] === '1'"
:title="warnItem['3_content_value'] || '鏃犺缁嗕俊鎭�'"
- style="
+ style="
position: absolute;
top: 450px;
background: rgba(255, 0, 0, 0.4);
- color: white;
+ color: white;
z-index: 10;
- cursor: pointer;
- "
- >
-
+ cursor: pointer;" >
</div>
</div>
</div>
+ <div id="footer">
+ <div id="production-chart-wrap" style="width: 70%; height: 100%;">
+ <div id="production-chart-title"></div>
+ <div id="production-chart-container"></div>
+ </div>
+
+ <div id="staff-container" style="width: 30%; height: 100%;">
+ <div id="staff-title">褰撶彮浜哄憳淇℃伅</div>
+ <!-- 婊氬姩瀹瑰櫒锛氳鏁拌繃澶氭椂鍑虹幇婊氬姩鏉� -->
+ <div id="staff-scroll-wrapper" style="height: calc(100% - 30px); overflow-y: auto;">
+ <!-- 鍥涘垪甯冨眬瀹瑰櫒锛坒lex妯悜鎺掑垪涓ょ粍琛ㄦ牸锛� -->
+ <div id="staff-table-wrapper" style="display: flex;">
+ <!-- 宸︾粍锛氬墠鍗婇儴鍒嗘暟鎹紙璁惧1+濮撳悕1锛� -->
+ <table class="staff-subtable">
+<!-- <thead>
+ <tr><th>璁惧</th><th>濮撳悕</th></tr>
+ </thead> -->
+ <tbody>
+ <tr v-for="(item, index) in leftGroup" :key="'left-' + index">
+ <td><input type="text" readonly v-model="item['0_machine']" @keydown.enter="saveStaff(leftGroupIndex[index])" placeholder="璁惧"></td>
+ <td><input type="text" v-model="item['1_operator_name']" @keydown.enter="saveStaff(leftGroupIndex[index])" placeholder="濮撳悕"></td>
+ </tr>
+ </tbody>
+ </table>
+
+ <!-- 鍙崇粍锛氬悗鍗婇儴鍒嗘暟鎹紙璁惧2+濮撳悕2锛� -->
+ <table class="staff-subtable">
+ <!-- <thead>
+ <tr><th>璁惧</th><th>濮撳悕</th></tr>
+ </thead> -->
+ <tbody>
+ <tr v-for="(item, index) in rightGroup" :key="'right-' + index">
+ <td><input type="text" readonly v-model="item['0_machine']" @keydown.enter="saveStaff(rightGroupIndex[index])" placeholder="璁惧"></td>
+ <td><input type="text" v-model="item['1_operator_name']" @keydown.enter="saveStaff(rightGroupIndex[index])" placeholder="濮撳悕"></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+</div>
+</div>
<script src="../js/jquery-3.4.1.min.js"></script>
@@ -954,8 +1109,10 @@
shuzu1:[{}],
shuzu2:[{}],
warning:[],
+ Hour24:[],
machineElectric:[{}],
- machineWater:[{}],
+ machineWater:[{}],
+ operator:[{}],
val: {
title:{
@@ -1088,11 +1245,59 @@
}
}
- ]
+ ],
+
},
- },
+ },/*data缁撳熬 */
+ computed: {
+ // 璁＄畻宸︾粍鏁版嵁锛堝墠鍗婇儴鍒嗭級
+ leftGroup() {
+ const mid = Math.ceil(this.operator.length / 2);
+ return this.operator.slice(0, mid);
+ },
+ // 璁＄畻鍙崇粍鏁版嵁锛堝悗鍗婇儴鍒嗭級
+ rightGroup() {
+ const mid = Math.ceil(this.operator.length / 2);
+ return this.operator.slice(mid);
+ },
+ // 宸︾粍鍘熷绱㈠紩
+ leftGroupIndex() {
+ const mid = Math.ceil(this.operator.length / 2);
+ return Array.from({ length: mid }, (_, i) => i);
+ },
+ // 鍙崇粍鍘熷绱㈠紩
+ rightGroupIndex() {
+ const mid = Math.ceil(this.operator.length / 2);
+ return Array.from({ length: this.operator.length - mid }, (_, i) => mid + i);
+ }
+ },
methods:{
+ // 鍥炶溅鎻愪氦淇敼锛坕ndex锛氬師濮媜perator鏁扮粍涓殑绱㈠紩锛�
+ saveStaff(index) {
+ // 1. 鑾峰彇褰撳墠琛屾暟鎹紙璁惧鍚嶇О+淇敼鍚庣殑濮撳悕锛�
+ const currentItem = this.operator[index];
+ if (!currentItem) {
+ alert("鏁版嵁寮傚父锛屾棤娉曚繚瀛�");
+ return;
+ }
+ const machine = currentItem["0_machine"]; // 璁惧鍚�
+ const operatorName = currentItem["1_operator_name"]; // 濮撳悕
+ if (!machine || !operatorName.trim()) {
+ alert("璁惧鍚嶄笉鑳戒负绌猴紝涓斿鍚嶄笉鍙负绌猴紒");
+ return;
+ }
+ let updateData = {
+ machine: machine, // 瀵瑰簲IN machine
+ operatorName: operatorName // 瀵瑰簲IN operatorName
+ };
+ //鎻愪氦鏁版嵁搴�
+ /* console.log("濮撳悕锛�", updateData); */
+ let sql = "{call bigScreen_operatorUpdate(?,?,?)}~" + JSON.stringify(updateData);
+ this.connects("鍊肩彮浜哄憳淇℃伅淇敼", sql,1,1);
+ document.activeElement.blur();
+ },
+
echarsInit() {
// 1. 鐢熸垚杩�7澶╂棩鏈燂紙鍜屾按鑰楄〃閫昏緫涓�鑷达級
var datashijian = [];
@@ -1129,13 +1334,31 @@
align: "center",
verticalAlign: "middle"
},
+
padding: [0, 20, 0, 0],
axisLine: {
lineStyle: {
width: 0
}
}
- };
+ };
+ this.val.series[0] = {
+ ...this.val.series[0],
+ name: '鐢佃��(kw.h)', // 鐢佃�楀崟浣�
+ itemStyle: {
+ color: '#5470c6' // 鐢佃�楄〃棰滆壊
+ },
+ // 鏂板锛氭樉绀烘煴鐘跺浘鏁板��
+ label: {
+ show: true, // 寮�鍚樉绀�
+ position: 'top', // 鏁板�兼樉绀哄湪鏌卞瓙椤堕儴
+ textStyle: {
+ color: '#333', // 鏂囧瓧棰滆壊
+ fontSize: 12 // 鏂囧瓧澶у皬
+ },
+ formatter: '{c}' // 鏍煎紡鍖栨樉绀猴紝{c}琛ㄧず褰撳墠鏁版嵁鍊�
+ }
+ };
this.val.series[0].name = '鐢佃��(kw.h)'; // 鐢佃�楀崟浣�
this.val.title.text = "鎬昏�楃數(kw.h)"; // 鏍囬
this.val.series[0].itemStyle.color = '#5470c6'; // 鐢佃�楄〃棰滆壊锛堝彲鑷畾涔夛紝涓庢按鑰楀尯鍒嗭級
@@ -1188,8 +1411,25 @@
}
}
};
- this.val.series[0].name = '姘磋��(kw.h)';
- this.val.title.text = "鎬昏�楁按(kw.h)";
+ this.val.series[0] = {
+ ...this.val.series[0],
+ name: '姘磋��(L.h)',
+ itemStyle: {
+ color: '#5470c6'
+ },
+ // 鏂板锛氭樉绀烘煴鐘跺浘鏁板��
+ label: {
+ show: true,
+ position: 'top',
+ textStyle: {
+ color: '#333',
+ fontSize: 12
+ },
+ formatter: '{c}'
+ }
+ };
+ this.val.series[0].name = '姘磋��(L.h)';
+ this.val.title.text = "鎬昏�楁按(L.h)";
this.val.series[0].itemStyle.color = '#5470c6'; // 鐢佃�楄〃棰滆壊锛堝彲鑷畾涔夛紝涓庢按鑰楀尯鍒嗭級
this.val.xAxis[0].data = datashijian; // x杞存棩鏈燂紙鍜屾按鑰椾竴鑷达級
this.val.series[0].data = dianhao; // 缁戝畾鐢佃�楁暟鎹�
@@ -1197,6 +1437,102 @@
// 5. 搴旂敤閰嶇疆骞舵覆鏌�
HisArr.setOption(this.val);
this.loading = false;
+ }
+ ,
+ initProductionChart() {
+ // 1. 鍥哄畾x杞存爣绛撅紙鏄ㄥぉ8鐐光啋浠婂ぉ7鐐癸紝鍏�24涓椂娈碉紝鏃犵浜屽ぉ8鐐癸級
+ const hourLabels = [
+ "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", // 鏄ㄥぉ8-19鐐�
+ "20", "21", "22", "23", // 鏄ㄥぉ20-23鐐�
+ "00", "01", "02", "03", "04", "05", "06", "07" // 浠婂ぉ0-7鐐癸紙鍏�24涓級
+ ];
+
+ // 2. 寮哄埗璁剧疆鍥捐〃瀹瑰櫒楂樺害锛堥伩鍏嶆覆鏌撲笉鍙锛�
+ const chartDom = document.getElementById('production-chart-container');
+ if (!chartDom) {
+ console.error("鍥捐〃瀹瑰櫒涓嶅瓨鍦紒璇锋鏌d锛歱roduction-chart-container");
+ return;
+ }
+ chartDom.style.width = '100%';
+ chartDom.style.height = '100%';
+
+ // 3. 鎸夋暟鎹簮椤哄簭鎻愬彇浜ч噺锛�1:1瀵瑰簲鏍囩锛屾瀬绠�鏄犲皠锛�
+ const outputData = this.Hour24.map(item => {
+ // 鍏煎绌哄�笺�佸瓧绗︿覆鏍煎紡锛岃浆鏁板瓧澶辫触璁句负0
+ return item["1_hourly_production"]
+ ? parseInt(item["1_hourly_production"].toString().trim(), 10) || 0
+ : 0;
+ });
+
+ // 4. 鏋佺畝鍥捐〃閰嶇疆锛堟竻鏅扮洿瑙傦級
+ const chartOption = {
+ animation: true, // 棣栨娓叉煋鏃舵挱鏀惧姩鐢伙紙鍙�夛紝榛樿true锛�
+ animationDuration: 500, // 棣栨鍔ㄧ敾鏃堕暱锛�500ms锛屽彲璋冩暣锛�
+ /* title: {
+ text: "24灏忔椂浜ч噺(鐗�)锛堟槰鏃�8鐐�-浠婃棩7鐐癸級",
+ left: "center",
+ textStyle: { fontSize: 15, color: "#333" }
+ }, */
+ tooltip: {
+ trigger: "axis",
+ formatter: "{b}鏃讹細{c}鐗�" // 鎻愮ず妗嗘樉绀衡�淴X鏃讹細XX鐗団��
+ },
+ grid: {
+ left: "5%",
+ right: "5%",
+ bottom: "15%",
+ top: "12%",
+ containLabel: true
+ },
+ xAxis: [
+ {
+ type: "category",
+ data: hourLabels,
+ axisLine: { lineStyle: { color: "#ddd" } },
+ axisLabel: {
+ fontSize: 12,
+ color: "#333",
+ interval: 0 // 寮哄埗鏄剧ず鎵�鏈�24涓爣绛�
+ }
+ }
+ ],
+ yAxis: [
+ {
+ type: "value",
+ /* name: "鐗�", */
+ min: 0, // 寮哄埗y杞翠粠0寮�濮�
+ splitLine: { lineStyle: { color: "#f5f5f5" } },
+ axisLabel: { color: "#333", fontSize: 11 }
+ }
+ ],
+ series: [
+ {
+ name: "浜ч噺",
+ type: "bar",
+ data: outputData,
+ barWidth: "60%",
+ itemStyle: { color: "#fac858", borderRadius: 3 },
+ label: {
+ show: true,
+ position: "top",
+ fontSize: 12,
+ color: "#333",
+ formatter: "{c}" // 鏌卞瓙椤堕儴鏄剧ず浜ч噺鏁板��
+ }
+ }
+ ]
+ };
+
+ // 鍒濆鍖栧浘琛紙鍏ㄥ眬鍙垵濮嬪寲1娆★紝閬垮厤閲嶅鍒涘缓锛�
+ if (!this.productionChartInstance) {
+ this.productionChartInstance = this.$echarts.init(chartDom);
+ }
+
+ // 鍏抽敭锛氱2涓弬鏁� { animation: false } 绂佺敤鏇存柊鍔ㄧ敾
+ this.productionChartInstance.setOption(chartOption, { animation: false });
+
+ // 绐楀彛 resize 鏃惰嚜鍔ㄩ噸缁�
+ window.addEventListener('resize', () => productionChart.resize());
}
,
@@ -1262,6 +1598,9 @@
machineWater(){
this.echarsInit1()
},
+ Hour24(){
+ this.initProductionChart();
+ },
shuzu1(){
this.dingdanxiangqing(),
this.dingdanxiangqing1()
@@ -1281,6 +1620,10 @@
this.loadAjxss('澶у睆鎬荤數鑰楁暟鎹�',sql,flag,"machineElectric")
sql="{call machine_warningScreen()}"
this.loadAjxss('澶у睆璁惧璀﹀憡鏁版嵁',sql,flag,"warning")
+ sql="{call bigScreen_24Hour()}"
+ this.loadAjxss('澶у睆24灏忔椂浜ч噺鏁版嵁',sql,flag,"Hour24")
+ sql="{call bigScreen_operatorQuery()}"
+ this.loadAjxss('澶у睆宸ヨ壓鍊肩彮琛�',sql,flag,"operator")
sql="{call bigScreen_water()}"
this.loadAjxss('澶у睆鎬绘按鑰楁暟鎹�',sql,flag,"machineWater")
@@ -1303,6 +1646,14 @@
sql="{call machine_warningScreen()}"
this.interValLoadAjxs('澶у睆璁惧璀﹀憡鏁版嵁',sql,flag,"warning")
},5000)
+ await setInterval(()=>{
+ sql="{call bigScreen_24Hour()}"
+ this.interValLoadAjxs('澶у睆24灏忔椂浜ч噺鏁版嵁',sql,flag,"Hour24")
+ },5000)
+ await setInterval(()=>{
+ sql="{call bigScreen_operatorQuery()}"
+ this.interValLoadAjxs('澶у睆鍊肩彮浜哄憳琛�',sql,flag,"operator")
+ },50000)
await setInterval(()=>{
sql="{call bigScreen_water()}"
this.interValLoadAjxs('澶у睆鎬绘按鑰楁暟鎹�',sql,flag,"machineWater")
diff --git a/gmms/WebContent/bigScreen/allGlassScreenVice.html b/gmms/WebContent/bigScreen/allGlassScreenVice.html
new file mode 100644
index 0000000..a6f68a5
--- /dev/null
+++ b/gmms/WebContent/bigScreen/allGlassScreenVice.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+ <title>娴峰皵鏅鸿兘鍘ㄧ數鐑熷彴宸ュ巶鐢熶骇绾�</title>
+ <style>
+ * {
+ margin: 0;
+ padding: 0;
+ box-sizing: border-box;
+ font-family: "Microsoft YaHei", sans-serif; /* 缁熶竴寰蒋闆呴粦 */
+ }
+ html, body {
+ width: 100%;
+ height: 100%;
+ overflow: hidden; /* 绂佹婊氬姩锛岀‘淇濆叏灞忔樉绀� */
+ }
+ .top-bar {
+ width: auto;
+ height: 18vh;
+ background-color: #6B21A8;
+ color: white;
+ display: flex;
+ align-items: center;
+ padding: 0 0 0 0vw;
+ /* 纭繚澶撮儴鍦ㄥ乏涓婅锛屼笉闅忔粴鍔ㄧЩ鍔� */
+ position: relative;
+ top: 0;
+ left: 0;
+ }
+ .brand {
+ font-size: 5.5vh; /* 鍝佺墝鍚嶅瓧浣撳ぇ灏忔寜灞忓箷姣斾緥锛岃创杩戝師鍥� */
+ font-weight: bold;
+ padding: 0 0 0 0vw;
+ margin-bottom: 10vh;
+ margin-left: 2vh;
+ width: 12vw; /* 鍥哄畾鍝佺墝鍚嶅尯鍩熷搴︼紝閬垮厤鎸ゅ帇涓绘爣棰� */
+ }
+ .main-title {
+ font-size: 5vh; /* 涓绘爣棰樺瓧浣撳ぇ灏忔寜灞忓箷姣斾緥锛屼笌鍘熷浘鍖归厤 */
+ font-weight: bold;
+ text-align: center;
+ flex: 1; /* 鍗犳嵁鍓╀綑绌洪棿锛岀‘淇濆眳涓� */
+ white-space: nowrap; /* 绂佹鎹㈣锛屼繚鎸佷竴琛屾樉绀� */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ margin-left: -21vh;
+ }
+ .content {
+ width: 100%;
+ height: 90vh; /* 鍐呭鍖哄崰鍓╀綑楂樺害 */
+ display: flex;
+ padding: 2vh 2vw;
+ }
+ .left-section {
+ flex: 3; /* 宸︿晶鍗�3浠斤紙浜斿垎涔嬩笁锛� */
+ display: flex;
+ flex-direction: column;
+ padding: 0 1vw;
+ }
+ .right-section {
+ flex: 2; /* 鍙充晶鍗�2浠斤紙浜斿垎涔嬩簩锛� */
+ display: flex;
+ flex-direction: column;
+ padding: 0 1vw;
+ }
+ .section-title {
+ height: 6vh; /* 鏍囬楂樺害缁熶竴锛屼笌鍘熷浘瀵归綈 */
+ line-height: 6vh; /* 鍨傜洿灞呬腑 */
+ font-size: 4.5vh; /* 鏍囬瀛椾綋澶у皬鎸夋瘮渚� */
+ font-weight: bold;
+ text-align: center;
+ margin-bottom: 5vh;
+ }
+ /* 浜х嚎鍏ㄦ櫙鍥炬爣棰橈紙鏀惧湪鍥剧墖涓婃柟锛� */
+ .production-title {
+ margin-top: 5%; /* 鎸夐渶姹備繚鐣欓《閮ㄩ棿璺� */
+ font-size: 4.5vh;
+ font-weight: bold;
+ text-align: center; /* 鏍囬灞呬腑 */
+ margin-bottom: 2vh; /* 鏍囬涓庡浘鐗囦箣闂寸殑闂磋窛 */
+ position: relative;
+ }
+ /* 浜х嚎鍥剧墖锛堜綅浜庢爣棰樹笅鏂癸級 */
+ .production-image {
+ width: 103%;
+ height: calc(100% - 8vh);
+ object-fit: contain;
+ margin-top: -10%;
+ }
+ .intro-text {
+ height: calc(100% - 8vh);
+ font-size: 2.5vh;
+ line-height: 2.5;
+ overflow: auto;
+ /* 鏍稿績璋冩暣锛氭枃瀛楄寖鍥村悜鍙冲亸绉� */
+ margin-left: 15%; /* 鐩稿浜庣埗瀹瑰櫒鍙充晶鍖哄煙锛屽乏渚х暀15%绌虹櫧锛屾枃瀛楁暣浣撳彸绉� */
+ max-width: 80%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
+ }
+ .section-title2 {
+ height: 6vh; /* 鏍囬楂樺害缁熶竴锛屼笌鍘熷浘瀵归綈 */
+ line-height: 6vh; /* 鍨傜洿灞呬腑 */
+ font-size: 4.5vh; /* 鏍囬瀛椾綋澶у皬鎸夋瘮渚� */
+ font-weight: bold;
+ text-align: center;
+ margin-bottom: 9vh;
+ margin-left: 15%; /* 鐩稿浜庣埗瀹瑰櫒鍙充晶鍖哄煙锛屽乏渚х暀15%绌虹櫧锛屾枃瀛楁暣浣撳彸绉� */
+ max-width: 85%; /* 闄愬埗鏈�澶у搴︼紝閬垮厤鏂囧瓧婧㈠嚭鍙充晶 */
+ }
+ </style>
+</head>
+<body>
+ <div class="top-bar">
+ <div class="brand">Casarte</div>
+ <div class="main-title">娴峰皵鏅鸿兘鍘ㄧ數鐑熷彴宸ュ巶鍏ㄨ嚜鍔ㄧ幓鐠冩繁鍔犲伐鐢熶骇绾夸簩鏈�</div>
+ </div>
+ <div class="content">
+ <div class="left-section">
+ <div class="section-title"><P class="production-title" style="margin-top: 3%;">浜х嚎鍏ㄦ櫙鍥�</P></div>
+ <img src="../img/浜屾湡鍓睆璁惧鍥�.png" alt="浜х嚎鍏ㄦ櫙鍥�" class="production-image">
+ </div>
+ <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>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/gmms/WebContent/bigScreen/allGlassScreenVice.jsp b/gmms/WebContent/bigScreen/allGlassScreenVice2.jsp
similarity index 100%
rename from gmms/WebContent/bigScreen/allGlassScreenVice.jsp
rename to gmms/WebContent/bigScreen/allGlassScreenVice2.jsp
--
Gitblit v1.8.0