From 3b65a5dc04be7cdac460c84ebaa38bf009405128 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 八月 2025 09:23:27 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/MES_Projects
---
河北望美项目/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp | 183 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 157 insertions(+), 26 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..f1a12b0 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,40 +10,97 @@
<script type="text/javascript">
//鍋滄椤甸潰鑷姩鍒锋柊
- function delecttask(id) {
- //disableAutoRefresh();
- $.ajax({
- async : false,
+ 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",
+ type : "GET",
- url : "${ctx}/cutmanage/delecttask/" + id,
+ url : "${ctx}/cutmanage/delecttask/" + id +"/" +groups,
- dataType : "text",
+ dataType : "text",
- success : function(data) {
- window.location.href = "${ctx}/cutmanage/gettask/" + id;
- }
- });
- alert(id);
+ success : function(data) {
+ alert(groups+"鍙风嚎"+data);
+ if(data=="缁撴潫鎴愬姛"){
+ window.location.href = "${ctx}/cutmanage/gettask/" + groups;
+ }
+
+ }
+ });
+ }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(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;
+ 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();
@@ -125,7 +199,7 @@
}
var gongyi = "纾ㄨ竟";
var group = ${groups};
- var rTime = 20000;
+ var rTime = 5000;
</script>
<style>
.box table tr th, .box table tr td {
@@ -187,6 +261,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 +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">×</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 -->
@@ -275,16 +387,35 @@
}
//椤甸潰瀹氭椂鍒锋柊 鏆傚仠 鎭㈠
- var interval = setInterval('refreshStatus()', rTime);//瀹氭椂鍒锋柊
+ /* var interval = setInterval('refreshStatus()', rTime);//瀹氭椂鍒锋柊
function refresh() {
interval = setInterval('refreshStatus()', rTime);//鍒锋柊鎭㈠
}
- function stopRefresh() {
- clearInterval(interval);//鍋滄鍒锋柊
+ */
+ 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 +432,7 @@
$('#div_banzu').on('show.bs.modal', function() {
stopRefresh();
})
- });
+ }); */
var st = ${able};
if (st == 0) {
--
Gitblit v1.8.0