From 3b65a5dc04be7cdac460c84ebaa38bf009405128 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 八月 2025 09:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects

---
 河北望美项目/MES_11/src/main/webapp/WEB-INF/views/identifymachine/celiangmanage2.jsp |   35 ++++++++++++++++++++---------------
 1 files changed, 20 insertions(+), 15 deletions(-)

diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/identifymachine/celiangmanage2.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/identifymachine/celiangmanage2.jsp"
index 0f5f560..db9d043 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/identifymachine/celiangmanage2.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/identifymachine/celiangmanage2.jsp"
@@ -17,7 +17,7 @@
 #example tbody {
       display:block;
       height:595px;
-      overflow-y:scroll;
+      
 }
 #example thead,#example tbody tr {
      display:table;
@@ -25,7 +25,6 @@
      table-layout:fixed;
 }
 #example thead {
-     width: calc(100% - 1em);
 }
 #example thead th {
      background:#ccc;
@@ -370,7 +369,7 @@
 						</div>
 						<form method="post" class="form-horizontal"
 					action="${ctx}/identifymachine/modify/${groups}">
-					<div class="modal-body">
+					<div class="modal-body"  style="height: 600px;overflow: auto;">
 						<div class="control-group">
 							<table id="example" class="table table-striped table-hover" style='font-size:20px;text-align: center;'>
 								
@@ -440,8 +439,8 @@
 			
 			<div class="modal fade" id="delete-fix-info" tabindex="-1" role="dialog"
 				aria-labelledby="myModalLabel" aria-hidden="true">
-				<div class="modal-dialog">
-					<div class="modal-content">
+				<div class="modal-dialog" style="width:1200px;">
+					<div class="modal-content" style="width:1200px;">
 						<div class="modal-header">
 							<button type="button" class="close" data-dismiss="modal"
 								aria-hidden="true" data-backdrop="static">&times;</button>
@@ -449,26 +448,32 @@
 								style="font-weight: bolder;">鐮存崯閫夋嫨</h3>
 						</div>
 						<form method="post" class="form-horizontal" action="${ctx}/identifymachine/modifyy/${groups}">
-					<div class="modal-body">
+					<div class="modal-body" style="height: 600px;overflow: auto;">
 						<div class="control-group">
-							<table class="table table-striped table-hover" style='font-size:20px;'>
+							<table class="table table-striped table-hover" style='font-size:20px;text-align: center;'>
 								<tbody>
 								<thead>
 									<tr>
-										<th>浜哄伐閫夋嫨</th>
-										<th>#</th>
-										<th>楂�</th>
-										<th>瀹�</th>
+										<th style='text-align: center;'>閫夋嫨</th>
+										<th style='text-align: center;'>ID</th>
+										<th style='text-align: center;'>楂�</th>
+										<th style='text-align: center;'>瀹�</th>
+										<th style='text-align: center;'>娴佺▼鍗�</th>
+										<th style='text-align: center;'>鐗堝浘鍙�</th>
+										<th style='text-align: center;'>宸ョ▼鍙�</th>
 										
 									</tr>
 								</thead>
 								<c:forEach items="${glassLists}" var="glass" varStatus="status">
 									<tr>
-										<td><input type="radio" name="glassid2"
+										<td><input type="radio" name="glassid"
 											value="${glass.id}" /></td>
-										<td>${glass.id}</td>
-										<td>${glass.height}</td>
-										<td>${glass.width}</td>
+										<td >${glass.id}</td>
+										<td >${glass.height}</td>
+										<td >${glass.width}</td>
+										<td>${glass.processcardId}</td>
+										<td>${glass.patternTask.rank}</td>
+										<td>${glass.engineeringId}</td>
 									</tr>
 								</c:forEach>
 							</table>

--
Gitblit v1.8.0