提交

廖井涛

2025-05-26 3a975df5b368bc68ee7a81d34920b209f2ff607b

 ºÓ±±ÍûÃÀÏîÄ¿/MES_11/src/main/webapp/WEB-INF/views/shelfmanager/shelftask.jsp

@@ -40,7 +40,6 @@
        clearInterval(interval);
    }
    
    
    function delAll(type){
      var checkboxs=document.getElementsByName('id');
         for(var i=0;i<checkboxs.length;i++){
@@ -57,7 +56,8 @@
                data:{
                   "taskid":taskid,
                   "type":type
                },success:function(data){ 
               },
               success : function(data) {
                   window.location.href="${ctx}/shelfmanager/shelftask";
               }
            }); 
@@ -93,9 +93,12 @@
               ${status}
            </div>
            <!-- /.box-header -->
            <button type="button" onclick="delAll('重新开始')" class="btn btn-primary ">重新开始</button>
            <button type="button" onclick="delAll('完成')" class="btn btn-primary ">任务完成</button>
            <button type="button" onclick="delAll('删除')" class="btn btn-primary ">删除任务</button>
            <button type="button" onclick="delAll('重新开始')"
               class="btn btn-primary ">重新开始</button>
            <button type="button" onclick="delAll('完成')"
               class="btn btn-primary ">任务完成</button>
            <button type="button" onclick="delAll('删除')"
               class="btn btn-primary ">删除任务</button>
            <div class="box-body" style="height:300px;overflow-y:auto;">
               <table class="table table-striped table-hover"
               style="font-size: 18px;" id="example2">
@@ -111,23 +114,25 @@
                     <th>创建时间</th>
                  </tr>
               </thead>
               <tbody>
                  ${shelftasks}
                  <tbody>${shelftasks}
               </tbody>
            </table>
          </div>
          </div>
            </section>
         </div>
         <div class="callout callout-warning" style="background-color:#D5EAFF !important; border-left:0px">
         <div style='text-align: center;color:red;font-size:30px;border-left:0;'>${lackGlassHtml}</div>
      <div class="callout callout-warning"
         style="background-color: #D5EAFF !important; border-left: 0px">
         <div
            style='text-align: center; color: red; font-size: 30px; border-left: 0;'>${lackGlassHtml}</div>
            <h4 style="color: black;">故障操作</h4>
            <p style="color: black;">当小车发生故障时，导致我们的任务没有完成就失败了。小车回零点，这样我们的任务就会一直堵在刚才的那个任务，完成与否我们都不清楚，需要去手动解决，任务完成的话，点击任务完成按钮，没有完成点击重新开始按钮</p>
            <br>
            <div style='text-align: center;'>
               <span style='font-size: 30px;color: black;'>当前任务：${workingtask.description}</span><br>
               
               <br> <%-- <a class="btn btn-large btn-success"
            <br>
            <%-- <a class="btn btn-large btn-success"
                  href="${ctx }/shelfmanager/finishshelftask"
                  style='text-decoration: none;'>任务完成</a>&nbsp;&nbsp; --%>
               <%-- <a class="btn btn-large btn-success"