From 637c501781b8112935f0b62e439a39d669542012 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 24 八月 2022 14:01:02 +0800
Subject: [PATCH] #
---
src/main/webapp/static/images/ste/4@1x.png | 0
src/main/webapp/static/images/ste/5@1x.png | 0
src/main/webapp/static/images/ste/6@1x.png | 0
src/main/webapp/static/images/ste/3@1x.png | 0
src/main/webapp/views/crn.html | 2
src/main/webapp/views/index.html | 1
src/main/webapp/views/ste.html | 168 +++++++++++++++++++++++++++++++++++++++++++++----------
src/main/webapp/static/images/ste/1@1x.png | 0
src/main/webapp/static/images/ste/2@1x.png | 0
src/main/webapp/static/images/ste/7@1x.png | 0
src/main/webapp/static/images/ste/8@1x.png | 0
11 files changed, 137 insertions(+), 34 deletions(-)
diff --git a/src/main/webapp/static/images/ste/1@1x.png b/src/main/webapp/static/images/ste/1@1x.png
new file mode 100644
index 0000000..9f5af28
--- /dev/null
+++ b/src/main/webapp/static/images/ste/1@1x.png
Binary files differ
diff --git a/src/main/webapp/static/images/ste/2@1x.png b/src/main/webapp/static/images/ste/2@1x.png
new file mode 100644
index 0000000..085b89d
--- /dev/null
+++ b/src/main/webapp/static/images/ste/2@1x.png
Binary files differ
diff --git a/src/main/webapp/static/images/ste/3@1x.png b/src/main/webapp/static/images/ste/3@1x.png
new file mode 100644
index 0000000..7636a3a
--- /dev/null
+++ b/src/main/webapp/static/images/ste/3@1x.png
Binary files differ
diff --git a/src/main/webapp/static/images/ste/4@1x.png b/src/main/webapp/static/images/ste/4@1x.png
new file mode 100644
index 0000000..c7c733b
--- /dev/null
+++ b/src/main/webapp/static/images/ste/4@1x.png
Binary files differ
diff --git a/src/main/webapp/static/images/ste/5@1x.png b/src/main/webapp/static/images/ste/5@1x.png
new file mode 100644
index 0000000..261c08b
--- /dev/null
+++ b/src/main/webapp/static/images/ste/5@1x.png
Binary files differ
diff --git a/src/main/webapp/static/images/ste/6@1x.png b/src/main/webapp/static/images/ste/6@1x.png
new file mode 100644
index 0000000..d1bac88
--- /dev/null
+++ b/src/main/webapp/static/images/ste/6@1x.png
Binary files differ
diff --git a/src/main/webapp/static/images/ste/7@1x.png b/src/main/webapp/static/images/ste/7@1x.png
new file mode 100644
index 0000000..09f71e0
--- /dev/null
+++ b/src/main/webapp/static/images/ste/7@1x.png
Binary files differ
diff --git a/src/main/webapp/static/images/ste/8@1x.png b/src/main/webapp/static/images/ste/8@1x.png
new file mode 100644
index 0000000..c83ebb5
--- /dev/null
+++ b/src/main/webapp/static/images/ste/8@1x.png
Binary files differ
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 4370c60..7c3986f 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -139,8 +139,6 @@
<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>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index e4de82b..6677af7 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -15,6 +15,7 @@
<!-- <li><a id="console2F" onclick="nav(this.id)" class="nav-select" href="#">2F涓绘帶鍥�</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>
+ <li><a id="ste" onclick="nav(this.id)" class="nav-unselect" href="#">绌挎杞�</a></li>
</ul>
</div>
</div>
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index eba9ade..9734584 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -21,8 +21,7 @@
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
<div class="command-log">
- <h3>绌挎杞︿綅缃�</h3>
- <div class="ste-command-item">
+ <div class="ste-command-item" style="margin-top: 30px">
<label>1#</label>
<div class="dropdown-menu">
<button id="steBtn-1" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
@@ -42,7 +41,7 @@
</ul>
</div>
</div>
- <div class="ste-command-item" style="margin-top: 25px">
+ <div class="ste-command-item" style="margin-top: 30px">
<label>2#</label>
<div class="dropdown-menu">
<button id="steBtn-2" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
@@ -62,7 +61,7 @@
</ul>
</div>
</div>
- <div class="ste-command-item" style="margin-top: 25px">
+ <div class="ste-command-item" style="margin-top: 30px">
<label>3#</label>
<div class="dropdown-menu">
<button id="steBtn-3" class="demoBtn" onclick="changePosition(this.id)">淇敼浣嶇疆</button>
@@ -109,7 +108,7 @@
</table>
</div>
</div>
- <!-- 鍫嗗灈鏈虹姸鎬� -->
+ <!-- 绌挎杞︾姸鎬� -->
<div class="ste-msg">
<table id="ste-msg-table">
<thead>
@@ -138,11 +137,11 @@
<!-- 鎵嬪姩鎿嶄綔 -->
<div class="ste-operation">
<!-- 閬僵灞� -->
-<!-- <div class="ste-operation-shade">-->
-<!-- <span class="ste-operation-shade-span">-->
-<!-- WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔-->
-<!-- </span>-->
-<!-- </div>-->
+ <div class="ste-operation-shade">
+ <span class="ste-operation-shade-span">
+ WCS 绯荤粺杩愯涓紝璇峰仠姝㈠悗鎿嶄綔
+ </span>
+ </div>
<!-- 璁惧浠诲姟閫夋嫨 -->
<div class="task-select">
<!-- 閫夋嫨 -->
@@ -183,7 +182,7 @@
</div>
</div>
- <!-- 鍫嗗灈鏈烘棩蹇楄緭鍑� -->
+ <!-- 绌挎杞︽棩蹇楄緭鍑� -->
<div class="ste-output-board">
<textarea id="ste-output"></textarea>
</div>
@@ -201,28 +200,133 @@
})
</script>
<script>
- // 淇敼绌挎杞︿綅缃�
- function changePosition(id) {
- console.log(id)
- // $.ajax({
- // url: baseUrl +
- // })
- }
- // 绌挎杞︿俊鎭〃鑾峰彇 ---- 琛ㄤ竴
+ // 绌虹櫧琛屾暟
+ var steStateTableBlankRows = 0;
+ var steMsgTableBlankRows = 0;
+ // 瀹為檯琛屾暟
+ var steStateTableFullRows = 0;
+ var steMsgTableFullRows = 0;
+ // 鍒濆鍖�
+ var steOutputDom = document.getElementById("ste-output");
+ $(document).ready(function() {
+ initSteStateTable();
+ getSteStateInfo();
+ initSteMsgTable();
+ getSteMsgInfo();
+ operatorBlockShow();
+ });
- function getSteStateInfo() {
- var tableEl = $('ste-state-table');
- $.ajax({
- url: baseUrl + "/crn/table/crn/state",
- headers: {'token': localStorage.getItem('token')},
- method: 'GET',
- success: function (res) {
- console.log(res)
-
- }
- })
- }
setInterval(function () {
getSteStateInfo()
},1000)
-</script>
\ No newline at end of file
+
+ // 鍒ゆ柇鎵嬪姩鎿嶄綔妯″潡鏄惁鍙敤
+ function operatorBlockShow() {
+ if (parent.systemRunning) {
+ $('.ste-operation').css("opacity", "0.5");
+ $('.ste-operation-shade').show();
+ $('.ste-operation-shade-span').show();
+ } else {
+ $('.ste-operation').css("opacity", "1");
+ $('.ste-operation-shade').hide();
+ $('.ste-operation-shade-span').hide();
+ }
+ }
+
+ // 淇敼绌挎杞︿綅缃�
+ function changePosition(id) {
+
+ }
+
+ // 绌挎杞︿俊鎭〃鑾峰彇 ---- 琛ㄤ竴
+ function getSteStateInfo() {
+ let tableEl = $('ste-state-table');
+ }
+
+ // 绌挎杞︽暟鎹〃鑾峰彇 ---- 琛ㄤ簩
+ function getSteMsgInfo() {
+ let tableEl = $('#ste-msg-table');
+ }
+
+ // ------------------------------------------------------------------------------------------------
+
+ // 绌挎杞︿俊鎭〃鑾峰彇 ----- 琛ㄤ竴
+ function initSteStateTable(row) {
+ let line;
+ if (row === undefined){
+ let one = $('#ste-state-table thead').height();
+ let total = $('.ste-state').height();
+ let count = total / one;
+ count = parseInt(count) - 1;
+ steStateTableBlankRows = count;
+ line = count;
+ } else {
+ line = row;
+ }
+ let html = "";
+ for (let i = 0; i < line; i ++){
+ html += " <tr>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " </tr>\n";
+ }
+ $('#ste-state-table tbody').after(html);
+ }
+
+ // 绌挎杞︽暟鎹〃鑾峰彇 ----- 琛ㄤ簩
+ function initSteMsgTable(row) {
+ let line;
+ if (row === undefined){
+ let one = $('#ste-msg-table thead').height();
+ let total = $('.ste-msg').height();
+ let count = total / one;
+ count = parseInt(count) - 1;
+ steMsgTableBlankRows = count;
+ line = count;
+ } else {
+ line = row;
+ }
+ let html = "";
+ for (let i = 0; i < line; i ++){
+ html += " <tr>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " <td></td>\n" +
+ " </tr>\n";
+ }
+ $('#ste-msg-table tbody').after(html);
+ }
+
+ // 鏃ュ織杈撳嚭妗�
+ function steOutput(content){
+ steOutputDom.value += content;
+ steOutputDom.scrollTop = steOutputDom.scrollHeight;
+ }
+
+
+
+</script>
--
Gitblit v1.9.1