From 6c7c48a3aae8c15499fc087f8732c6964b857716 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 10 四月 2025 15:55:18 +0800
Subject: [PATCH] 界面翻译为俄语
---
src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java | 6
src/main/webapp/views/console.html | 110 +++++++++++-----------
src/main/webapp/views/pipeline.html | 28 ++--
src/main/java/com/zy/asrs/controller/CrnController.java | 4
src/main/java/com/zy/core/enums/CrnForkPosType.java | 2
pom.xml | 2
src/main/java/com/zy/core/enums/CrnModeType.java | 2
src/main/java/com/zy/core/enums/CrnStatusType.java | 2
src/main/webapp/views/crn.html | 106 ++++++++++----------
src/main/webapp/static/images/zy-logo.png | 0
src/main/webapp/views/index.html | 12 +-
src/main/webapp/static/js/common.js | 2
src/main/resources/application.yml | 4
src/main/webapp/views/indexTV.html | 2
14 files changed, 141 insertions(+), 141 deletions(-)
diff --git a/pom.xml b/pom.xml
index 00a1c27..913f8b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
</dependencies>
<build>
- <finalName>lfdwcs</finalName>
+ <finalName>elswcs</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 4d02d12..2a60511 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -119,13 +119,13 @@
vo.setWorkNo(crnProtocol.getTaskNo()); // 浠诲姟鍙�
vo.setStatusType(crnProtocol.modeType.desc); // 妯″紡鐘舵��
vo.setStatus(crnProtocol.getStatusType().desc); // 鐘舵��
- vo.setLoading(crnProtocol.getLoaded()==1?"鏈夌墿":"鏃犵墿"); // 鏈夌墿
+ vo.setLoading(crnProtocol.getLoaded()==1?"袝褋褌褜 褌芯胁邪褉":"袘械蟹 褌芯胁邪褉邪"); // 鏈夌墿
vo.setBay(crnProtocol.getBay()); // 鍒�
vo.setLev(crnProtocol.getLevel()); // 灞�
vo.setForkOffset(crnProtocol.getForkPosType().desc); // 璐у弶浣嶇疆
vo.setLiftPos(crnProtocol.getLiftPosType().desc);
- vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
+ vo.setWalkPos(crnProtocol.getWalkPos()==1?"袧械 胁 锌芯蟹懈褑懈懈":"胁 锌芯蟹懈褑懈懈");
vo.setWarnCode(String.valueOf(crnProtocol.getAlarm()));
if (crnProtocol.getAlarm() > 0) {
BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
diff --git a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
index 99b6d01..b6f8bf5 100644
--- a/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/CrnStatusType.java
@@ -16,11 +16,11 @@
// p to p
MACHINE_P_MOVE("PToP"),
// 寮傚父
- MACHINE_ERROR("寮傚父"),
+ MACHINE_ERROR("袗薪芯屑邪谢懈褟"),
// 鑷姩
- MACHINE_AUTO("鑷姩"),
+ MACHINE_AUTO("袗胁褌芯屑邪褌懈褔械褋泻懈"),
// 闈炶嚜鍔�/鎵嬪姩
- MACHINE_UN_AUTO("闈炶嚜鍔�"),
+ MACHINE_UN_AUTO("袧械邪胁褌芯屑邪褌懈褔械褋泻懈泄"),
;
private String desc;
diff --git a/src/main/java/com/zy/core/enums/CrnForkPosType.java b/src/main/java/com/zy/core/enums/CrnForkPosType.java
index a915d6a..eb49a83 100644
--- a/src/main/java/com/zy/core/enums/CrnForkPosType.java
+++ b/src/main/java/com/zy/core/enums/CrnForkPosType.java
@@ -2,7 +2,7 @@
public enum CrnForkPosType {
- NONE(-1, "涓嶅湪瀹氫綅"), // 璐у弶鍘熶綅
+ NONE(-1, "袧械 胁 锌芯蟹懈褑懈懈"), // 璐у弶鍘熶綅
HOME(0, "璐у弶鍘熶綅"), // 璐у弶鍘熶綅
LEFT(1, "璐у弶鍦ㄥ乏渚�"), // 璐у弶鍦ㄥ乏渚�
RIGHT(2, "璐у弶鍦ㄥ彸渚�"), // 璐у弶鍦ㄥ彸渚�
diff --git a/src/main/java/com/zy/core/enums/CrnModeType.java b/src/main/java/com/zy/core/enums/CrnModeType.java
index 7f2d84a..57cd9cd 100644
--- a/src/main/java/com/zy/core/enums/CrnModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnModeType.java
@@ -2,7 +2,7 @@
public enum CrnModeType {
- NONE(-1, "绂荤嚎"),
+ NONE(-1, "袨褎谢邪泄薪"),
STOP(0, "缁翠慨"),
HAND(1, "鎵嬪姩"),
HALF_AUTO(2, "鍗婅嚜鍔�"),
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index 79c4b51..4eb0550 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -2,7 +2,7 @@
public enum CrnStatusType {
- NONE(-1, "绂荤嚎"),
+ NONE(-1, "袨褎谢邪泄薪"),
IDLE(0, "绌洪棽"),
FETCH_MOVING(1, "鍙栬揣琛岃蛋"),
FETCH_WAITING(2, "鍙栬揣绛夊緟"),
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b392c89..08f73ae 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=elsasrs
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 192.168.0.17:8080/lfdwms
+ url: 127.0.0.1:8080/elswms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
diff --git a/src/main/webapp/static/images/zy-logo.png b/src/main/webapp/static/images/zy-logo.png
index 4865504..71dd632 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/static/js/common.js b/src/main/webapp/static/js/common.js
index be24a86..ae4dfb8 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/lfdwcs";
+var baseUrl = "/elswcs";
// 璧嬪��
function setVal(el, val) {
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index dee93e6..ed609f7 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -16,8 +16,8 @@
<body>
<div id="main">
<div class="head">
- <div class="head-left">
- <h1>鑷姩浠撳簱WCS鐩戞帶鍥�</h1>
+ <div class="head-left" style="width: 500px">
+ <h3>袦芯薪懈褌芯褉懈薪谐 邪胁褌芯屑邪褌懈蟹懈褉芯胁邪薪薪芯谐芯 褋泻谢邪写邪 WCS</h3>
<h6>AUTOMATIC WAREHOUSE WCS MONITORING DIAGRAM</h6>
</div>
<div class="head-right">
@@ -31,59 +31,59 @@
<div id="body">
<!-- 鎬诲紑鍏� -->
<div class="system-state">
- <div class="body-head">鎬诲紑鍏�</div>
+ <div class="body-head">袚谢邪胁薪褘泄 胁褘泻谢褞褔邪褌械谢褜</div>
<div class="switch">
<div id="system-icon" class="system-icon-open" onclick="systemSwitch()"></div>
<div class="switch_r">
- <p>绯荤粺鐘舵��</p>
- <p id="system-run-desc">绯荤粺杩愯涓�</p>
+ <p>小褌邪褌褍褋 褋懈褋褌械屑褘</p>
+ <p id="system-run-desc">小懈褋褌械屑邪 褉邪斜芯褌邪械褌</p>
</div>
</div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬� -->
<div class="machine-status">
- <div class="body-head">鍫嗗灈鏈虹姸鎬�</div>
+ <div class="body-head">小褌邪褌褍褋 褕褌邪斜械谢械褉邪</div>
<div class="state">
- <span>鍫嗗灈鏈� 1</span>
- <span class="state-ss machine-put-flag ">鍏ュ簱</span>
+ <span>袨褎谢邪泄薪 1</span>
+ <span class="state-ss machine-put-flag ">袩芯褋褌褍锌谢械薪懈械 薪邪 褋泻谢邪写</span>
</div>
<div class="state">
- <span>鍫嗗灈鏈� 2</span>
- <span class="state-ss machine-auto-flag ">鑷姩</span>
+ <span>袨褎谢邪泄薪 2</span>
+ <span class="state-ss machine-auto-flag ">袗胁褌芯屑邪褌懈褔械褋泻懈泄</span>
</div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+ <div class="button"><span>袙褋械 褋褌邪褌褍褋褘</span></div>
<div class="button item-group">
- <span class="machine-put-flag">鍏ュ簱</span>
- <span class="machine-take-flag">鍑哄簱</span>
+ <span class="machine-put-flag">袩芯褋褌褍锌谢械薪懈械 薪邪 褋泻谢邪写</span>
+ <span class="machine-take-flag">袙褘胁芯蟹 褋芯 褋泻谢邪写邪</span>
<span class="machine-stock-move-flag">搴撳埌搴�</span>
- <span class="machine-site-move-flag">绔欏埌绔�</span>
+ <span class="machine-site-move-flag">袨褌 褋褌邪薪褑懈懈 写芯 褋褌邪薪褑懈懈</span>
<span class="machine-p-move-flag">PToP</span>
- <span class="machine-error-flag">寮傚父</span>
- <span class="machine-auto-flag">鑷姩</span>
- <span class="machine-unauto-flag">闈炶嚜鍔�/鎵嬪姩</span>
+ <span class="machine-error-flag">袗薪芯屑邪谢懈褟</span>
+ <span class="machine-auto-flag">袗胁褌芯屑邪褌懈褔械褋泻懈</span>
+ <span class="machine-unauto-flag">袪褍褔薪芯泄</span>
</div>
</div>
<div class="line-status">
- <div class="body-head">杈撻�佺嚎鐘舵��</div>
+ <div class="body-head">小褌邪褌褍褋 泻芯薪胁械泄械褉邪</div>
<div class="state states">
- <span>杩愯緭绾挎�绘暟</span>
+ <span>袨斜褖械械 泻芯谢懈褔械褋褌胁芯 泻芯薪胁械泄械褉芯胁</span>
<span id="line-total" class="line-ss"></span>
</div>
- <div class="button"><span>鎵�鏈夌姸鎬�</span></div>
+ <div class="button"><span>袙褋械 褋褌邪褌褍褋褘</span></div>
<div class="button item-group">
- <span class="site-auto-run-id">鑷姩+鏈夌墿+ID</span>
- <span class="site-auto-run">鑷姩+鏈夌墿</span>
- <span class="site-auto-id">鑷姩+ID</span>
- <span class="site-auto">鑷姩</span>
- <span class="site-unauto">闈炶嚜鍔�/鎵嬪姩</span>
+ <span class="site-auto-run-id">袗胁褌芯屑邪褌懈褔械褋泻懈+袝褋褌褜 褌芯胁邪褉+ID</span>
+ <span class="site-auto-run">袗胁褌芯屑邪褌懈褔械褋泻懈+袝褋褌褜 褌芯胁邪褉</span>
+ <span class="site-auto-id">袗胁褌芯屑邪褌懈褔械褋泻懈+ID</span>
+ <span class="site-auto">袗胁褌芯屑邪褌懈褔械褋泻懈</span>
+ <span class="site-unauto">袪褍褔薪芯泄</span>
</div>
</div>
<div class="bar-code">
- <div class="body-head" id="code">鏉$爜鎵弿鍣�</div>
+ <div class="body-head" id="code">小泻邪薪械褉 褕褌褉懈褏-泻芯写芯胁</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>袧邪蟹胁邪薪懈械 褕褌褉懈褏-泻芯写邪</span><span class="right">袙褉械屑褟 褋泻邪薪懈褉芯胁邪薪懈褟</span></li>
</div>
<div id="barcode1" class="table-body">
@@ -91,7 +91,7 @@
</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>袧邪蟹胁邪薪懈械 褕褌褉懈褏-泻芯写邪</span><span class="right">袙褉械屑褟 褋泻邪薪懈褉芯胁邪薪懈褟</span></li>
</div>
<div id="barcode2" class="table-body">
@@ -99,7 +99,7 @@
</div>
<div class="tablebox">
<div class="table-head">
- <li><span>鏉$爜鍚嶇О</span><span class="right">鎵爜鏃堕棿</span></li>
+ <li><span>袧邪蟹胁邪薪懈械 褕褌褉懈褏-泻芯写邪</span><span class="right">袙褉械屑褟 褋泻邪薪懈褉芯胁邪薪懈褟</span></li>
</div>
<div id="barcode3" class="table-body">
@@ -117,7 +117,7 @@
<!-- 鍫嗗灈鏈哄彿 -->
<div class="form-item">
<div class="form-item-label" style>
- <span>鍫嗗灈鏈哄彿锛�</span>
+ <span>袧芯屑械褉 褕褌邪斜械谢械褉邪锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="crnNo" value="">
@@ -126,7 +126,7 @@
<!-- 宸ヤ綔鍙� -->
<div class="form-item">
<div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
+ <span>袧芯屑械褉 蟹邪写邪薪懈褟锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="workNo" value="">
@@ -135,7 +135,7 @@
<!-- 绔欐簮 -->
<div class="form-item">
<div class="form-item-label">
- <span>绔欐簮锛�</span>
+ <span>袠褋褏芯写薪邪褟 褋褌邪薪褑懈褟锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="sourceStaNo" value="">
@@ -144,7 +144,7 @@
<!-- 鐩爣绔� -->
<div class="form-item">
<div class="form-item-label">
- <span>鐩爣绔欙細</span>
+ <span>笑械谢械胁邪褟 褋褌邪薪褑懈褟锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="staNo" value="">
@@ -153,7 +153,7 @@
<!-- 宸ヤ綔鐘舵�� -->
<div class="form-item">
<div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
+ <span>小褌邪褌褍褋 褉邪斜芯褌褘锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="wrkSts" value="">
@@ -162,7 +162,7 @@
<!-- 鍑哄叆绫诲瀷 -->
<div class="form-item">
<div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
+ <span>孝懈锌 锌芯褋褌褍锌谢械薪懈褟/胁褘胁芯蟹邪 褋芯 褋泻谢邪写邪锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="ioType" value="">
@@ -171,7 +171,7 @@
<!-- 婧愬簱浣� -->
<div class="form-item">
<div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
+ <span>袠褋褏芯写薪邪褟 褟褔械泄泻邪锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="sourceLocNo" value="">
@@ -180,7 +180,7 @@
<!-- 鐩爣搴撲綅 -->
<div class="form-item">
<div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
+ <span>笑械谢械胁芯泄 褋泻谢邪写锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="locNo" value="">
@@ -189,7 +189,7 @@
<!-- 鍫嗗灈鏈虹姸鎬� -->
<div class="form-item">
<div class="form-item-label">
- <span>鍫嗗灈鏈虹姸鎬侊細</span>
+ <span>小褌邪褌褍褋 褕褌邪斜械谢械褉邪锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="crnStatus" value="">
@@ -198,7 +198,7 @@
<!-- 寮傚父 -->
<div class="form-item">
<div class="form-item-label">
- <span>寮傚父锛�</span>
+ <span>袗薪芯屑邪谢懈褟锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="error" value="">
@@ -217,7 +217,7 @@
<!-- 璁惧鍙� -->
<div class="form-item">
<div class="form-item-label">
- <span>璁惧鍙凤細</span>
+ <span>袪邪斜芯褔邪褟 褋褌邪薪褑懈褟锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="siteId" value="">
@@ -226,7 +226,7 @@
<!-- 宸ヤ綔鍙� -->
<div class="form-item">
<div class="form-item-label">
- <span>宸ヤ綔鍙凤細</span>
+ <span>袧芯屑械褉 蟹邪写邪薪懈褟锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="workNo" value="">
@@ -235,7 +235,7 @@
<!-- 宸ヤ綔鐘舵�� -->
<div class="form-item">
<div class="form-item-label">
- <span>宸ヤ綔鐘舵�侊細</span>
+ <span>小褌邪褌褍褋 褉邪斜芯褌褘锛�</span>
</div>
<div class="form-item-input">
<input type="text" name="wrkSts" value="">
@@ -244,7 +244,7 @@
<!-- 鑷姩 -->
<div class="form-item-checkbox">
<div class="form-item-label-checkbox">
- <span>鑷姩</span>
+ <span style="font-size: 10px">袗胁褌芯屑邪褌懈褔械褋泻懈</span>
</div>
<div class="form-item-input-checkbox">
<input type="checkbox" name="autoing">
@@ -253,7 +253,7 @@
<!-- 鏈夌墿 -->
<div class="form-item-checkbox">
<div class="form-item-label-checkbox">
- <span>鏈夌墿</span>
+ <span style="font-size: 10px">袝褋褌褜 褌芯胁邪褉</span>
</div>
<div class="form-item-input-checkbox">
<input type="checkbox" name="loading">
@@ -262,7 +262,7 @@
<!-- 鑳藉叆 -->
<div class="form-item-checkbox">
<div class="form-item-label-checkbox">
- <span>鑳藉叆</span>
+ <span style="font-size: 10px;white-space: nowrap;overflow: hidden;">袦芯卸薪芯 胁芯泄褌懈</span>
</div>
<div class="form-item-input-checkbox">
<input type="checkbox" name="canining">
@@ -271,7 +271,7 @@
<!-- 鑳藉嚭 -->
<div class="form-item-checkbox">
<div class="form-item-label-checkbox">
- <span>鑳藉嚭</span>
+ <span style="font-size: 10px;white-space: nowrap;overflow: hidden;">袦芯卸薪芯 胁褘泄褌懈</span>
</div>
<div class="form-item-input-checkbox">
<input type="checkbox" name="canouting">
@@ -280,7 +280,7 @@
<!-- 鍑哄叆绫诲瀷 -->
<div class="form-item">
<div class="form-item-label">
- <span>鍑哄叆绫诲瀷锛�</span>
+ <span>孝懈锌 锌芯褋褌褍锌谢械薪懈褟/胁褘胁芯蟹邪 褋芯 褋泻谢邪写邪</span>
</div>
<div class="form-item-input">
<input type="text" name="ioType" value="">
@@ -289,7 +289,7 @@
<!-- 婧愮珯 -->
<div class="form-item">
<div class="form-item-label">
- <span>婧愮珯锛�</span>
+ <span>袠褋褏芯写薪邪褟 褋褌邪薪褑懈褟</span>
</div>
<div class="form-item-input">
<input type="text" name="sourceStaNo" value="">
@@ -298,7 +298,7 @@
<!-- 鐩爣绔� -->
<div class="form-item">
<div class="form-item-label">
- <span>鐩爣绔欙細</span>
+ <span>笑械谢械胁邪褟 褋褌邪薪褑懈褟</span>
</div>
<div class="form-item-input">
<input type="text" name="staNo" value="">
@@ -307,7 +307,7 @@
<!-- 婧愬簱浣� -->
<div class="form-item">
<div class="form-item-label">
- <span>婧愬簱浣嶏細</span>
+ <span>袠褋褏芯写薪褘泄 褋泻谢邪写</span>
</div>
<div class="form-item-input">
<input type="text" name="sourceLocNo" value="">
@@ -316,7 +316,7 @@
<!-- 鐩爣搴撲綅 -->
<div class="form-item">
<div class="form-item-label">
- <span>鐩爣搴撲綅锛�</span>
+ <span>笑械谢械胁芯泄 褋泻谢邪写</span>
</div>
<div class="form-item-input">
<input type="text" name="locNo" value="">
@@ -390,7 +390,7 @@
$("#siteWindow").attr("style", "display:block;");//鏄剧ずdiv
$("#crnWindow").attr("style", "display:none;");
$(".detailed").empty();
- $('.detailed').append(id + '绔欑偣璇︾粏淇℃伅');
+ $('.detailed').append(id + '袠薪褎芯褉屑邪褑懈褟 芯 褋褌邪薪褑懈褟褏');
$.ajax({
url: baseUrl + "/console/site/detail",
headers: {
@@ -420,7 +420,7 @@
$("#crnWindow").attr('style', 'display:block;');
$("#siteWindow").attr("style", "display:none;");
$('.detailed').empty();
- $('.detailed').append(id + '鍙峰爢鍨涙満');
+ $('.detailed').append(id + '袧芯屑械褉 褕褌邪斜械谢械褉邪');
$.ajax({
url: baseUrl + "/console/crn/detail",
headers: {
@@ -506,7 +506,7 @@
if (res.code === 200) {
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
+ $('#system-run-desc').html("小懈褋褌械屑邪 褉邪斜芯褌邪械褌...");
parent.systemRunning = true;
} else {
$('#system-icon').attr("class", "system-icon-close");
@@ -534,7 +534,7 @@
if (res.code === 200) {
if (res.data.status) {
$('#system-icon').attr("class", "system-icon-open");
- $('#system-run-desc').html("绯荤粺杩愯涓�...");
+ $('#system-run-desc').html("小懈褋褌械屑邪 褉邪斜芯褌邪械褌...");
parent.systemRunning = true;
} else {
$('#system-icon').attr("class", "system-icon-close");
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index c1012c7..09f8cfe 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -52,7 +52,7 @@
<!-- 鎵ц鍛戒护 -->
<div class="command-log">
- <h3>鎵ц涓殑鍛戒护</h3>
+ <h3>袠褋锌芯谢薪褟械屑褘械 泻芯屑邪薪写褘</h3>
<div class="crn-command-item">
<label>1#</label>
<button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
@@ -89,17 +89,17 @@
<table id="crn-state-table">
<thead>
<tr>
- <th>鍫嗗灈鏈�</th>
- <th>妯″紡</th>
- <th>鐘舵��</th>
- <th>鏈夌墿</th>
- <th>鍒�</th>
- <th>灞�</th>
- <th>璐у弶瀹氫綅</th>
- <th>杞借揣鍙板畾浣�</th>
- <th>璧拌鍦ㄥ畾浣�</th>
- <th>鏁呴殰浠g爜</th>
- <th>鏁呴殰鎻忚堪</th>
+ <th>楔褌邪斜械谢械褉</th>
+ <th>袪械卸懈屑</th>
+ <th>小褌邪褌褍褋</th>
+ <th>袝褋褌褜 褌芯胁邪褉</th>
+ <th>袣芯谢芯薪泻邪</th>
+ <th>携褉褍褋</th>
+ <th>袪邪褋锌芯谢芯卸械薪懈械 胁懈谢</th>
+ <th>袪邪褋锌芯谢芯卸械薪懈械 锌谢邪褌褎芯褉屑褘</th>
+ <th>袩械褉械写胁懈卸械薪懈械 胁 锌芯蟹懈褑懈懈</th>
+ <th>袣芯写 芯褕懈斜泻懈</th>
+ <th>袨锌懈褋邪薪懈械 芯褕懈斜泻懈</th>
</tr>
</thead>
<tbody>
@@ -112,20 +112,20 @@
<table id="crn-msg-table">
<thead>
<tr>
- <th>鍫嗗灈鏈�</th>
- <th>宸ヤ綔鍙�</th>
- <th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
- <th>璧拌閫熷害锛坢/min)</th>
- <th>鍗囬檷閫熷害锛坢/min)</th>
- <th>鍙夌墮閫熷害锛坢/min)</th>
- <th>璧拌璺濈(Km)</th>
- <th>鍗囬檷璺濈(Km)</th>
- <th>璧拌鏃堕暱(H)</th>
- <th>鍗囬檷鏃堕暱(H)</th>
+ <th>楔褌邪斜械谢械褉</th>
+ <th>袧芯屑械褉 蟹邪写邪薪懈褟</th>
+ <th>小褌邪褌褍褋</th>
+ <th>袠褋褏芯写薪邪褟 褋褌邪薪褑懈褟</th>
+ <th>笑械谢械胁邪褟 褋褌邪薪褑懈褟</th>
+ <th>袠褋褏芯写薪褘泄 褋泻谢邪写</th>
+ <th>笑械谢械胁芯泄 褋泻谢邪写</th>
+ <th>小泻芯褉芯褋褌褜 锌械褉械写胁懈卸械薪懈褟锛坢/min)</th>
+ <th>小泻芯褉芯褋褌褜 锌芯写褗械屑邪锛坢/min)</th>
+ <th>小泻芯褉芯褋褌褜 胁懈谢锛坢/min)</th>
+ <th>袩褉芯泄写械薪薪芯械 褉邪褋褋褌芯褟薪懈械(Km)</th>
+ <th>袪邪褋褋褌芯褟薪懈械 锌芯写褗械屑邪(Km)</th>
+ <th>袙褉械屑褟 锌械褉械写胁懈卸械薪懈褟(H)</th>
+ <th>袙褉械屑褟 锌芯写褗械屑邪(H)</th>
</tr>
</thead>
<tbody>
@@ -138,7 +138,7 @@
<!-- 閬僵灞� -->
<div class="crn-operation-shade">
<span class="crn-operation-shade-span">
- WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
+ 小懈褋褌械屑邪 WCS 褉邪斜芯褌邪械褌, 锌芯卸邪谢褍泄褋褌邪, 芯褋褌邪薪芯胁懈褌械 械褢 锌械褉械写 胁褘锌芯谢薪械薪懈械屑 芯锌械褉邪褑懈懈
</span>
</div>
@@ -146,55 +146,55 @@
<div class="task-select">
<!-- 鍫嗗灈鏈洪�夋嫨 -->
<div id="crn-select" class="operator-item" style="width: 55%">
- <span class="select-title">鍫嗗灈鏈哄彿</span>
+ <span class="select-title">楔褌邪斜械谢械褉</span>
<div class="select-container" style="padding: 20px 0;">
- <label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="5"> 5鍙峰爢鍨涙満</label>
+ <label><input type="radio" name="crnSelect" value="1" checked> 1 袧芯屑械褉 褕褌邪斜械谢械褉邪</label>
+ <label><input type="radio" name="crnSelect" value="2"> 2 袧芯屑械褉 褕褌邪斜械谢械褉邪</label>
+ <label><input type="radio" name="crnSelect" value="3"> 3 袧芯屑械褉 褕褌邪斜械谢械褉邪</label>
+ <label><input type="radio" name="crnSelect" value="4"> 4 袧芯屑械褉 褕褌邪斜械谢械褉邪</label>
+ <label><input type="radio" name="crnSelect" value="5"> 5 袧芯屑械褉 褕褌邪斜械谢械褉邪</label>
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
<div id="source-select" class="operator-item">
- <span class="select-title">婧愮珯/婧愬簱浣�</span>
+ <span class="select-title" style="width: 250px">袠褋褏芯写薪邪褟 褋褌邪薪褑懈褟/袠褋褏芯写薪褘泄 褋泻谢邪写</span>
<div class="select-container">
<div class="select-container-item">
- <span>绔�</span>
+ <span>袠褋褏芯写薪邪褟 褋褌邪薪褑懈褟</span>
<label><input id="sourceStaNo" type="number" name="points" min="0" /></label>
</div>
<div class="select-container-item">
- <span>鎺�</span>
+ <span>袪褟写</span>
<label><input id="sourceRow" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
</div>
<div class="select-container-item">
- <span>鍒�</span>
+ <span>袣芯谢芯薪泻邪</span>
<label><input id="sourceBay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
</div>
<div class="select-container-item">
- <span>灞�</span>
+ <span>携褉褍褋</span>
<label><input id="sourceLev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
</div>
</div>
</div>
<!-- 鐩爣绔�/鐩爣搴撲綅 閫夋嫨 -->
<div id="target-select" class="operator-item">
- <span class="select-title">鐩爣绔�/鐩爣搴撲綅</span>
+ <span class="select-title" style="width: 250px">笑械谢械胁邪褟 褋褌邪薪褑懈褟/笑械谢械胁芯泄 褋泻谢邪写</span>
<div class="select-container">
<div class="select-container-item">
- <span>绔�</span>
+ <span>笑械谢械胁邪褟 褋褌邪薪褑懈褟</span>
<label><input id="staNo" type="number" name="points" min="0" /></label>
</div>
<div class="select-container-item">
- <span>鎺�</span>
+ <span>袪褟写</span>
<label><input id="row" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
</div>
<div class="select-container-item">
- <span>鍒�</span>
+ <span>袣芯谢芯薪泻邪</span>
<label><input id="bay" type="number" name="points" min="0" style="background-color: #a9eeff" value="0" /></label>
</div>
<div class="select-container-item">
- <span>灞�</span>
+ <span>携褉褍褋</span>
<label><input id="lev" type="number" name="points" min="1" style="background-color: #a9eeff" value="1" /></label>
</div>
</div>
@@ -204,20 +204,20 @@
<!-- 璁惧浠诲姟鎿嶄綔 -->
<div class="task-operator">
<fieldset>
- <legend>鎵嬪姩鎿嶄綔</legend>
+ <legend>袪褍褔薪芯泄</legend>
<div class="button-group">
- <button class="item" onclick="put()">鍏ュ簱</button>
- <button class="item" onclick="take()">鍑哄簱</button>
- <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
- <button class="item" onclick="siteMove()">绔欏埌绔�</button>
+ <button class="item" onclick="put()">袩芯褋褌褍锌谢械薪懈械 薪邪 褋泻谢邪写</button>
+ <button class="item" onclick="take()">袙褘胁芯蟹 褋芯 褋泻谢邪写邪</button>
+ <button class="item" onclick="stockMove()">袩械褉械屑械褖械薪懈械 褟褔械械泻 褋泻谢邪写邪</button>
+ <button class="item" onclick="siteMove()">袨褌 褋褌邪薪褑懈懈 写芯 褋褌邪薪褑懈懈</button>
<!-- <button class="item" onclick="bacOrigin()">鍥炲師鐐�</button>-->
<!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
<!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
- <button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
+ <button class="item" onclick="taskComplete()">袟邪写邪褔邪 胁褘锌芯谢薪械薪邪</button>
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
- <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
- <button class="item" onclick="handleReset()">澶嶄綅</button>
+ <button class="item" onclick="clearCommand()">袨褔懈褋褌懈褌褜 泻芯屑邪薪写褍</button>
+ <button class="item" onclick="handleReset()"> 小斜褉芯褋懈褌褜 </button>
</div>
</fieldset>
</div>
@@ -584,7 +584,7 @@
if (res.code === 200) {
crnDemoData = res.data;
crnDemoData.forEach(function (e) {
- $("#demoBtn-"+e.crnNo).html(e.demo?'鍋滄':'婕旂ず');
+ $("#demoBtn-"+e.crnNo).html(e.demo?'鍋滄':'袛械屑芯薪褋褌褉邪褑懈褟');
})
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
@@ -606,7 +606,7 @@
opt = !crnDemoData[i].demo;
}
}
- layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '婕旂ず鍚楋紵', function(){
+ layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾'+ (opt?'寮�濮�':'鍋滄') + '袛械屑芯薪褋褌褉邪褑懈褟锛�', function(){
doDemo(crnId, 'root', opt); // 鍋滄wcs绯荤粺
});
}
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index e5fe9d1..6efae4f 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -20,10 +20,10 @@
<!-- </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 class="cl-effect-4" style="width: 300px">
+ <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>
@@ -57,7 +57,7 @@
function news() {
layx.iframe(
'wcs-news' // id
- , '绯荤粺鍒嗘瀽鎶ュ憡'
+ , '袨褌褔械褌 锌芯 邪薪邪谢懈蟹褍 褋懈褋褌械屑褘'
, "news.html"
, {
shadow:false
@@ -69,7 +69,7 @@
// , control:false
, opacity:0.9
, border:false
- , icon:'<img src="../static/images/favicon.ico" style="height:22px;display:block;" alt=""/>'
+ // , icon:'<img src="../static/images/favicon.ico" style="height:22px;display:block;" alt=""/>'
, stickMenu:true
, maxMenu:false
, closeMenu:false
diff --git a/src/main/webapp/views/indexTV.html b/src/main/webapp/views/indexTV.html
index 7477c33..44e5b1a 100644
--- a/src/main/webapp/views/indexTV.html
+++ b/src/main/webapp/views/indexTV.html
@@ -29,7 +29,7 @@
<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="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>
diff --git a/src/main/webapp/views/pipeline.html b/src/main/webapp/views/pipeline.html
index c316cbd..7ca0d42 100644
--- a/src/main/webapp/views/pipeline.html
+++ b/src/main/webapp/views/pipeline.html
@@ -81,14 +81,14 @@
<!-- 涓讳綋 -->
<div class="plc-log-body">
<div>
- <span style="color: #1E9FFF">PLC寮傚父淇℃伅琛�:</span>
+ <span style="color: #1E9FFF">PLC 孝邪斜谢懈褑邪 邪薪芯屑邪谢褜薪芯泄 懈薪褎芯褉屑邪褑懈懈:</span>
</div>
<table id="plc-error-table">
<thead>
<tr>
- <th style="width: 200px">搴忓彿</th>
- <th style="width: 400px">PLC閿欒鎻忚堪</th>
- <th style="width: 400px">寮傚父</th>
+ <th style="width: 200px">袧芯屑械褉</th>
+ <th style="width: 400px">PLC 袨锌懈褋邪薪懈械 芯褕懈斜泻懈</th>
+ <th style="width: 400px">袗薪芯屑邪谢懈褟</th>
</tr>
</thead>
<tbody>
@@ -106,16 +106,16 @@
<!-- 琛ㄥご -->
<thead style="position:sticky;top: 0;">
<tr>
- <th>绔欏彿</th>
- <th>宸ヤ綔鍙�</th>
- <th>鑷姩</th>
- <th>鏈夌墿</th>
- <th>鍙叆</th>
- <th>鍙嚭</th>
- <th>鍏ュ簱鏍囪</th>
- <th>绌烘澘淇″彿</th>
- <th>鐩爣绔�</th>
- <th>楂樹綆搴撲綅</th>
+ <th>袪邪斜芯褔邪褟 褋褌邪薪褑懈褟</th>
+ <th>袧芯屑械褉 蟹邪写邪薪懈褟</th>
+ <th>袗胁褌芯屑邪褌懈褔械褋泻懈</th>
+ <th>袝褋褌褜 褌芯胁邪褉</th>
+ <th>袛芯褋褌褍锌薪芯 写谢褟 锌芯褋锌褍锌谢械薪懈褟</th>
+ <th>袛芯褋褌褍锌薪芯 写谢褟 胁褘谐褉褍蟹泻懈</th>
+ <th>袦邪褉泻械褉 薪邪 褋泻谢邪写械</th>
+ <th>小懈谐薪邪谢 锌褍褋褌芯泄 锌邪谢械褌褘</th>
+ <th>笑械谢械胁邪褟 褋褌邪薪褑懈褟</th>
+ <th>袙褘褋芯泻懈泄 懈 薪懈蟹泻懈泄 褍褉芯胁械薪褜 褋泻谢邪写邪</th>
</tr>
</thead>
<!-- 琛ㄦ牸鍐呭 -->
--
Gitblit v1.9.1