From 2c99685a60ecc2da91364642b45a636d1af13b1f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 07 八月 2020 16:53:31 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 364 insertions(+), 55 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 930628f..7a7e438 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -14,7 +14,23 @@
<script type="text/javascript" src="../static/js/common.js"></script>
<script type="text/javascript" src="../static/js/layer/layer.js"></script>
<style>
-
+ /* layer 娣辫摑鑹叉寜閽慨鏀� */
+ /*.layui-layer-lan .layui-layer-btn {*/
+ /*border-top: none;*/
+ /*}*/
+ .layui-layer-lan .layui-layer-btn a {
+ background: #4476A7;
+ border-color: #4476A7;
+ color: #fff;
+ }
+ .layui-layer-lan .layui-layer-btn .layui-layer-btn1 {
+ background: #fff;
+ color: #333;
+ border-color: #E9E7E7;
+ }
+ .layui-layer-lan .layui-layer-btn .layui-layer-btn1:hover {
+ background-color: #f7f7f7;
+ }
</style>
</head>
<body>
@@ -57,9 +73,6 @@
</div>
</div>
</div>
-
- <!--鍒嗗壊绾�-->
- <!--<hr class="header-hr">-->
</header>
<main>
@@ -190,7 +203,7 @@
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <div id="crn1" class="machine"></div>
+ <div id="crn-2" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
@@ -329,7 +342,7 @@
<!-- 鍫嗗灈鏈� -->
<div class="crn">
<hr class="pathway">
- <div id="crn2" class="machine"></div>
+ <div id="crn-1" class="machine"></div>
</div>
<!-- 璐ф灦 -->
<div class="stock-group">
@@ -400,17 +413,224 @@
</div>
</div>
</main>
+
+<!-- 寮圭獥 -->
+<!-- 杈撻�佽澶囧脊绐� -->
+<div id="siteWindow" style="display: none">
+ <form>
+ <!-- 绗竴琛� -->
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>璁惧鍙�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="devpNo" value="" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>宸ヤ綔鍙�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workNo" value="" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label">
+ <span>宸ヤ綔鐘舵��</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+
+ <!-- 绗簩琛� -->
+ <div class="form-item" style="width: 20%">
+ <div class="form-item-label">
+ <span>鑷姩</span>
+ </div>
+ <div class="form-item-input">
+ <input type="checkbox" name="autoing" disabled="disabled" style="width: 1rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 20%">
+ <div class="form-item-label">
+ <span>鏈夌墿</span>
+ </div>
+ <div class="form-item-input">
+ <input type="checkbox" name="loading" disabled="disabled" style="width: 1rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 20%">
+ <div class="form-item-label">
+ <span>鑳藉叆</span>
+ </div>
+ <div class="form-item-input">
+ <input type="checkbox" name="canining" disabled="disabled" style="width: 1rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 20%">
+ <div class="form-item-label">
+ <span>鑳藉嚭</span>
+ </div>
+ <div class="form-item-input">
+ <input type="checkbox" name="canouting" disabled="disabled" style="width: 1rem">
+ </div>
+ </div>
+
+ <!-- 绗笁琛� -->
+ <div class="form-item" style="width: 40%">
+ <div class="form-item-label">
+ <span>鍑哄叆绫诲瀷</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="ioType" value="" disabled="disabled" style="width: 8rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>婧愮珯</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStaNo" value="" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>鐩爣绔�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="staNo" value="" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+
+ <!-- 绗洓琛� -->
+ <div class="form-item" style="width: 40%">
+ <div class="form-item-label">
+ <span>婧愬簱浣�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 8rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 40%">
+ <div class="form-item-label">
+ <span>鐩爣搴撲綅</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="stock" value="" disabled="disabled" style="width: 8rem">
+ </div>
+ </div>
+ </form>
+</div>
+
+<!-- 鍫嗗灈鏈哄脊绐� -->
+<div id="crnWindow" style="display: none">
+ <form>
+ <!-- 绗竴琛� -->
+ <div class="form-item" style="width: 23%">
+ <div class="form-item-label" style="width: 87px">
+ <span>鍫嗗灈鏈哄彿</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="crnNo" value="" disabled="disabled" style="width: 3rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>宸ヤ綔鍙�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workNo" value="" disabled="disabled" style="width: 5rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 23%">
+ <div class="form-item-label">
+ <span>婧愮珯</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStaNo" value="" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 25%">
+ <div class="form-item-label">
+ <span>鐩爣绔�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="staNo" value="" disabled="disabled" style="width: 4rem">
+ </div>
+ </div>
+
+ <!-- 绗簩琛� -->
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label" style="width: 87px">
+ <span>宸ヤ綔鐘舵��</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="workStatus" value="" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label">
+ <span>鍑哄叆绫诲瀷</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="ioType" value="" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+
+ <!-- 绗笁琛� -->
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label" style="width: 87px">
+ <span>婧愬簱浣�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="sourceStock" value="" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 45%">
+ <div class="form-item-label">
+ <span>鐩爣搴撲綅</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="stock" value="" disabled="disabled" style="width: 10rem">
+ </div>
+ </div>
+
+ <!-- 绗洓琛� -->
+ <div class="form-item" style="width: 95%">
+ <div class="form-item-label">
+ <span>鍫嗗灈鏈虹姸鎬�</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="crnStatus" disabled="disabled" style="width: 25rem">
+ </div>
+ </div>
+ <div class="form-item" style="width: 95%">
+ <div class="form-item-label" style="width: 87px">
+ <span>寮傚父</span>
+ </div>
+ <div class="form-item-input">
+ <input type="text" name="error" disabled="disabled" style="width: 25rem">
+ </div>
+ </div>
+ </form>
+</div>
+
</body>
<script>
- var systemRunning = true;
var crn1Position = 0;
var crn2Position = 0;
// 鍒濆鍖�
getSitesInfo();
getCrnInfo();
+ getSystemRunningStatus();
+ getBarcodeInfo();
// 瀹炴椂璁块棶
setInterval(function () {
getCrnInfo();
+ getSystemRunningStatus();
+ getBarcodeInfo()
}, 500);
setInterval(function () {
getSitesInfo();
@@ -418,49 +638,77 @@
// 绯荤粺杩愯寮�鍏�
function systemSwitch() {
- if (systemRunning){
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1}, function(pass, idx){
+ if (parent.systemRunning){
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function(pass, idx){
layer.close(idx);
- if ("123"!==pass){
- alert("鍙ｄ护閿欒");
- return;
- }
- var index = null;
- index = layer.load(1, {
- shade: [0.1,'#fff']
- });
- setTimeout(function () {
- if (systemRunning){
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- systemRunning = false;
- } else {
+ doSwitch(0, pass); // 鍋滄wcs绯荤粺
+ });
+ } else {
+ doSwitch(1); // 鍚姩wcs绯荤粺
+ }
+ }
+
+ // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝cs绯荤粺杩愯鐘舵��
+ function doSwitch(operatorType, password) {
+ // 鍔犺浇tips
+ var index = layer.load(1, {
+ shade: [0.1,'#fff']
+ });
+ $.ajax({
+ url: baseUrl+ "/console/system/switch",
+ headers: {'token': localStorage.getItem('token')},
+ // async: false,
+ data: {
+ operatorType: operatorType,
+ password: password
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.close(index);
+ if (res.code === 200){
+ if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
$('#system-run-desc').html("绯荤粺杩愯涓�...");
- systemRunning = true;
+ parent.systemRunning = true;
+ } else {
+ $('#system-icon').attr("class", "system-icon-close");
+ $('#system-run-desc').html("绯荤粺宸插仠姝�!");
+ parent.systemRunning = false;
}
- layer.close(index);
- }, 2000);
- });
-
- } else {
- var index = null;
- index = layer.load(1, {
- shade: [0.1,'#fff']
- });
- setTimeout(function () {
- if (systemRunning){
- $('#system-icon').attr("class", "system-icon-close");
- $('#system-run-desc').html("绯荤粺宸插仠姝�!");
- systemRunning = false;
- } else {
- $('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
- systemRunning = true;
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
}
- layer.close(index);
- }, 2000);
- }
+ }
+ });
+
+ }
+
+ // 鑾峰彇wcs绯荤粺杩愯鐘舵��
+ function getSystemRunningStatus() {
+ $.ajax({
+ url: baseUrl+ "/console/system/running/status",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ if (res.data.status) {
+ $('#system-icon').attr("class", "system-icon-open");
+ $('#system-run-desc').html("绯荤粺杩愯涓�...");
+ parent.systemRunning = true;
+ } else {
+ $('#system-icon').attr("class", "system-icon-close");
+ $('#system-run-desc').html("绯荤粺宸插仠姝�!");
+ parent.systemRunning = false;
+ }
+ } else if (res.code === 403){
+ window.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ });
}
// 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
@@ -476,7 +724,7 @@
$("#site-"+sites[i].siteId).attr("class", "site " + sites[i].siteStatus);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -497,7 +745,7 @@
crnAnimate(crns[i].crnId, crns[i].offset);
}
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -513,9 +761,12 @@
method: 'POST',
success: function (res) {
if (res.code === 200){
-
+ var barcodes = res.data;
+ for (var i = 0; i < barcodes.length; i++){
+ $("#code-decoder-data-"+barcodes[i].barcodeId).html(barcodes[i].codeValue);
+ }
} else if (res.code === 403){
- top.location.href = baseUrl+"/login";
+ window.location.href = baseUrl+"/login";
} else {
alert(res.msg);
}
@@ -527,11 +778,11 @@
function crnAnimate(id, leftVal) {
switch (id) {
case 1:
- $("#crn1").animate({left: leftVal+'px'}, 1000);
+ $("#crn-1").animate({left: leftVal+'px'}, 1000);
crn1Position = leftVal;
break;
case 2:
- $("#crn2").animate({left: leftVal+'px'}, 1000);
+ $("#crn-2").animate({left: leftVal+'px'}, 1000);
crn2Position = leftVal;
break;
default:
@@ -539,12 +790,70 @@
}
}
- // 璐ф灦鐐瑰嚮浜嬩欢
- $('.item').on('click', function () {
+ // 椤甸潰鐐瑰嚮浜嬩欢鐩戝惉 ---------------------------------------------------------
+
+ // 杈撻�佽澶囩偣鍑讳簨浠�
+ $('.site').on('click', function () {
+ var id = this.id.split("-")[1];
+ if (id === undefined) {
+ return;
+ }
layer.open({
+ title: id + " 绔欑偣淇℃伅璇︽儏",
+ closeBtn: 0,
+ skin: 'layui-layer-lan',
+ offset: '180px',
type: 1,
- shadeClose: true, //鐐瑰嚮閬僵鍏抽棴灞�
- content: 'text'
+ shadeClose: true,
+ content: $('#siteWindow'),
+ area: ['35rem', '18rem'],
+ btn: ['纭畾', '鍏抽棴'],
+ success: function(layero, index){
+ http.post(baseUrl+"/console/site/detail", {siteId: id}, function (res) {
+ for (var val in res.data) {
+ var find = $("#siteWindow").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');
+ }
+ }
+ })
+ },
+ end: function () {
+ $(':input', $("#siteWindow")).val('').removeAttr('checked').removeAttr('selected');
+ }
+ });
+ });
+
+ // 鍫嗗灈鏈虹偣鍑讳簨浠�
+ $('.machine').on('click', function () {
+ var id = this.id.split("-")[1];
+ layer.open({
+ title: id+"鍙峰爢鍨涙満",
+ skin: 'layui-layer-lan',
+ closeBtn: 0,
+ type: 1,
+ offset: '150px',
+ shadeClose: true,
+ content: $("#crnWindow"),
+ area: ['40rem', '20rem'],
+ btn: ['纭畾', '鍏抽棴'],
+ success: function(layero, index){
+ http.post(baseUrl+"/console/crn/detail", {crnNo: id}, function (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');
+ }
+ }
+ })
+ },
+ end: function () {
+ $(':input', $("#crnWindow")).val('').removeAttr('checked').removeAttr('selected');
+ }
});
});
--
Gitblit v1.9.1