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/cutmanage/gotasks.jsp

@@ -10,40 +10,97 @@
<script type="text/javascript">
   //停止页面自动刷新

   function delecttask(id) {
      //disableAutoRefresh();
   var groups=0;
   var id=0;
   var state=0;
   //结束任务弹窗
   function delecttask(groups1,id1) {
      if(typeof stopRefresh === "function"){
         stopRefresh();
      }
      $("#add-info1").modal('show');
      groups=groups1;
      id=id1;
      state=1
		
   }
   //中断任务弹窗
   function delecttask1(groups1,id1) {
      if(typeof stopRefresh === "function"){
         stopRefresh();
      }
      $("#add-info1").modal('show');
      groups=groups1;
      id=id1;
      state=2
		
   }
   //结束中断任务
   function delecttask3() {
      if(state==1){
      $.ajax({
         async : false,

         type : "GET",

         url : "${ctx}/cutmanage/delecttask/" + id,
            url : "${ctx}/cutmanage/delecttask/" + id +"/" +groups,

         dataType : "text",

         success : function(data) {
            window.location.href = "${ctx}/cutmanage/gettask/" + id;
         }
      });
      alert(id);
               alert(groups+"号线"+data);
               if(data=="结束成功"){
                  window.location.href = "${ctx}/cutmanage/gettask/" + groups;
   }

   function delecttask1(id) {
            }
         }); 
      }else if(state==2){
         $.ajax({
            async : false,

            type : "GET",

            url : "${ctx}/cutmanage/delecttask1/" + id+"/" +groups,

            dataType : "text",

            success : function(data) {
               alert(groups+"号线"+data);
               if(data=="中断成功"){
                  window.location.href = "${ctx}/cutmanage/gettask/" + groups;
               }
					
            }
         });
      }
		
   }
   //弹窗取消
   function delecttask4() {
      window.location.href = "${ctx}/cutmanage/gettask/" + groups;
   }

   /* function delecttask1(groups,id) {
      //disableAutoRefresh();disableAutoRefresh();
      $.ajax({
         async : false,

         type : "GET",

         url : "${ctx}/cutmanage/delecttask1/" + id,
         url : "${ctx}/cutmanage/delecttask1/" + id+"/" +groups,

         dataType : "text",

         success : function(data) {
            window.location.href = "${ctx}/cutmanage/gettask/" + id;
            alert(groups+"号线"+data);
            if(data=="中断成功"){
               window.location.href = "${ctx}/cutmanage/gettask/" + groups;
            }
				
         }
      });
   }
   } */

   function updatetask(id) {
      //disableAutoRefresh();
@@ -78,6 +135,23 @@
         }
      });
   }
	
   function collectingTasks() {
      if(typeof stopRefresh === "function"){
         stopRefresh();
      }
		
      var groups = document.getElementsByName('groups')[0].value;
      var state = document.getElementsByName('state')[0].value;
      var fileName = document.getElementById("fileName").innerHTML;
      if(state=="0"){
         window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
      }
      if(state=="1"){
         alert("当前已存在两个任务")
      }
   }
	
   function updatedengluname() {
      $("#updatedengluname").modal('show');
      //disableAutoRefresh();
@@ -187,6 +261,9 @@
            <button id="btnOffWork" type='button' class='btn btn-primary ' onclick='offWork()'>切割-产量</button>
            &nbsp; 
            &nbsp;
            <button id="btnOffWork" type='button' class='btn btn-primary ' onclick='collectingTasks()'>领取任务</button>
            &nbsp; 
            &nbsp;
            <small>当前上片工位模式:</small> &nbsp; 

            <button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >单工位</button>
@@ -208,6 +285,8 @@
      <!-- Main content -->
      <input style="display: none" type="text" name="groups"
         value="${groups}" />
         <input style="display: none" type="text" name="state"
         value="${state}" />
      <section class="content container-fluid">
         <div></div>
         <div>
@@ -218,7 +297,7 @@

         </div>
         <div class="box"
            style="height: 120px; overflow: auto; margin-top: 10px;">
            style="height: 172px; overflow: auto; margin-top: 10px;">
            <table class="table table-striped table-hover"
               style="overflow-x: auto">
               <thead>
@@ -231,6 +310,7 @@
                     <th>完成数量</th>
                     <th>总数量</th>
                     <th>完成面积(mm)</th>
                     <th>状态</th>
                     <th>操作</th>

                  </tr>
@@ -240,7 +320,7 @@
            </table>
         </div>
         <div class="box"
            style="height: 600px; overflow: auto; margin-top: 10px;">
            style="height: 500px; overflow: auto; margin-top: 10px;">
            <table class="table table-striped table-hover2"
               style="overflow-x: auto">
               <thead>
@@ -251,6 +331,7 @@
                     <th>厚度</th>
                     <th>颜色</th>
                     <th>状态</th>
                     <th>工程</th>
                     <th>操作</th>

                  </tr>
@@ -259,10 +340,41 @@
               </tbody>
            </table>
         </div>
			
			
         <div class="modal fade" id="add-info1" tabindex="-1" role="dialog"
         aria-labelledby="myModalLabel" aria-hidden="true">
         <form class="form-horizontal" role="form">
            <div class="modal-dialog">
               <div class="modal-content">
                  <div class="modal-header">
                     <button type="button" class="close" onclick="delecttask4()" data-dismiss="modal"
                        aria-hidden="true">&times;</button>
                     <h3 class="modal-title" id="DEL_AlertTitle">操作提示：</h3>
                  </div>
                  <div class="modal-body" style="text-align: left;">
                     <h3 id="DEL_MsgShow">
                        æ˜¯å¦ç¡®å®šæ‰§è¡Œ <span id="DEL_Id" style="sixe: 25px; font-weight: bold"></span>
                        <span style="sixe: 20px; color: red; font-weight: bold">结束/中断任务
                        </span> æ“ä½œï¼Ÿ
                     </h3>
                  </div>
                  <div class="modal-footer">

                     <button type="button" onclick="delecttask4()" class="btn btn-default btn-lg"
                           data-dismiss="modal">否</button>
                        <button type="button" onclick="delecttask3()" class="btn btn-primary btn-lg" id="addbtnsubmit">是</button>
                  </div>
               </div>
            </div>
         </form>
      </div>
			
		
      </section>

      <%@ include file="/WEB-INF/views/mes/view/modal_banzu.jsp"%>
      <%-- <%@ include file="/WEB-INF/views/mes/view/modal_tijiaobaogong.jsp"%> --%>
      <%@ include file="/WEB-INF/views/mes/view/modal_tijiaobaogong.jsp"%>
      <%@ include file="/WEB-INF/views/mes/view/modal_tishi.jsp"%>
      <%@ include file="/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp"%>
      <!-- /.content -->
@@ -280,9 +392,12 @@
         interval = setInterval('refreshStatus()', rTime);//刷新恢复
      }

       */
      function stopRefresh() {
         clearInterval(interval);//停止刷新
      } */
         } 
		 
		 
      var interval = setInterval('isStop()', rTime);//定时刷新
      function isStop(){  //2024-1-10  yzx ä¿®æ”¹  åŽŸå› ï¼šåŽŸåˆ·æ–°é¡µé¢æœ‰é—®é¢˜
         var str=['baogong_info','div_banzu'];