From 8e120d28b0c2c95c7bdc4b8c33a96e0eb875291a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 15:39:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 61 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 24 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 5d08665..04c02b2 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -48,9 +48,15 @@
<h2>鎵ц涓殑鍛戒护</h2>
<div class="crn-command-item">
<label>1#</label>
- <button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)">婕旂ず</button>
- <!-- <span> </span>-->
+<!-- <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>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
@@ -64,13 +70,13 @@
<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>
<tbody>
@@ -94,10 +100,10 @@
<th>璧拌閫熷害锛坢/min)</th>
<th>鍗囬檷閫熷害锛坢/min)</th>
<th>鍙夌墮閫熷害锛坢/min)</th>
- <th>璧拌璺濈(Km)</th>
- <th>鍗囬檷璺濈(Km)</th>
- <th>璧拌鏃堕暱(H)</th>
- <th>鍗囬檷鏃堕暱(H)</th>
+ <th>璧拌璺濈(m)</th>
+ <th>鍗囬檷璺濈(m)</th>
+ <th>璧拌鏃堕暱(s)</th>
+ <th>鍗囬檷鏃堕暱(s)</th>
</tr>
</thead>
<tbody>
@@ -179,9 +185,9 @@
<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="bacOrigin()">鍥炲師鐐�</button>-->
+<!-- <button class="item" onclick="reverseOrigin()">鍙嶅師鐐�</button>-->
+<!-- <button class="item" onclick="coorMove()">鍧愭爣绉昏</button>-->
<button class="item" onclick="taskComplete()">浠诲姟瀹屾垚</button>
<!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
<!-- <button class="item" onclick="boot()">鍚姩</button>-->
@@ -281,13 +287,13 @@
setVal(tr.children("td").eq(3), table[i-1].loading);
setVal(tr.children("td").eq(4), table[i-1].bay);
setVal(tr.children("td").eq(5), table[i-1].lev);
- setVal(tr.children("td").eq(6), table[i-1].xorigin);
- setVal(tr.children("td").eq(7), table[i-1].yorigin);
+ setVal(tr.children("td").eq(6), table[i-1].liftPos);
+ setVal(tr.children("td").eq(7), table[i-1].sitePos);
setVal(tr.children("td").eq(8), table[i-1].forkOffset);
- setVal(tr.children("td").eq(9), table[i-1].xlocation);
- setVal(tr.children("td").eq(10), table[i-1].ylocation);
- setVal(tr.children("td").eq(11), table[i-1].stop);
- setVal(tr.children("td").eq(12), table[i-1].warnCode);
+ setVal(tr.children("td").eq(9), table[i-1].alarm1);
+ setVal(tr.children("td").eq(10), table[i-1].alarm2);
+ setVal(tr.children("td").eq(11), table[i-1].alarm3);
+ setVal(tr.children("td").eq(12), table[i-1].alarm4);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -544,11 +550,18 @@
crnOutputDom.scrollTop = crnOutputDom.scrollHeight;
}
+ // function demoSwitch(el) {
+ // var crnId = el.split("-")[1];
+ // layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺紑濮�'+crnId+"鍙峰爢鍨涙満婕旂ず", formType: 1, shadeClose: true}, function (pass, idx) {
+ // layer.close(idx);
+ // doDemo(crnId, pass); // 鍋滄wcs绯荤粺
+ // });
+ // }
+
function demoSwitch(el) {
var crnId = el.split("-")[1];
- layer.prompt({title: '璇疯緭鍏ュ彛浠わ紝骞跺紑濮�'+crnId+"鍙峰爢鍨涙満婕旂ず", formType: 1, shadeClose: true}, function (pass, idx) {
- layer.close(idx);
- doDemo(crnId, pass); // 鍋滄wcs绯荤粺
+ layer.confirm(crnId + ' 鍙峰爢鍨涙満纭畾寮�濮嬫紨绀哄悧锛�', function(){
+ doDemo(crnId, 'root'); // 鍋滄wcs绯荤粺
});
}
--
Gitblit v1.9.1