From 3a975df5b368bc68ee7a81d34920b209f2ff607b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 26 五月 2025 16:12:08 +0800
Subject: [PATCH] 提交
---
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp | 68 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 17 deletions(-)
diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp"
index e470076..a721efe 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/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>
+ <button id="btnOffWork" type='button' class='btn btn-primary ' onclick='collectingTasks()'>棰嗗彇浠诲姟</button>
+
+
<small>褰撳墠涓婄墖宸ヤ綅妯″紡:</small>
<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>
@@ -261,10 +279,10 @@
</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_banzu.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"%>
+ <%@ include file="/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp"%> --%>
<!-- /.content -->
</div>
<%@ include file="/WEB-INF/views/mes/view/modal_js_gongwei_mode.jsp" %>
@@ -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) {
--
Gitblit v1.8.0