From d373e41c5b6519bd7d3242612b86f19c567260d7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期二, 20 九月 2022 16:29:12 +0800
Subject: [PATCH] #
---
src/main/webapp/static/images/zy-logo.png | 0
src/main/webapp/views/console.html | 32 ++++++++++++---
src/main/webapp/static/css/pipeline.css | 2
src/main/webapp/views/pipeline.html | 50 ++++++++++++------------
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 1
src/main/resources/application.yml | 2
6 files changed, 53 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 259eaad..3e9c1ae 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -142,6 +142,7 @@
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 宸ヤ綔鍙�
staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4 + 2)); // 鐩爣绔�
+ System.out.println("杩欓噷鍗′竴涓�");
}
}
// Thread.sleep(200);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5570d5f..1294005 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -143,7 +143,7 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 10.10.10.50
+ ip: 192.168.4.250
port: 102
rack: 0
slot: 0
diff --git a/src/main/webapp/static/css/pipeline.css b/src/main/webapp/static/css/pipeline.css
index d81d39f..80aa317 100644
--- a/src/main/webapp/static/css/pipeline.css
+++ b/src/main/webapp/static/css/pipeline.css
@@ -33,7 +33,7 @@
height: 15%;
}
.plc-log-body {
- height: 85%;
+ height: 100%;
overflow: auto;
}
diff --git a/src/main/webapp/static/images/zy-logo.png b/src/main/webapp/static/images/zy-logo.png
index 4865504..3726d78 100644
--- a/src/main/webapp/static/images/zy-logo.png
+++ b/src/main/webapp/static/images/zy-logo.png
Binary files differ
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index ea259e5..f8e2c09 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -569,6 +569,7 @@
}
if (sites[i].siteId === '16' || sites[i].siteId === '016') {
+
carAnimate(Number(sites[i].siteId), Number(sites[i].nearbySta));
}
}
@@ -698,23 +699,39 @@
// 灏忚溅鍋忕Щ鍔ㄧ敾
function carAnimate(id, target) {
- var targetTop = 122;
+ // debugger
+ var targetTop = 0;
if (id === 16 || id === '16' || id === '016') {
switch (target) {
case 1:
- targetTop += 160;
+ targetTop += 827;
break;
case 2:
- targetTop += 140;
+ targetTop += 765;
break;
case 3:
- targetTop += 80;
+ targetTop += 651;
break;
case 4:
- targetTop += 40;
+ targetTop += 589;
+ break;
+ case 5:
+ targetTop += 505;
+ break;
+ case 6:
+ targetTop += 443;
break;
case 7:
- targetTop += 0;
+ targetTop += 362;
+ break;
+ case 8:
+ targetTop += 297;
+ break;
+ case 9:
+ targetTop += 243;
+ break;
+ case 10:
+ targetTop += 129;
break;
default:
return;
@@ -722,7 +739,8 @@
} else {
return;
}
- $("#site-" + id).animate({top: targetTop + 'px'}, 1000);
+
+ $("#site-0" + id).animate({top: targetTop + 'px'}, 1000);
}
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index f5a6f6c..c316cbd 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -53,31 +53,31 @@
<!-- plc寮傚父鏃ュ織鐩戞帶鐗� -->
<div id="plc-error" class="main-board" style="padding-left: 10px">
<!-- 澶撮儴 -->
- <div class="plc-log-header">
- <!-- 璁惧浠诲姟鎿嶄綔 -->
- <div class="io-mode-oper">
- <fieldset>
- <legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>
- <div class="io-mode-box">
- <label>F2</label>
- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- <div class="io-mode-box">
- <label>F4</label>
- <button id="io-mode-4" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>
- </div>
- </fieldset>
- </div>
- <!-- <div style="height: 40%">-->
- <!-- <span>涓滀晶PLC鎵ц鎸囦护</span>-->
- <!-- </div>-->
- <!-- <div style="height: 40%">-->
- <!-- <span>瑗夸晶PLC鎵ц鎸囦护</span>-->
- <!-- </div>-->
- <!-- <div>-->
- <!-- <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>-->
- <!-- </div>-->
- </div>
+<!-- <div class="plc-log-header">-->
+<!-- <!– 璁惧浠诲姟鎿嶄綔 –>-->
+<!-- <div class="io-mode-oper">-->
+<!-- <fieldset>-->
+<!-- <legend>鍏ュ嚭搴撴ā寮忥紙IO-Mode锛�</legend>-->
+<!-- <div class="io-mode-box">-->
+<!-- <label>F2</label>-->
+<!-- <button id="io-mode-2" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
+<!-- </div>-->
+<!-- <div class="io-mode-box">-->
+<!-- <label>F4</label>-->
+<!-- <button id="io-mode-4" class="ioModeBtn" onclick="ioModeSwitch(this.id)"> - </button>-->
+<!-- </div>-->
+<!-- </fieldset>-->
+<!-- </div>-->
+<!-- <!– <div style="height: 40%">–>-->
+<!-- <!– <span>涓滀晶PLC鎵ц鎸囦护</span>–>-->
+<!-- <!– </div>–>-->
+<!-- <!– <div style="height: 40%">–>-->
+<!-- <!– <span>瑗夸晶PLC鎵ц鎸囦护</span>–>-->
+<!-- <!– </div>–>-->
+<!-- <!– <div>–>-->
+<!-- <!– <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>–>-->
+<!-- <!– </div>–>-->
+<!-- </div>-->
<!-- 涓讳綋 -->
<div class="plc-log-body">
<div>
--
Gitblit v1.9.1