From 966626cb396cdd881e4f7684078bbf6dbdabe34f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 19 九月 2025 11:14:08 +0800
Subject: [PATCH] #
---
src/main/webapp/views/realtimeWatch/crn2.html | 99 ++++++++++++++++++++++++-------------------------
1 files changed, 48 insertions(+), 51 deletions(-)
diff --git a/src/main/webapp/views/realtimeWatch/crn2.html b/src/main/webapp/views/realtimeWatch/crn2.html
index ad83a14..59cc02a 100644
--- a/src/main/webapp/views/realtimeWatch/crn2.html
+++ b/src/main/webapp/views/realtimeWatch/crn2.html
@@ -51,45 +51,45 @@
<!-- 鎵ц鍛戒护 -->
<!-- 鎵ц鍛戒护 -->
- <div class="command-log" style="overflow: auto;">
- <h3>鎵ц涓殑鍛戒护</h3>
- <div class="crn-command-item">
- <label>1#</label>
-<!-- <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
- <!-- <span> </span>-->
- <input id="crn1" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>2#</label>
-<!-- <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
- <!-- <span> </span>-->
- <input id="crn2" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>3#</label>
-<!-- <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
- <!-- <span> </span>-->
- <input id="crn3" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>4#</label>
-<!-- <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
- <!-- <span> </span>-->
- <input id="crn4" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>5#</label>
-<!-- <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
- <!-- <span> </span>-->
- <input id="crn5" disabled="disabled">
- </div>
- <div class="crn-command-item">
- <label>6#</label>
-<!-- <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>-->
- <!-- <span> </span>-->
- <input id="crn6" disabled="disabled">
- </div>
- </div>
+<!-- <div class="command-log" style="overflow: auto;">-->
+<!-- <h3>鎵ц涓殑鍛戒护</h3>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>1#</label>-->
+<!--<!– <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>–>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn1" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>2#</label>-->
+<!--<!– <button id="demoBtn-2" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>–>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn2" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>3#</label>-->
+<!--<!– <button id="demoBtn-3" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>–>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn3" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>4#</label>-->
+<!--<!– <button id="demoBtn-4" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>–>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn4" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>5#</label>-->
+<!--<!– <button id="demoBtn-5" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>–>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn5" disabled="disabled">-->
+<!-- </div>-->
+<!-- <div class="crn-command-item">-->
+<!-- <label>6#</label>-->
+<!--<!– <button id="demoBtn-6" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>–>-->
+<!-- <!– <span> </span>–>-->
+<!-- <input id="crn6" disabled="disabled">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
<table id="crn-state-table">
@@ -123,8 +123,7 @@
<th>鐘舵��</th>
<th>婧愮珯</th>
<th>鐩爣绔�</th>
- <th>婧愬簱浣�</th>
- <th>鐩爣搴撲綅</th>
+ <th>鎵樼洏鐮�</th>
<th>璧拌閫熷害锛坢/min)</th>
<th>鍗囬檷閫熷害锛坢/min)</th>
<th>鍙夌墮閫熷害锛坢/min)</th>
@@ -358,15 +357,14 @@
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].xspeed);
- setVal(tr.children("td").eq(8), table[i-1].yspeed);
- setVal(tr.children("td").eq(9), table[i-1].zspeed);
- setVal(tr.children("td").eq(10), table[i-1].xdistance);
- setVal(tr.children("td").eq(11), table[i-1].ydistance);
- setVal(tr.children("td").eq(12), table[i-1].xduration);
- setVal(tr.children("td").eq(13), table[i-1].yduration);
+ setVal(tr.children("td").eq(5), table[i-1].origin);
+ setVal(tr.children("td").eq(6), table[i-1].xspeed);
+ setVal(tr.children("td").eq(7), table[i-1].yspeed);
+ setVal(tr.children("td").eq(8), table[i-1].zspeed);
+ setVal(tr.children("td").eq(9), table[i-1].xdistance);
+ setVal(tr.children("td").eq(10), table[i-1].ydistance);
+ setVal(tr.children("td").eq(11), table[i-1].xduration);
+ setVal(tr.children("td").eq(12), table[i-1].yduration);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -555,7 +553,6 @@
var html = "";
for (var i = 0; i < line; i ++){
html += " <tr>\n" +
- " <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
--
Gitblit v1.9.1