½­ËÕ𩾧ÏîÄ¿/Haojing/src/main/webapp/WEB-INF/views/configuration/minche.jsp
@@ -36,28 +36,65 @@
#Table_Minche thead tr {
   background-color: #00BFFF;
   font-weight:800;
   font-weight: 800;
}
#Table_Minche thead td{
   border:1px solid #00BFFF;
#Table_Minche thead td {
   border: 1px solid #00BFFF;
   padding: 5px 10px 5px 10px;
}
#Table_Minche td {
   border: 1px solid #f2f2f2;
   height: 20px;
   line-height: 20px;
   text-align:center;
   text-align: center;
   padding: 2px 10px 2px 10px;
}
.two thead tr {
   background-color: #f2f2f2;
}
.two {
   width: 100%;
   border-collapse: collapse;
   text-align:center;
}
.two th {
   border: 1px solid #f2f2f2;
   height: 20px;
   line-height: 20px;
   padding: 9px 15px 9px 15px;
   text-align:center;
}
.two td {
   border: 1px solid #f2f2f2;
   height: 20px;
   line-height: 20px;
   padding: 9px 15px 9px 15px;
}
</style>
<script type="text/javascript" src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
<script type="text/javascript"
   src="${ctx}/static/jquery/jquery-3.1.0.min.js"></script>
<script>
   setInterval(function(){
    window.location.reload();
     },3000);
   //启动定时器,func是参数,所以不能使用括号
   var interval = setInterval(func,3000);  //启动,func不能使用括号
   function func(){
       window.location.reload();
     }
   function start(){
      //重新启动
      interval = setInterval(func, 3000);
     }
   function modifyraw(){
       disableAutoRefresh()
       $("#add-fix-info").modal('show');
      // åœæ­¢å®šæ—¶å™¨
      clearInterval(interval);
       $("#add-fix-info").modal('show');
   }
   function checkAll() {
      var checkedAll=document.getElementById("checkall");
@@ -92,34 +129,75 @@
      }
   }
   </script>
</head>
<body>
   <div class="content-wrapper" style="background-color: white;">
      <!-- å†…容 -->
      <section class="content container-fluid">
         <div>
            <table id="Table_Minche" style="width: 100%;min-width:1200px; border-collapse: collapse; border-spacing: 0;">
            <button class="btn" onclick="modifyraw()">仓储任务</button>
            <table id="Table_Minche"
               style="width: 100%; min-width: 1200px; border-collapse: collapse; border-spacing: 0;">
               <thead>
                  <tr>
                     <td>ID</td>
                     <td>机器名称</td>
                     <td>任务ID</td>
                     <td>任务ID</td>
                     <td>铁架号</td>
                     <td>派尔状态</td>
                     <td>MES状态</td>
                     <td>工作状态</td>
                     <td>MES状态</td>
                     <td>工作状态</td>
                     <td>机器状态</td>
                     <td>等待数量</td>
                     <td>报警信息</td>
                     <td style="width:200px;">操作</td>
                     <td style="width: 200px;">操作</td>
                  </tr>
               </thead>
               <tbody>
                  ${MachineOutTaskhtmls}
               <tbody>${MachineOutTaskhtmls}
               </tbody>
            </table>
         </div>
         <div class="modal fade" id="add-fix-info" tabindex="-1" role="dialog"
            aria-labelledby="myModalLabel" aria-hidden="true">
            <div class="modal-dialog" style="width: 100%; height: 100%;">
               <div class="modal-content"
                  style="width: 1000px; margin: auto;">
                  <div class="modal-header">
                     <button type="button" class="close" onclick="start()" data-dismiss="modal"
                        aria-hidden="true" data-backdrop="static">&times;</button>
                     <h3 class="modal-title" id="myModalLabel" style="font-weight: bolder;">仓储待执行任务</h3>
                  </div>
                  <!--提交-->
                  <form class="form-horizontal" role="form" id="category_add" action="${ctx}/Config/addTask" method="post">
                     <div style="margin-top: 20px;">
                        <!-- ä»»åŠ¡æ˜¾ç¤º -->
                        <table class="two" id="addManualOperation">
                           <thead>
                              <tr>
                                 <th>任务ID</th>
                                 <th>料架号</th>
                                 <th>目的线路</th>
                                 <th>目标工位</th>
                                 <th>计划上片数量</th>
                                 <th>料架上玻璃数量</th>
                                 <th>类型</th>
                                 <!-- <th>操作</th> -->
                              </tr>
                           </thead>
                           <tbody>${outTasksTasks}
                           </tbody>
                        </table>
                     </div>
                  </form>
               </div>
            </div>
         </div>
      </section>
   </div>
</body>
</html>