From bbcfa19680df44bb531e819585bf7c82553f6828 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 24 五月 2025 08:14:14 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/crn.html |   52 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index cf44fb9..d76e511 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -77,12 +77,6 @@
                     <!--            <span>&nbsp;</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>&nbsp;</span>-->
-                    <input id="crn5" disabled="disabled">
-                </div>
             </div>
             <!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
             <div class="crn-state">
@@ -122,10 +116,10 @@
                     <th>璧拌閫熷害锛坢/min)</th>
                     <th>鍗囬檷閫熷害锛坢/min)</th>
                     <th>鍙夌墮閫熷害锛坢/min)</th>
-                    <th>璧拌璺濈(m)</th>
-                    <th>鍗囬檷璺濈(m)</th>
-                    <th>璧拌鏃堕暱(s)</th>
-                    <th>鍗囬檷鏃堕暱(s)</th>
+                    <th>璧拌璺濈(Km)</th>
+                    <th>鍗囬檷璺濈(Km)</th>
+                    <th>璧拌鏃堕暱(H)</th>
+                    <th>鍗囬檷鏃堕暱(H)</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -145,14 +139,13 @@
             <!-- 璁惧浠诲姟閫夋嫨 -->
             <div class="task-select">
                 <!-- 鍫嗗灈鏈洪�夋嫨 -->
-                <div id="crn-select" class="operator-item">
+                <div id="crn-select" class="operator-item" style="width: 55%">
                     <span class="select-title">鍫嗗灈鏈哄彿</span>
-                    <div class="select-container">
+                    <div class="select-container" style="padding: 20px 0;">
                         <label><input type="radio" name="crnSelect" value="1" checked>&nbsp;1鍙峰爢鍨涙満</label>
-                        <label><input type="radio" name="crnSelect" value="2">&nbsp;2鍙峰爢鍨涙満</label>
-                        <label><input type="radio" name="crnSelect" value="3">&nbsp;3鍙峰爢鍨涙満</label>
-                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4鍙峰爢鍨涙満</label>
-                        <label><input type="radio" name="crnSelect" value="5">&nbsp;5鍙峰爢鍨涙満</label>
+<!--                        <label><input type="radio" name="crnSelect" value="2">&nbsp;2鍙峰爢鍨涙満</label>-->
+<!--                        <label><input type="radio" name="crnSelect" value="3">&nbsp;3鍙峰爢鍨涙満</label>-->
+<!--                        <label><input type="radio" name="crnSelect" value="4">&nbsp;4鍙峰爢鍨涙満</label>-->
                     </div>
                 </div>
                 <!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
@@ -206,18 +199,20 @@
                 <fieldset>
                     <legend>鎵嬪姩鎿嶄綔</legend>
                     <div class="button-group">
-                        <button class="item" onclick="put()">鍏ュ簱</button>
-                        <button class="item" onclick="take()">鍑哄簱</button>
+<!--                        <button class="item" onclick="put()">鍏ュ簱</button>-->
+<!--                        <button class="item" onclick="take()">鍑哄簱</button>-->
                         <button class="item" onclick="stockMove()">搴撲綅杞Щ</button>
-                        <button class="item" onclick="siteMove()">绔欏埌绔�</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="taskComplete()">浠诲姟瀹屾垚</button>
+                        <button class="item" onclick="taskRe()">鎭㈠鑱旀満浠诲姟</button>
+                        <button class="item" onclick="taskClear()">娓呴櫎鑱旀満浠诲姟</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>
+<!--                        <button class="item" onclick="clearCommand()">娓呴櫎鍛戒护</button>-->
+<!--                        <button class="item" onclick="handleReset()">澶嶄綅</button>-->
                     </div>
                 </fieldset>
             </div>
@@ -451,6 +446,20 @@
         });
     }
 
+    // 浠诲姟瀹屾垚
+    function taskRe() {
+        http.post(baseUrl+"/crn/operator/taskRe", getReqParam(), function (res) {
+            layer.msg(res.msg);
+        });
+    }
+
+    // 浠诲姟瀹屾垚
+    function taskClear() {
+        http.post(baseUrl+"/crn/operator/taskClear", getReqParam(), function (res) {
+            layer.msg(res.msg);
+        });
+    }
+
     // 鏆傚仠
     function pause() {
         http.post(baseUrl+"/crn/operator/pause", getReqParam(), function (res) {
@@ -486,6 +495,7 @@
             headers: {'token': localStorage.getItem('token')},
             method: 'POST',
             success: function (res) {
+                console.log(res)
                 if (res.code === 200) {
                     crnOutput(res.data);
                 } else if (res.code === 403) {

--
Gitblit v1.9.1