From 2f662f2a75ca9af4d28a9af5eebe3d2a67c5c17c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 三月 2022 13:27:22 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 110 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 63 insertions(+), 47 deletions(-)
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 0a247fa..f4ed572 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -41,13 +41,14 @@
</style>
</head>
<body>
+<div class="button-window"></div>
<!-- 鏃ュ織鐩戞帶鏉� -->
<div class="log-board">
<!-- 鎵ц鍛戒护 -->
<!-- 鎵ц鍛戒护 -->
<div class="command-log">
- <h2>鎵ц涓殑鍛戒护</h2>
+ <h3>鎵ц涓殑鍛戒护</h3>
<div class="crn-command-item">
<label>1#</label>
<button id="demoBtn-1" class="demoBtn" onclick="demoSwitch(this.id)"> - </button>
@@ -60,26 +61,42 @@
<!-- <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>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
<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>鍨傜洿鏁呴殰</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>鏁呴殰浠ｇ爜</th>
+ <th>鏁呴殰鎻忚堪</th>
+ </tr>
</thead>
<tbody>
</tbody>
@@ -90,22 +107,22 @@
<div class="crn-msg">
<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>璧拌璺濈(m)</th>
- <th>鍗囬檷璺濈(m)</th>
- <th>璧拌鏃堕暱(s)</th>
- <th>鍗囬檷鏃堕暱(s)</th>
- </tr>
+ <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>璧拌璺濈(m)</th>
+ <th>鍗囬檷璺濈(m)</th>
+ <th>璧拌鏃堕暱(s)</th>
+ <th>鍗囬檷鏃堕暱(s)</th>
+ </tr>
</thead>
<tbody>
</tbody>
@@ -129,6 +146,9 @@
<div class="select-container">
<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>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -186,12 +206,12 @@
<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>-->
+ <!-- <button class="item" onclick="pause()">鏆傚仠</button>-->
+ <!-- <button class="item" onclick="boot()">鍚姩</button>-->
<button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>
<button class="item" onclick="handleReset()">澶嶄綅</button>
</div>
@@ -289,13 +309,11 @@
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].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].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);
+ setVal(tr.children("td").eq(6), table[i-1].forkOffset);
+ setVal(tr.children("td").eq(7), table[i-1].liftPos);
+ setVal(tr.children("td").eq(8), table[i-1].walkPos);
+ setVal(tr.children("td").eq(9), table[i-1].warnCode);
+ setVal(tr.children("td").eq(10), table[i-1].alarm);
}
} else if (res.code === 403){
window.location.href = baseUrl+"/login";
@@ -502,8 +520,6 @@
" <td></td>\n" +
" <td></td>\n" +
" <td></td>\n" +
- " <td></td>\n" +
- " <td></td>\n" +
" </tr>\n";
}
$('#crn-state-table tbody').after(html);
@@ -618,4 +634,4 @@
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1