From 632c1351c9f0ba96d1f43e46aed2bcbd4a50e7d6 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 21 十月 2024 14:13:36 +0800
Subject: [PATCH] *
---
src/main/webapp/views/ste.html | 259 ++++++++++++++++++++++-----------------------------
1 files changed, 111 insertions(+), 148 deletions(-)
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index 441dacf..37064e3 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -13,135 +13,134 @@
<script type="text/javascript" src="../static/js/common.js"></script>
</head>
<body>
- <div style="padding: 10px;height: 100%;float: left;width: 6%">
- <div class="button-window"></div>
- </div>
- <div style="height: 100%;padding-left: 6%">
- <div style="padding: 10px;height: 100%">
- <!-- 鏃ュ織鐩戞帶鏉� -->
- <div class="log-board">
- <div class="command-log">
- <div data-steNo="1" class="ste-command-item">
- <label>1#</label>
- <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
-<!-- <button id="mode-1" class="demoBtn mode-btn" > - </button>-->
- </div>
- <div data-steNo="2" class="ste-command-item">
- <label>2#</label>
- <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
-<!-- <button id="mode-2" class="demoBtn mode-btn" > - </button>-->
- </div>
- <div data-steNo="3" class="ste-command-item">
- <label>3#</label>
- <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
-<!-- <button id="mode-3" class="demoBtn mode-btn" > - </button>-->
- </div>
+<div style="padding: 10px;height: 100%;float: left;width: 6%">
+ <div class="button-window"></div>
+</div>
+<div style="height: 100%;padding-left: 6%">
+ <div style="padding: 10px;height: 100%">
+ <!-- 鏃ュ織鐩戞帶鏉� -->
+ <div class="log-board">
+ <div class="command-log">
+ <div data-steNo="1" class="ste-command-item" style="margin-top: 30px">
+ <label>1#</label>
+ <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
+ <!-- <button id="mode-1" class="demoBtn mode-btn" > - </button>-->
</div>
- <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
- <div class="ste-state">
- <table id="ste-state-table">
- <thead>
- <tr>
- <th>绌挎杞�</th>
- <th>妯″紡</th>
- <th>鐘舵��</th>
- <th>鏈夌墿</th>
- <th>鍦ㄨ建</th>
- <th>鐢甸噺</th>
- <th>鎺�</th>
- <th>鍒�</th>
- <th>灞�</th>
- <th>绛夊緟WCS纭</th>
- <th>瀹氫綅</th>
- <th>鍏呯數鐘舵��</th>
- <th>鎶ヨ淇℃伅1</th>
- <th>鎶ヨ淇℃伅2</th>
- </tr>
- </thead>
- <tbody>
- </tbody>
- </table>
+ <div data-steNo="2" class="ste-command-item" style="margin-top: 30px">
+ <label>2#</label>
+ <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
+ <!-- <button id="mode-2" class="demoBtn mode-btn" > - </button>-->
+ </div>
+ <div data-steNo="3" class="ste-command-item" style="margin-top: 30px">
+ <label>3#</label>
+ <button class="demoBtn pos-btn">鏁版嵁缁存姢</button>
+ <!-- <button id="mode-3" class="demoBtn mode-btn" > - </button>-->
</div>
</div>
- <!-- 绌挎杞︾姸鎬� -->
- <div class="ste-msg">
- <table id="ste-msg-table">
+ <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
+ <div class="ste-state">
+ <table id="ste-state-table">
<thead>
- <tr>
- <th>绌挎杞�</th>
- <th>宸ヤ綔鍙�</th>
- <th>鐘舵��</th>
- <th>婧愮珯</th>
- <th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
- <th>閫熷害</th>
- <th>杩戠偣璺濈</th>
- <th>浣滀笟鏍囪</th>
- </tr>
+ <tr>
+ <th>绌挎杞�</th>
+ <th>妯″紡</th>
+ <th>鐘舵��</th>
+ <th>鏈夌墿</th>
+ <th>鍦ㄨ建</th>
+ <th>鐢甸噺</th>
+ <th>鎺�</th>
+ <th>鍒�</th>
+ <th>灞�</th>
+ <th>绛夊緟WCS纭</th>
+ <th>瀹氫綅</th>
+ <th>鍏呯數鐘舵��</th>
+ <th>鎶ヨ淇℃伅1</th>
+ <th>璁惧淇℃伅</th>
+ </tr>
</thead>
<tbody>
</tbody>
</table>
</div>
- <!-- 鎵嬪姩鎿嶄綔 -->
- <div class="ste-operation">
- <!-- 閬僵灞� -->
- <div class="ste-operation-shade">
+ </div>
+ <!-- 绌挎杞︾姸鎬� -->
+ <div class="ste-msg">
+ <table id="ste-msg-table">
+ <thead>
+ <tr>
+ <th>绌挎杞�</th>
+ <th>宸ヤ綔鍙�</th>
+ <th>鐘舵��</th>
+ <th>婧愮珯</th>
+ <th>鐩爣绔�</th>
+ <th>婧愬簱浣�</th>
+ <th>鐩爣搴撲綅</th>
+ <th>閫熷害</th>
+ <th>杩戠偣璺濈</th>
+ <th>浣滀笟鏍囪</th>
+ </tr>
+ </thead>
+ <tbody>
+ </tbody>
+ </table>
+ </div>
+ <!-- 鎵嬪姩鎿嶄綔 -->
+ <div class="ste-operation">
+ <!-- 閬僵灞� -->
+ <div class="ste-operation-shade">
<span class="ste-operation-shade-span">
WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
</span>
- </div>
- <!-- 璁惧浠诲姟閫夋嫨 -->
- <div class="task-select">
- <!-- 閫夋嫨 -->
- <div id="ste-select" class="operator-item">
- <span class="select-title">绌挎杞﹀彿</span>
- <div class="select-container">
- <label><input type="radio" name="steSelect" value="1" checked> 1鍙风┛姊溅</label>
- <label><input type="radio" name="steSelect" value="2"> 2鍙风┛姊溅</label>
- <label><input type="radio" name="steSelect" value="3"> 3鍙风┛姊溅</label>
- </div>
+ </div>
+ <!-- 璁惧浠诲姟閫夋嫨 -->
+ <div class="task-select">
+ <!-- 閫夋嫨 -->
+ <div id="ste-select" class="operator-item">
+ <span class="select-title">绌挎杞﹀彿</span>
+ <div class="select-container">
+ <label><input type="radio" name="steSelect" value="1" checked> 1鍙风┛姊溅</label>
+ <label><input type="radio" name="steSelect" value="2"> 2鍙风┛姊溅</label>
+ <label><input type="radio" name="steSelect" value="3"> 3鍙风┛姊溅</label>
</div>
</div>
- <!-- 璁惧浠诲姟鎿嶄綔 -->
- <div class="task-operator">
- <fieldset>
- <legend>鎵嬪姩鎿嶄綔</legend>
- <div class="button-group">
- <button class="item" onclick="steOperator(99)">鑱旀満</button>
- <button class="item" onclick="steOperator(100)">鑴辨満</button>
- <button class="item" onclick="steOperator(1)">鍚戝彸鍑哄簱</button>
- <button class="item" onclick="steOperator(2)">鍚戝乏鍑哄簱</button>
- <button class="item" onclick="steOperator(3)">浠庡彸鍏ュ簱</button>
- <button class="item" onclick="steOperator(4)">浠庡乏鍏ュ簱</button>
- <button class="item" onclick="steOperator(5)">宸︾Щ搴�</button>
- <button class="item" onclick="steOperator(6)">鍙崇Щ搴�</button>
- <button class="item" onclick="steOperator(7)">鍘诲彸绔�</button>
- <button class="item" onclick="steOperator(8)">鍘诲乏绔�</button>
- <button class="item" onclick="steOperator(9)">鍙冲緟鏈�</button>
- <button class="item" onclick="steOperator(10)">宸﹀緟鏈�</button>
-<!-- <button class="item" onclick="steOperator(11)">宸︽惉绉�</button>-->
-<!-- <button class="item" onclick="steOperator(12)">鍙虫惉绉�</button>-->
-<!-- <button class="item" onclick="steOperator(13)">宸﹀厖鐢�</button>-->
-<!-- <button class="item" onclick="steOperator(14)">鍙冲厖鐢�</button>-->
- <button class="item" onclick="steOperator(20)">鏂紑鍏呯數妗�</button>
- <button class="item" onclick="steOperator(21)">灏忚溅鍏呯數缁撴潫</button>
-<!-- <button class="item" onclick="steOperator(14)">宸︾洏鐐�</button>-->
-<!-- <button class="item" onclick="steOperator(15)">鍙崇洏鐐�</button>-->
- <button class="item" onclick="steOperator(16)">浠诲姟瀹屾垚</button>
-
- </div>
- </fieldset>
- </div>
-
</div>
- <!-- 绌挎杞︽棩蹇楄緭鍑� -->
- <div class="ste-output-board">
- <textarea id="ste-output"></textarea>
+ <!-- 璁惧浠诲姟鎿嶄綔 -->
+ <div class="task-operator">
+ <fieldset>
+ <legend>鎵嬪姩鎿嶄綔</legend>
+ <div class="button-group">
+<!-- <button class="item" onclick="steOperator(99)">鑱旀満</button>-->
+<!-- <button class="item" onclick="steOperator(100)">鑴辨満</button>-->
+<!-- <button class="item" onclick="steOperator(1)">鍚戝乏鍑哄簱</button>-->
+<!-- <button class="item" onclick="steOperator(2)">鍚戝彸鍑哄簱</button>-->
+<!-- <button class="item" onclick="steOperator(3)">浠庡乏鍏ュ簱</button>-->
+<!-- <button class="item" onclick="steOperator(4)">浠庡彸鍏ュ簱</button>-->
+<!-- <button class="item" onclick="steOperator(5)">宸︾Щ搴�</button>-->
+<!-- <button class="item" onclick="steOperator(6)">鍙崇Щ搴�</button>-->
+<!-- <button class="item" onclick="steOperator(8)">鍘诲乏绔�</button>-->
+<!-- <button class="item" onclick="steOperator(7)">鍘诲彸绔�</button>-->
+<!-- <button class="item" onclick="steOperator(10)">宸﹀緟鏈�</button>-->
+<!-- <button class="item" onclick="steOperator(9)">鍙冲緟鏈�</button>-->
+ <!-- <button class="item" onclick="steOperator(11)">宸︽惉绉�</button>-->
+ <!-- <button class="item" onclick="steOperator(12)">鍙虫惉绉�</button>-->
+<!-- <button class="item" onclick="steOperator(13)">宸﹀厖鐢�</button>-->
+<!-- <button class="item" onclick="steOperator(14)">鍙冲厖鐢�</button>-->
+<!-- <button class="item" onclick="steOperator(17)">鏂紑鍏呯數</button>-->
+ <!-- <button class="item" onclick="steOperator(14)">宸︾洏鐐�</button>-->
+ <!-- <button class="item" onclick="steOperator(15)">鍙崇洏鐐�</button>-->
+<!-- <button class="item" onclick="steOperator(16)">浠诲姟瀹屾垚</button>-->
+
+ </div>
+ </fieldset>
</div>
+
+ </div>
+ <!-- 绌挎杞︽棩蹇楄緭鍑� -->
+ <div class="ste-output-board">
+ <textarea id="ste-output"></textarea>
</div>
</div>
+</div>
<div id="ste-detl" style="display: none">
<div>
@@ -191,7 +190,7 @@
<button class="form-button" id="save">淇濆瓨</button>
<button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
</div>
- </di>
+ </div>
</div>
</body>
</html>
@@ -350,42 +349,6 @@
setVal(tr.children("td").eq(11), table[i-1].chargeStatus);
setVal(tr.children("td").eq(12), table[i-1].alarm1);
setVal(tr.children("td").eq(13), table[i-1].alarm2);
- }
- } else if (res.code === 403){
- window.location.href = baseUrl+"/login";
- } else {
- console.log(res.msg);
- }
- }
- });
- }
-
- // 绌挎杞︽暟鎹〃鑾峰彇 ---- 琛ㄤ簩
- function getSteMsgInfo() {
- let tableEl = $('#ste-msg-table');
- $.ajax({
- url: baseUrl+ "/ste/table/ste/msg",
- headers: {'token': localStorage.getItem('token')},
- method: 'POST',
- success: function (res) {
- if (res.code === 200){
- var table = res.data;
- if (table.length > steMsgTableBlankRows && table.length !== steMsgTableFullRows) {
- initSteMsgTable(table.length-steMsgTableBlankRows);
- steMsgTableFullRows = table.length;
- }
- for (var i=1;i<=table.length;i++){
- var tr = tableEl.find("tr").eq(i);
- setVal(tr.children("td").eq(0), table[i-1].steNo);
- setVal(tr.children("td").eq(1), table[i-1].workNo);
- setVal(tr.children("td").eq(2), table[i-1].status);
- setVal(tr.children("td").eq(3), table[i-1].sourceStaNo);
- setVal(tr.children("td").eq(4), table[i-1].staNo);
- setVal(tr.children("td").eq(5), table[i-1].sourceLocNo);
- setVal(tr.children("td").eq(6), table[i-1].locNo);
- setVal(tr.children("td").eq(7), table[i-1].speed);
- setVal(tr.children("td").eq(8), table[i-1].closer);
- setVal(tr.children("td").eq(9), table[i-1].pakMk);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
--
Gitblit v1.9.1