From b8c41a54d3c1ce563b30406ad5d132352f8a30aa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 22 五月 2023 17:01:05 +0800
Subject: [PATCH] #
---
/dev/null | 50 ----------
src/main/webapp/views/console.html | 2
src/main/webapp/views/index.html | 53 ----------
src/main/webapp/static/js/console.map.js | 38 +++++--
src/main/webapp/views/control.html | 2
src/main/resources/application.yml | 2
src/main/webapp/views/indexTV.html | 97 +++++++++++++++++++
7 files changed, 130 insertions(+), 114 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3a0fb3a..00fc217 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,7 +43,7 @@
# 鍙屾繁搴撲綅鎺掑彿
doubleLocs:
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
- groupCount:
+ groupCount: 2
# 鍫嗗灈鏈�1
crn[0]:
id: 1
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 413c439..2551c54 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -11,37 +11,37 @@
"id": "rack4",
"top": 260,
"left": 196,
- "width": 796,
+ "width": 765,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 25
+ "maxBayNo": 24
}, {
"type": "rack",
"id": "rack1",
"top": 95,
"left": 167,
- "width": 825,
+ "width": 794,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 26
+ "maxBayNo": 25
}, {
"type": "rack",
"id": "rack2",
"top": 152,
"left": 167,
- "width": 825,
+ "width": 794,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 26
+ "maxBayNo": 25
}, {
"type": "rack",
"id": "rack3",
"top": 200,
"left": 167,
- "width": 825,
+ "width": 794,
"height": 23,
"minBayNo": 1,
- "maxBayNo": 26
+ "maxBayNo": 25
}],
"rackDescs": [{
"type": "rackDescs",
@@ -127,12 +127,28 @@
"height": 23
}, {
"type": "stn",
- "id": "site-101",
- "text": "101",
+ "id": "site-105",
+ "text": "105",
"top": 47,
"left": 1188,
"width": 65,
- "height": 95
+ "height": 23
+ }, {
+ "type": "stn",
+ "id": "site-0",
+ "text": "鍗囬檷",
+ "top": 70,
+ "left": 1203,
+ "width": 35,
+ "height": 49,
+ }, {
+ "type": "stn",
+ "id": "site-101",
+ "text": "101",
+ "top": 119,
+ "left": 1188,
+ "width": 65,
+ "height": 23
}, {
"type": "stn",
"id": "site-211",
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2ff7fc7..c795252 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -26,7 +26,7 @@
</div>
<!-- 璐ф灦 + 鍫嗗灈鏈� + 鍏ュ簱绔欑偣 -->
<div class="main-part">
-
+ </div>
<div class="" >
<div id="loc-0100105" class="loc" style="top:400px; left:200px; width:70px; height: 22px;line-height: 22px;">1-1-5</div>
<div id="loc-0100205" class="loc" style="top:400px; left:272px; width:70px; height: 22px;line-height: 22px;">1-2-5</div>
diff --git a/src/main/webapp/views/control.html b/src/main/webapp/views/control.html
index 928fba0..f98b1ba 100644
--- a/src/main/webapp/views/control.html
+++ b/src/main/webapp/views/control.html
@@ -84,7 +84,7 @@
</main>
<footer class="footer">
- Copyright 漏 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">绔嬪簱wcs鎿嶄綔骞冲彴</a>
+ Copyright 漏 2023 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">绔嬪簱wcs鎿嶄綔骞冲彴</a>
</footer>
</body>
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 5f5506c..d93a5d6 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -6,13 +6,6 @@
<link rel="stylesheet" href="../static/css/index.css">
<script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
<style>
- html{
- transform: scale(1) translate(0,0);
- /*transform: scale(0.5) translate(-50%,-50%);*/
- height: 150%;
- width: 150%;
- }
-
</style>
</head>
<body>
@@ -23,8 +16,7 @@
<div class="sidebar">
<div class="nav">
<ul class="cl-effect-4">
- <li><button id="fire" style="border-radius: 30px">娑堥槻</button><br>
- <a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
+ <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
<li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
<li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
</ul>
@@ -36,7 +28,7 @@
<!-- 涓讳綋鍐呭 -->
<iframe id="content" src="console.html"></iframe>
<footer class="footer">
- Copyright 漏 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">绔嬪簱wcs鎿嶄綔骞冲彴</a>
+ Copyright 漏 2023 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">绔嬪簱wcs鎿嶄綔骞冲彴</a>
</footer>
</body>
<script>
@@ -51,46 +43,7 @@
localStorage.removeItem("token");
window.location.href = baseUrl + "/login";
}
- $.ajax({
- url: "/fnwcs" + "/console/crn/detail",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- crnNo: 1
- },
- method: 'post',
- success: 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');
- }
- }
- }
- })
- $.ajax({
- url: "/fnwcs" + "/console/loc/detail2",
- headers: {
- 'token': localStorage.getItem('token')
- },
- data: {
- locNo: "0101804"
- },
- method: 'post',
- success: function (res) {
- console.log(res);
- if (res.code === 200) {
- if (res.data.channel<=10240){
- $("#fire").attr("style", "background-color: #00FF00;border-radius: 30px");
- }else {
- $("#fire").attr("style", "background-color: #FD482C;border-radius: 30px");
- }
- }
- }
- })
+
// 绯荤粺杩愯鐘舵��
var systemRunning = true;
</script>
diff --git a/src/main/webapp/views/index2.html b/src/main/webapp/views/index2.html
deleted file mode 100644
index d9d215c..0000000
--- a/src/main/webapp/views/index2.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf-8">
- <title>鑷姩浠撳簱WCS绯荤粺</title>
- <link rel="stylesheet" href="../static/css/index.css">
- <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
- <style>
- </style>
-</head>
-<body>
-<!-- 瀵艰埅鏍� -->
-<!-- <div class="nav">-->
-<!-- <li class="right">娉ㄩ攢<a id="about" class="nav-unselect" onclick="logout()" href="#"></a></li>-->
-<!-- </div>-->
-<div class="sidebar">
- <div class="nav">
- <ul class="cl-effect-4">
- <li><a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
- <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
- <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
- </ul>
- </div>
-</div>
-<!--<div style="z-index: 999; position: absolute; top: 250px; left: 900px; width: 200px; height: 200px; opacity: 0.5;background-color: #0000FF">-->
-
-<!--</div>-->
-<!-- 涓讳綋鍐呭 -->
-<iframe id="content" src="console.html"></iframe>
-<footer class="footer">
- Copyright 漏 2022 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">绔嬪簱wcs鎿嶄綔骞冲彴</a>
-</footer>
-</body>
-<script>
- // 瀵艰埅鏍�
- function nav(id) {
- $('.nav-select').attr("class", "nav-unselect");
- $('#'+id).attr("class", "nav-select");
- $('#content').attr("src", id+".html");
- }
-
- function logout() {
- localStorage.removeItem("token");
- window.location.href = baseUrl + "/login";
- }
-
- // 绯荤粺杩愯鐘舵��
- var systemRunning = true;
-</script>
-</html>
diff --git a/src/main/webapp/views/indexTV.html b/src/main/webapp/views/indexTV.html
new file mode 100644
index 0000000..d03a904
--- /dev/null
+++ b/src/main/webapp/views/indexTV.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <title>鑷姩浠撳簱WCS绯荤粺</title>
+ <link rel="stylesheet" href="../static/css/index.css">
+ <script src="../static/js/jquery/jquery-3.3.1.min.js"></script>
+ <style>
+ html{
+ transform: scale(1) translate(0,0);
+ /*transform: scale(0.5) translate(-50%,-50%);*/
+ height: 150%;
+ width: 150%;
+ }
+
+ </style>
+</head>
+<body>
+<!-- 瀵艰埅鏍� -->
+<!-- <div class="nav">-->
+<!-- <li class="right">娉ㄩ攢<a id="about" class="nav-unselect" onclick="logout()" href="#"></a></li>-->
+<!-- </div>-->
+<div class="sidebar">
+ <div class="nav">
+ <ul class="cl-effect-4">
+ <li><button id="fire" style="border-radius: 30px">娑堥槻</button><br>
+ <a id="console" onclick="nav(this.id)" class="nav-select" href="#">涓绘帶鍥�</a></li>
+ <li><a id="pipeline" onclick="nav(this.id)" class="nav-unselect" href="#">杈撻�佽澶�</a></li>
+ <li><a id="crn" onclick="nav(this.id)" class="nav-unselect" href="#">鍫嗗灈鏈�</a></li>
+ </ul>
+ </div>
+</div>
+<!--<div style="z-index: 999; position: absolute; top: 250px; left: 900px; width: 200px; height: 200px; opacity: 0.5;background-color: #0000FF">-->
+
+<!--</div>-->
+<!-- 涓讳綋鍐呭 -->
+<iframe id="content" src="console.html"></iframe>
+<footer class="footer">
+ Copyright 漏 2023 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">绔嬪簱wcs鎿嶄綔骞冲彴</a>
+</footer>
+</body>
+<script>
+ // 瀵艰埅鏍�
+ function nav(id) {
+ $('.nav-select').attr("class", "nav-unselect");
+ $('#'+id).attr("class", "nav-select");
+ $('#content').attr("src", id+".html");
+ }
+
+ function logout() {
+ localStorage.removeItem("token");
+ window.location.href = baseUrl + "/login";
+ }
+ $.ajax({
+ url: "/fnwcs" + "/console/crn/detail",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ crnNo: 1
+ },
+ method: 'post',
+ success: 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');
+ }
+ }
+ }
+ })
+ $.ajax({
+ url: "/fnwcs" + "/console/loc/detail2",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {
+ locNo: "0101804"
+ },
+ method: 'post',
+ success: function (res) {
+ console.log(res);
+ if (res.code === 200) {
+ if (res.data.channel<=10240){
+ $("#fire").attr("style", "background-color: #00FF00;border-radius: 30px");
+ }else {
+ $("#fire").attr("style", "background-color: #FD482C;border-radius: 30px");
+ }
+ }
+ }
+ })
+ // 绯荤粺杩愯鐘舵��
+ var systemRunning = true;
+</script>
+</html>
--
Gitblit v1.9.1