Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects

严智鑫

2025-08-18 3b65a5dc04be7cdac460c84ebaa38bf009405128

 ºÓ±±ÍûÃÀÏîÄ¿/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;
@@ -360,8 +359,8 @@
         </fieldset>
         <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
            aria-labelledby="myModalLabel" aria-hidden="true">
            <div class="modal-dialog">
               <div class="modal-content"  style="width:700px">
            <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>
@@ -370,28 +369,32 @@
                  </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;'>
                     <table id="example" class="table table-striped table-hover" style='font-size:20px;text-align: center;'>
                        
                        <thead>
                           <tr>
                              <th style="width:10%">选择</th>
                              <th style="width:20%">ID</th>
                              <th style="width:20%">高</th>
                              <th style="width:20%">宽</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>
                        <tbody>
                        <c:forEach items="${glassLists}" var="glass" varStatus="status">
                           <tr>
                              <td style="width:10%"><input type="radio" name="glassid"
                              <td><input type="radio" name="glassid"
                                 value="${glass.id}" /></td>
                              <td style="width:20%">${glass.id}</td>
                              <td style="width:20%">${glass.height}</td>
                              <td style="width:20%">${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>
                        </tbody>
@@ -436,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>
@@ -445,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.processcardId}</td>
                              <td>${glass.patternTask.rank}</td>
                              <td>${glass.engineeringId}</td>
                           </tr>
                        </c:forEach>
                     </table>