修改任务界面跟测量界面

廖井涛

2025-06-06 32e8ae44d542d6f6d2dc82896f5ffe58ce695889

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

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

   function delecttask(id) {
   function delecttask(groups,id) {
      //disableAutoRefresh();
      $.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;
            window.location.href = "${ctx}/cutmanage/gettask/" + groups;
         }
      });
      alert(id);
      alert(groups);
   }

   function delecttask1(id) {
   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;
            window.location.href = "${ctx}/cutmanage/gettask/" + groups;
         }
      });
   }
@@ -78,6 +78,17 @@
         }
      });
   }
	
   function collectingTasks() {
      //disableAutoRefresh();
      var groups = document.getElementsByName('groups')[0].value;
      var state = document.getElementsByName('state')[0].value;
      if(state=="0"){
         window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
      }
		
   }
	
   function updatedengluname() {
      $("#updatedengluname").modal('show');
      //disableAutoRefresh();
@@ -125,7 +136,7 @@
   }
   var gongyi = "磨边";
   var group = ${groups};
   var rTime = 20000;
   var rTime = 5000;
</script>
<style>
.box table tr th, .box table tr td {
@@ -187,6 +198,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 +222,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 +234,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 +247,7 @@
                     <th>完成数量</th>
                     <th>总数量</th>
                     <th>完成面积(mm)</th>
                     <th>状态</th>
                     <th>操作</th>

                  </tr>
@@ -240,7 +257,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 +268,7 @@
                     <th>厚度</th>
                     <th>颜色</th>
                     <th>状态</th>
                     <th>工程</th>
                     <th>操作</th>

                  </tr>
@@ -262,7 +280,7 @@
      </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 -->
@@ -275,16 +293,32 @@
      }

      //页面定时刷新 æš‚停 æ¢å¤
      var interval = setInterval('refreshStatus()', rTime);//定时刷新
      /* var interval = setInterval('refreshStatus()', rTime);//定时刷新
      function refresh() {
         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'];
         var isInterval_=0;
         for(var i=0;i<str.length;i++){	
            var isdisplay=document.getElementById(str[i]).style.display;
            if(isdisplay=='block'){
               //不刷新		
               isInterval_=1;	
               break;
            }
         }
         if(isInterval_==0){
            //刷新
            refreshStatus();
         }
      }

      $(function() {
      /* $(function() {

         $('#baogong_info').on('hide.bs.modal', function() {
            refresh();
@@ -301,7 +335,7 @@
         $('#div_banzu').on('show.bs.modal', function() {
            stopRefresh();
         })
      });
      }); */

      var st = ${able};
      if (st == 0) {