From 7b91c4ce2b3cabfa65ff2c3d77cfff0c24162cd0 Mon Sep 17 00:00:00 2001 From: 18516761980 <56479841@qq.com> Date: 星期六, 13 八月 2022 13:22:34 +0800 Subject: [PATCH] Merge branch 'gzynwcs' of http://47.97.1.152:5880/r/zy-wcs into gzynwcs --- src/main/webapp/views/console.html | 7 +++++-- src/main/webapp/static/css/render.css | 30 ++++++++++++++++++++++++++++++ src/main/webapp/views/info.js | 8 ++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/static/css/render.css b/src/main/webapp/static/css/render.css index 808914a..deab3e7 100644 --- a/src/main/webapp/static/css/render.css +++ b/src/main/webapp/static/css/render.css @@ -359,6 +359,36 @@ .site-unauto { background-color: rgb(184,184,184); } + + +/* 闈欑疆瀹屾垚 */ +.loc-empty { + background-color: rgb(163,214,242); +} +/* 鍦ㄥ簱闈欑疆涓�*/ +.loc-wait { + background-color: rgb(151,180,0); +} +/* 鍦ㄥ簱寰呮祴 */ +.loc-in-wait { + background-color: rgb(58,77,249); +} +/* 鍦ㄥ簱娴嬭瘯涓� */ +.loc-testing { + background-color: rgb(240,140,10); +} +/* 寮傚父 */ +.loc-error { + background-color: rgb(252,48,48); +} +/* 绌哄簱浣� */ +.loc-empty { + background-color: rgb(132,255,115); +} + + + + #code { background-image: url(../images/status_bar_2.png); background-repeat: no-repeat; diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html index 7ab2a30..fcf16bb 100644 --- a/src/main/webapp/views/console.html +++ b/src/main/webapp/views/console.html @@ -10,6 +10,7 @@ <script src="../static/js/console.map.js"></script> <script src="../static/js/console.js"></script> <script src="../static/js/common.js"></script> + <script src="info.js"></script> </head> @@ -193,7 +194,7 @@ <span class="site machine-site-move-flag" style="color:#FFFFFF; top:600px; left:442px">鍦ㄥ簱娴嬭瘯涓�</span> <span class="site machine-take-flag" style="color:#FFFFFF; top:600px; left:534px">鍦ㄥ簱闈欑疆涓�</span> <span class="site machine-put-flag" style="color:#FFFFFF; top:600px; left:626px">闈欑疆瀹屾垚</span> - <span class="site machine-error-flag" style="color:#FFFFFF; top:600px; left:704px">寮傚父鎶ヨ</span> + <span class="site machine-error-flag" style="color:#FFFFFF; top:600px; left:696px">寮傚父鎶ヨ</span> </div> <div id="body"> @@ -844,6 +845,9 @@ } }); } + function getInfo() { + + } // 搴撲綅瀹炴椂鏁版嵁鑾峰彇 function getLocInfo() { @@ -857,7 +861,6 @@ for (var i = 0; i < locs.length; i++) { var siteEl = $("#loc-" + locs[i].locNo); siteEl.attr("class", "site " + locs[i].packStatus); - debugger; // if (locs[i].workNo != null && locs[i].workNo > 0) { // siteEl.html(locs[i].siteId + "[" + locs[i].workNo + "]"); // } else { diff --git a/src/main/webapp/views/info.js b/src/main/webapp/views/info.js new file mode 100644 index 0000000..13c8718 --- /dev/null +++ b/src/main/webapp/views/info.js @@ -0,0 +1,8 @@ +var res = { + code:200, + data:[ + {locNo:"0201503",packStatus:"loc-testing"}, + {locNo:"0201804",packStatus:"loc-testing"}, + {locNo:"0100404",packStatus:"loc-testing"}, + ] +} \ No newline at end of file -- Gitblit v1.9.1