From 8d5c70aef9cbacbcc412d73c4b730e21f94e6514 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 六月 2025 09:04:10 +0800
Subject: [PATCH] 1
---
src/main/webapp/views/realtimeWatch/console.html | 143 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 115 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/views/realtimeWatch/console.html b/src/main/webapp/views/realtimeWatch/console.html
index b97dcba..c67cea4 100644
--- a/src/main/webapp/views/realtimeWatch/console.html
+++ b/src/main/webapp/views/realtimeWatch/console.html
@@ -7,17 +7,14 @@
<link rel="stylesheet" href="../../static/wms/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../static/wms/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/wms/css/common.css" media="all">
-
-<!-- <script src="../../static/wcs/js/jquery/jquery-3.3.1.min.js"></script>-->
-<!-- <script src="../../static/wcs/js/layer/layer.js"></script>-->
<script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
<!--鍦板浘json-->
- <script src="../../static/wcs/js/console.map.js"></script>
- <script src="../../static/wcs/js/console.js"></script>
- <script src="../../static/wcs/js/common.js"></script>
+ <script src="../../static/wcs/js/console.map.js?v=1"></script>
+ <script src="../../static/wcs/js/console.js?v=1"></script>
+ <script src="../../static/wcs/js/common.js?v=1"></script>
</head>
<script type="text/html" id="errorTpl">
{{# if( d.error === false ){ }}
@@ -136,7 +133,7 @@
<span>鍫嗗灈鏈哄彿锛�</span>
</div>
<div class="form-item-input">
- <input type="text" name="crnNo" value="">
+ <input type="text" name="crnNo" value="" id="crnNo">
</div>
</div>
<!-- 宸ヤ綔鍙� -->
@@ -220,6 +217,14 @@
<input type="text" name="error" value="">
</div>
</div>
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <div class="form-item" style="display: flex;">
+ <div class="form-item-input">
+ <div>鍏ュ簱锛氬紑<input type="radio" name="pakIn" id="pakInY" value="1"> 鍏�<input type="radio" name="pakIn" id="pakInN" value="0"/></div>
+ <div>鍑哄簱锛氬紑<input type="radio" name="pakOut" id="pakOutY" value="1"> 鍏�<input type="radio" name="pakOut" id="pakOutN" value="0"/></div>
+ </div>
+ <div><a id="crnCommand" class="layui-btn">涓嬪彂鍛戒护</a></div>
+ </div>
</form>
</div>
<!-- 杈撻�佽澶囧脊绐� -->
@@ -236,7 +241,7 @@
<span>璁惧鍙凤細</span>
</div>
<div class="form-item-input">
- <input type="text" name="siteId" value="">
+ <input type="text" name="siteId" value="" id="devpSiteId">
</div>
</div>
<!-- 宸ヤ綔鍙� -->
@@ -245,7 +250,7 @@
<span>宸ヤ綔鍙凤細</span>
</div>
<div class="form-item-input">
- <input type="text" name="workNo" value="">
+ <input type="text" name="workNo" value="" id="devpWorkNo">
</div>
</div>
<!-- 宸ヤ綔鐘舵�� -->
@@ -317,7 +322,7 @@
<span>鐩爣绔欙細</span>
</div>
<div class="form-item-input">
- <input type="text" name="staNo" value="">
+ <input type="text" name="staNo" value="" id="devpStaNo">
</div>
</div>
<!-- 婧愬簱浣� -->
@@ -338,7 +343,10 @@
<input type="text" name="locNo" value="">
</div>
</div>
-
+ <!-- 鎿嶄綔鎸夐挳 -->
+ <div class="form-item">
+ <a id="devpCommand" class="layui-btn">涓嬪彂鍛戒护</a>
+ </div>
</form>
</div>
</div>
@@ -401,7 +409,8 @@
</script>
<script type="text/javascript">
// 寮圭獥绔欑偣淇℃伅
- $('.site').on('click', function () {
+ $("body").on('click', '.site', function (e) {
+ console.log(e)
var id = this.id.split("-")[1];
$("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
$("#crnWindow").attr("style", "display:none;");
@@ -431,7 +440,7 @@
});
// 鍫嗗灈鏈轰俊鎭�
- $('.machine').on('click', function () {
+ $("body").on('click', '.machine', function () {
var id = this.id.split("-")[1];
$("#crnWindow").attr('style', 'display:block;');
$("#siteWindow").attr("style", "display:none;");
@@ -447,19 +456,34 @@
},
method: 'post',
success: function (res) {
+ console.log(res)
for (var val in res.data) {
- var find = $("#crnWindow").find(":input[name='" + val + "']");
- if (find[0].type === 'text') {
- find.val(res.data[val]);
- } else if (find[0].type === 'checkbox') {
- find.attr("checked", res.data[val] === 'Y');
+ if (val === "inEnable") {
+ if (res.data[val] === 'Y') {
+ $("#pakInY").prop("checked", true);
+ }else{
+ $("#pakInN").prop("checked", true);
+ }
+ }else if (val === "outEnable") {
+ if (res.data[val] === 'Y') {
+ $("#pakOutY").prop("checked", true);
+ }else{
+ $("#pakOutN").prop("checked", true);
+ }
+ }else {
+ var find = $("#crnWindow").find(":input[name='" + val + "']");
+ if (find[0].type === 'text') {
+ find.val(res.data[val]);
+ } else if (find[0].type === 'checkbox') {
+ find.attr("checked", res.data[val] === 'Y');
+ }
}
}
}
})
- })
+ });
// 寮圭獥鍏抽棴
$('button').on('click', function () {
$('#siteWindow').attr('style', 'display:none')
@@ -611,19 +635,25 @@
for (var i = 0; i < crns.length; i++) {
var crnEl = $("#crn-" + crns[i].crnId);
crnEl.attr("class", "machine " + crns[i].crnStatus);
- var unit = 20.6;//($('.item').eq(0).width() + 13) / 2;
if (crns[i].bay < 0) {
crns[i].bay = 1;
}
- // crnEl.animate({left: (crns[i].bay * unit) + 'px'}, 1000);
- // crns[i].bay = 1;
-
- var offSet = 390;
- // crns[i].bay = 41;
- if(crns[i].bay === 1){
- crnEl.animate({left: offSet + 'px'}, 1000);
+ if (crns[i].crnId === 1) {
+ let unit = 111
+ let offSet = 600;
+ if(crns[i].bay === 1){
+ crnEl.animate({left: offSet + 'px'}, 1000);
+ } else {
+ crnEl.animate({left: (offSet + unit*(crns[i].bay-1)) + 'px'}, 1000);
+ }
} else {
- crnEl.animate({left: (offSet - unit + (crns[i].bay * unit)) + 'px'}, 1000);
+ let unit = 83
+ let offSet = 600;
+ if(crns[i].bay === 1){
+ crnEl.animate({left: offSet + 'px'}, 1000);
+ } else {
+ crnEl.animate({left: (offSet + unit*(crns[i].bay -1)) + 'px'}, 1000);
+ }
}
}
@@ -762,5 +792,62 @@
$("#site-" + id).animate({top: targetTop + 'px'}, 1000);
}
+ //涓嬪彂杈撻�佺嚎鍛戒护
+ $("#devpCommand").on("click", () => {
+ let siteId = $("#devpSiteId").val()//璁惧id
+ let wrkNo = $("#devpWorkNo").val()//宸ヤ綔鍙�
+ let staNo = $("#devpStaNo").val()//鐩爣绔�
+
+ $.ajax({
+ url: baseUrl+"/site/detl/update",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ devNo: siteId,
+ workNo: wrkNo,
+ staNo: staNo,
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg("涓嬪彂鎴愬姛",{icon: 1,});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+
+ //涓嬪彂鍫嗗灈鏈哄懡浠�
+ $("#crnCommand").on("click", () => {
+ let crnNo = $("#crnNo").val()//璁惧id
+ var pakIn = $('input[name="pakIn"]:checked').val();
+ var pakOut = $('input[name="pakOut"]:checked').val();
+
+ console.log(pakIn,pakOut)
+
+ $.ajax({
+ url: baseUrl + "/basCrnp/update/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ crnNo: crnNo,
+ inEnable: pakIn == 1 ? "Y" : "N",
+ outEnable: pakOut == 1 ? "Y" : "N"
+ },
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ layer.msg("涓嬪彂鎴愬姛",{icon: 1,});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ });
+ });
</script>
\ No newline at end of file
--
Gitblit v1.9.1