From 99b4f2a8876546974737446378e4cddc6317ea78 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期三, 29 十二月 2021 10:38:01 +0800
Subject: [PATCH] YCQ
---
src/main/webapp/static/images/Crane_retrieve.png | 0
src/main/webapp/static/images/Crane_manual.png | 0
src/main/webapp/static/images/Crane_stntostn.png | 0
src/main/webapp/views/console.html | 209 ++++++++++++++++++++++++-----------------
src/main/webapp/static/css/console.css | 55 +++++++++++
src/main/webapp/static/images/Crane_store.png | 0
src/main/webapp/static/images/Crane_error.png | 0
src/main/webapp/static/images/Crane_manual1.png | 0
src/main/webapp/static/images/Crane_hptoohp.png | 0
src/main/webapp/static/images/Crane_loctoloc.png | 0
10 files changed, 178 insertions(+), 86 deletions(-)
diff --git a/src/main/webapp/static/css/console.css b/src/main/webapp/static/css/console.css
index 9c4edba..6ffac4c 100644
--- a/src/main/webapp/static/css/console.css
+++ b/src/main/webapp/static/css/console.css
@@ -48,6 +48,15 @@
border-radius: 15px;
margin-left: 1%;
}
+ .state-ss {
+ margin-left: 60px;
+
+ }
+
+
+
+
+
/* 杈撻�佺嚎鐘舵�� */
.line-status {
display: inline-block;
@@ -56,6 +65,18 @@
background-color: rgba(0, 0, 0, 0.3);
border-radius: 15px;
margin-left: 1%;
+ }
+ .line-ss {
+ display: inline-block;
+ float: right;
+ height: 15px;
+ width: 40px;
+ margin-top: 10px;
+ margin-right: 15px;
+ line-height: 15px;
+ text-align: center;
+ background-color: rgba(5, 5, 5, 0.3);
+ color: #ffdd00;
}
/* 鏉＄爜鎵弿鍣� */
.bar-code {
@@ -308,6 +329,40 @@
background-position: top center;
cursor: pointer;
}
+ /* 鍏ュ簱 */
+ .machine-pakin {
+ background-image: url("../images/Crane_store.png");
+ }
+ /* 鍑哄簱 */
+ .machine-pakout {
+ background-image: url("../images/Crane_retrieve.png");
+ }
+ /* 搴撳埌搴� */
+ .machine-stock-move {
+ background-image: url("../images/Crane_loctoloc.png");
+ }
+ /* 绔欏埌绔� */
+ .machine-site-move {
+ background-image: url("../images/Crane_stntostn.png");
+ }
+ /* p to p */
+ .machine-p-move {
+ background-image: url("../images/Crane_hptoohp.png");
+ }
+ /* 寮傚父 */
+ .machine-error {
+ background-image: url("../images/Crane_error.png");
+ }
+ /* 鑷姩 */
+ .machine-auto {
+ background-image: url("../images/Crane_auto.png");
+ }
+ /* 闈炶嚜鍔�/鏀跺埌 */
+ .machine-un-auto {
+ background-image: url("../images/Crane_manual.png");
+ }
+
+
/* 鍫嗗灈鏈哄脊绐� */
#crnWindow {
width: 291px;
diff --git a/src/main/webapp/static/images/Crane_error.png b/src/main/webapp/static/images/Crane_error.png
index bffbd3f..8d0901d 100644
--- a/src/main/webapp/static/images/Crane_error.png
+++ b/src/main/webapp/static/images/Crane_error.png
Binary files differ
diff --git a/src/main/webapp/static/images/Crane_hptoohp.png b/src/main/webapp/static/images/Crane_hptoohp.png
index e0d47d0..ee42cf5 100644
--- a/src/main/webapp/static/images/Crane_hptoohp.png
+++ b/src/main/webapp/static/images/Crane_hptoohp.png
Binary files differ
diff --git a/src/main/webapp/static/images/Crane_loctoloc.png b/src/main/webapp/static/images/Crane_loctoloc.png
index a9a0b8c..87a9a5c 100644
--- a/src/main/webapp/static/images/Crane_loctoloc.png
+++ b/src/main/webapp/static/images/Crane_loctoloc.png
Binary files differ
diff --git a/src/main/webapp/static/images/Crane_manual.png b/src/main/webapp/static/images/Crane_manual.png
index 017112a..7ffdd59 100644
--- a/src/main/webapp/static/images/Crane_manual.png
+++ b/src/main/webapp/static/images/Crane_manual.png
Binary files differ
diff --git a/src/main/webapp/static/images/Crane_manual1.png b/src/main/webapp/static/images/Crane_manual1.png
new file mode 100644
index 0000000..017112a
--- /dev/null
+++ b/src/main/webapp/static/images/Crane_manual1.png
Binary files differ
diff --git a/src/main/webapp/static/images/Crane_retrieve.png b/src/main/webapp/static/images/Crane_retrieve.png
index 8019a70..eb7c5bd 100644
--- a/src/main/webapp/static/images/Crane_retrieve.png
+++ b/src/main/webapp/static/images/Crane_retrieve.png
Binary files differ
diff --git a/src/main/webapp/static/images/Crane_stntostn.png b/src/main/webapp/static/images/Crane_stntostn.png
index df0eca7..b83f849 100644
--- a/src/main/webapp/static/images/Crane_stntostn.png
+++ b/src/main/webapp/static/images/Crane_stntostn.png
Binary files differ
diff --git a/src/main/webapp/static/images/Crane_store.png b/src/main/webapp/static/images/Crane_store.png
index 238352d..dd7e4c2 100644
--- a/src/main/webapp/static/images/Crane_store.png
+++ b/src/main/webapp/static/images/Crane_store.png
Binary files differ
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2491020..c115b0c 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -5,7 +5,7 @@
<title>WCS鎺у埗涓績</title>
<!--<link rel="stylesheet" type="text/css" href="../static/css/common.css">-->
<link rel="stylesheet" href="../static/css/console.css">
- <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">
+<!-- <link rel="stylesheet" type="text/css" href="../static/css/normalize.css">-->
@@ -61,8 +61,8 @@
</div>
<!--<!– 绗�6鍒楋紙瀹藉害 70px锛� –>-->
<div class="site-row site-row-6">
- <div id="site-120" class="site" style="height: 31px;line-height: 31px">120(8888)</div>
- <div id="site-121" class="site" style="height: 31px;line-height: 31px">121(8888)</div>
+ <div id="site-120" class="site" style="height: 31px;line-height: 31px">120</div>
+ <div id="site-121" class="site" style="height: 31px;line-height: 31px">121</div>
<div id="site-122" class="site" style="height: 71px;line-height: 71px">122</div>
<div id="site-123" class="site" style="height: 31px;line-height: 31px">123</div>
<div id="site-124" class="site" style="height: 31px;line-height: 31px">124</div>
@@ -914,6 +914,7 @@
</div>
</div>
</div>
+ <!--搴曢儴-->
<div id="body">
<!-- 鎬诲紑鍏� -->
<div class="system-state">
@@ -931,11 +932,11 @@
<div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
<div class="state">
<span>鍫嗗灈鏈� 1</span>
- <span>鑷姩</span>
+ <span class="state-ss machine-put-flag ">鍏ュ簱</span>
</div>
<div class="state">
<span>鍫嗗灈鏈� 2</span>
- <span>鑷姩</span>
+ <span class="state-ss machine-auto-flag ">鑷姩</span>
</div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
@@ -954,7 +955,7 @@
<div class="body-head">杈撻�佺嚎鐘舵��</div>
<div class="state states">
<span>杩愯緭绾挎�绘暟</span>
- <span>45</span>
+ <span class="line-ss">45</span>
</div>
<div class="button"><span>鎵�鏈夌姸鎬�</span></div>
<div class="button item-group">
@@ -1194,27 +1195,51 @@
</body>
</html>
<script type="text/javascript">
- // // 寮圭獥绔欑偣淇℃伅
- // $('.site').on('click',function(){
- // var id = this.id.split("-")[1];
- // $("#siteWindow").attr("style","display:block;");//鏄剧ずdiv
- // $(".detailed").empty();
- // $('.detailed').append(id+'绔欑偣璇︾粏淇℃伅');
- // });
- // // 鍫嗗灈鏈轰俊鎭�
- // $('.machine').on('click',function(){
- // var id = this.id.split("-")[1];
- // $("#crnWindow").attr('style','display:block;');
- // $('.detailed').empty();
- // $('.detailed').append(id+'鍙峰爢鍨涙満');
- // })
- // // 寮圭獥鍏抽棴
- // $('button').on('click',function(){
- // $('#siteWindow').attr('style','display:none')
- // $('#crnWindow').attr('style','display:none')
- // })
+ // 寮圭獥绔欑偣淇℃伅
+ $('.site').on('click',function(){
+ var id = this.id.split("-")[1];
+ $("#siteWindow").attr("style","display:block;");//鏄剧ずdiv
+ $(".detailed").empty();
+ $('.detailed').append(id+'绔欑偣璇︾粏淇℃伅');
+ $.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');
+ }
+ }
+ })
+ });
+ // 鍫嗗灈鏈轰俊鎭�
+ $('.machine').on('click',function(){
+ var id = this.id.split("-")[1];
+ $("#crnWindow").attr('style','display:block;');
+ $('.detailed').empty();
+ $('.detailed').append(id+'鍙峰爢鍨涙満');
+ $.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');
+ }
+ }
+ })
+ })
+ // 寮圭獥鍏抽棴
+ $('button').on('click',function(){
+ $('#siteWindow').attr('style','display:none')
+ $('#crnWindow').attr('style','display:none')
+ })
var crn1Position = 0;
var crn2Position = 0;
+ var crn3Position = 0;
+ var crn4Position = 0;
+ var crn5Position = 0;
+
// 鍒濆鍖�
getSitesInfo();
getCrnInfo();
@@ -1418,6 +1443,18 @@
$("#crn-2").animate({left: leftVal+'px'}, 1000);
crn2Position = leftVal;
break;
+ case 3:
+ $("#crn-3").animate({left: leftVal+'px'}, 1000);
+ crn3Position = leftVal;
+ break;
+ case 4:
+ $("#crn-4").animate({left: leftVal+'px'}, 1000);
+ crn4Position = leftVal;
+ break;
+ case 5:
+ $("#crn-5").animate({left: leftVal+'px'}, 1000);
+ crn5Position = leftVal;
+ break;
default:
break
}
@@ -1426,69 +1463,69 @@
// 椤甸潰鐐瑰嚮浜嬩欢鐩戝惉 ---------------------------------------------------------
// 杈撻�佽澶囩偣鍑讳簨浠�
- $('.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: $('#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');
- }
- });
- });
+ // $('.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: $('#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');
- }
- });
- });
+ // $('.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