From 45e4c1543eaacc87ccf67a7ae91d2a8bb5b82ddc Mon Sep 17 00:00:00 2001
From: vincent <1341870251@qq.com>
Date: 星期三, 03 六月 2020 13:27:15 +0800
Subject: [PATCH] #
---
src/main/webapp/views/console.html | 376 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 357 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 8b0fb49..5666f17 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -14,15 +14,31 @@
<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>
<header>
<!-- 绯荤粺杩愯鐘舵�� -->
<div class="system-state">
- <div class="system-icon"></div>
- <span>绯荤粺杩愯涓�...</span>
+ <div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
+ <span id="system-run-desc">绯荤粺杩愯涓�...</span>
</div>
<!-- 淇℃伅灞曠ず -->
@@ -57,9 +73,6 @@
</div>
</div>
</div>
-
- <!--鍒嗗壊绾�-->
- <!--<hr class="header-hr">-->
</header>
<main>
@@ -399,24 +412,304 @@
<span class="row-no">1#</span>
</div>
</div>
-
- <!-- 鍙宠緭閫佺嚎 -->
- <!--<input id="val" type="text">-->
- <!--<button id="animate">animate</button>-->
</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="12" 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="9998" 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="2.璁惧涓婄Щ鍔�" 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="auto" disabled="disabled" style="width: 1rem" checked>
+ </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" checked>
+ </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" checked>
+ </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" checked>
+ </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="1.鍏ュ簱" 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="2303" 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="2410" 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="" 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="12" 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="9998" 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="2303" 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="2410" 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="2.璁惧涓婄Щ鍔�" 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="1.鍏ュ簱" 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();
// 瀹炴椂璁块棶
setInterval(function () {
- getSitesInfo();
getCrnInfo();
- }, 1000);
+ getSystemRunningStatus();
+ }, 500);
+ setInterval(function () {
+ getSitesInfo();
+ }, 3000);
+
+ // 绯荤粺杩愯寮�鍏�
+ function systemSwitch() {
+ if (systemRunning){
+ layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺仠姝� WCS 绯荤粺', formType: 1, shadeClose: true}, function(pass, idx){
+ layer.close(idx);
+ doSwitch(0, pass);
+ });
+ } else {
+ doSwitch(1)
+ }
+
+ }
+
+ // 璇锋眰鏈嶅姟鍣ㄦ帶鍒秝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) {
+ if (res.code === 200){
+ layer.close(index);
+ if (res.data.status) {
+ $('#system-icon').attr("class", "system-icon-open");
+ $('#system-run-desc').html("绯荤粺杩愯涓�...");
+ systemRunning = true;
+ } else {
+ $('#system-icon').attr("class", "system-icon-close");
+ $('#system-run-desc').html("绯荤粺宸插仠姝�!");
+ systemRunning = false;
+ }
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ });
+
+ }
+
+ // 鑾峰彇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("绯荤粺杩愯涓�...");
+ systemRunning = true;
+ } else {
+ $('#system-icon').attr("class", "system-icon-close");
+ $('#system-run-desc').html("绯荤粺宸插仠姝�!");
+ systemRunning = false;
+ }
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ });
+ }
// 杈撻�佽澶囧疄鏃舵暟鎹幏鍙�
function getSitesInfo(){
@@ -448,10 +741,27 @@
success: function (res) {
if (res.code === 200){
var crns = res.data;
- console.log(crns);
for (var i = 0; i < crns.length; i++){
crnAnimate(crns[i].crnId, crns[i].offset);
}
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/login";
+ } else {
+ alert(res.msg);
+ }
+ }
+ });
+ }
+
+ // 鎵爜鍣ㄥ疄鏃舵暟鎹幏鍙�
+ function getBarcodeInfo(){
+ $.ajax({
+ url: baseUrl+ "/console/latest/data/barcode",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+
} else if (res.code === 403){
top.location.href = baseUrl+"/login";
} else {
@@ -477,16 +787,44 @@
}
}
+ // 椤甸潰鐐瑰嚮浜嬩欢鐩戝惉 ---------------------------------------------------------
- $('.item').on('click', function () {
+ // 杈撻�佽澶囩偣鍑讳簨浠�
+ $('.site').on('click', function () {
layer.open({
+ title: "1204绔欑偣淇℃伅",
+ closeBtn: 0,
+ skin: 'layui-layer-lan',
+ offset: '180px',
type: 1,
- shadeClose: true, //鐐瑰嚮閬僵鍏抽棴灞�
- content: 'text'
+ shadeClose: true,
+ content: $('#siteWindow'),
+ area: ['35rem', '18rem'],
+ btn: ['纭畾', '鍏抽棴'],
+ yes: function(index, layero){
+ layer.close(index);
+ alert(1);
+ }
});
});
- $('#animate').click(function () {
- crnAnimate(1, $('#val').val());
+
+ // 鍫嗗灈鏈虹偣鍑讳簨浠�
+ $('.machine').on('click', function () {
+ layer.open({
+ title: "1鍙峰爢鍨涙満",
+ skin: 'layui-layer-lan',
+ closeBtn: 0,
+ type: 1,
+ offset: '150px',
+ shadeClose: true,
+ content: $("#crnWindow"),
+ area: ['40rem', '20rem'],
+ btn: ['纭畾', '鍏抽棴'],
+ yes: function(index, layero){
+ layer.close(index);
+ alert(1);
+ }
+ });
});
</script>
--
Gitblit v1.9.1