From b7e71faaec8e83386714b405f74d02b2f52c7755 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 26 五月 2025 10:02:20 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II
---
gmms/WebContent/bigScreen/peifangchaxun.jsp | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/gmms/WebContent/bigScreen/peifangchaxun.jsp b/gmms/WebContent/bigScreen/peifangchaxun.jsp
index 993a6e5..e00b190 100644
--- a/gmms/WebContent/bigScreen/peifangchaxun.jsp
+++ b/gmms/WebContent/bigScreen/peifangchaxun.jsp
@@ -55,31 +55,35 @@
</section>
<div id = "allstatu" ></div>
- <div id = "info" ></div>
+ <div id = "info" style="height:3%;" >
+ <input style="display:none" type="text" name="groups" value="${groups}" />
+ </div>
<!-- Main content -->
- <input style="display:none" type="text" name="groups" value="${groups}" />
- <section class="content container-fluid" style="padding: 0px;">
- <div>
- </div>
- <div class="box" style="height: 600px; overflow: auto;margin-top: 10px;">
+ <section class="content container-fluid" style="padding: 0px;">
+ <div class="box" style="height:90%; overflow: auto;margin-top: 10px;">
<table class="table table-striped table-hover"
style="overflow-x: auto;font-size: 12px;">
- <thead>
+ <thead style="font-size: 22px;font-weight: bold;">
<tr>
<th>璁惧ID</th>
<th>璁惧鍚嶇О</th>
<th>璁惧IP</th>
<th>褰撳墠閰嶆柟</th>
+ <th>褰撳墠閰嶆柟鏇存柊鏃堕棿</th>
+ <th>MES鍙戦�侀厤鏂�</th>
+ <th>MES鍙戦�侀厤鏂规洿鏂版椂闂�</th>
</tr>
</thead>
<tbody>
<tr v-for="(item, index) in shuzu" :key="index" style="height: 51px;">
<td>{{item['0_id']}}</td>
- <td>{{item['1_machine_name']}}</td>
+ <td style="font-size: 18px;font-weight: bold;">{{item['1_machine_name']}}</td>
<td>{{item['2_ip_address']}}</td>
<td style="font-weight: bold; font-size: 18px">{{item['3_content_value']}}</td>
-
+ <td style="font-size: 18px">{{item['4_finsh_time']}}</td>
+ <td style="font-weight: bold; font-size: 18px">{{item['5_content_value2']}}</td>
+ <td style="font-size: 18px">{{item['6_finsh_time2']}}</td>
</td>
</tr>
</tbody>
--
Gitblit v1.8.0