From 23e81c5d24c37a87fbbbf67c68b17e8f78832148 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 03 十一月 2025 18:56:42 +0800
Subject: [PATCH] *
---
src/main/webapp/views/deviceOperate/crnOperate.html | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index f32bc2f..1fadd15 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -28,6 +28,10 @@
</el-table-column>
<el-table-column property="deviceStatus" label="璁惧鐘舵��">
</el-table-column>
+ <el-table-column property="taskComplete" label="浠诲姟瀹屾垚鎸囦护">
+ </el-table-column>
+ <el-table-column property="errorCrn" label="寮傚父鎻愮ず">
+ </el-table-column>
</el-table>
</div>
@@ -39,9 +43,9 @@
</div>
<div>
<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="婧愮珯/婧愬簱浣�">
- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>
- </el-form-item>
+<!-- <el-form-item label="婧愮珯/婧愬簱浣�">-->
+<!-- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="鎺�">
<el-input v-model="formParam.sourceRow" placeholder="鎺�"></el-input>
</el-form-item>
@@ -53,9 +57,9 @@
</el-form-item>
</el-form>
<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="鐩爣绔�/鐩爣搴撲綅">
- <el-input v-model="formParam.staNo" placeholder="鐩爣绔�/鐩爣搴撲綅"></el-input>
- </el-form-item>
+<!-- <el-form-item label="鐩爣绔�/鐩爣搴撲綅">-->
+<!-- <el-input v-model="formParam.staNo" placeholder="鐩爣绔�/鐩爣搴撲綅"></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="鎺�">
<el-input v-model="formParam.row" placeholder="鎺�"></el-input>
</el-form-item>
@@ -77,9 +81,13 @@
<div>
<!-- <el-button @click="requestOperate('put')" type="primary">鍏ュ簱</el-button>-->
<!-- <el-button @click="requestOperate('take')" type="primary">鍑哄簱</el-button>-->
-<!-- <el-button @click="requestOperate('stockMove')" type="primary">搴撲綅杞Щ</el-button>-->
+ <el-button @click="requestOperate('stockMove')" type="primary">搴撲綅杞Щ</el-button>
+
+ <div style="margin-top: 10px">
+ <el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>
+ <el-button @click="requestOperate('taskCompleteClearCommand')" type="primary">浠诲姟瀹屾垚鎸囦护娓呴櫎</el-button>
+ </div>
<!-- <el-button @click="requestOperate('siteMove')" type="primary">绔欏埌绔�</el-button>-->
-<!-- <el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>-->
<!-- <el-button @click="requestOperate('clearCommand')" type="primary">娓呴櫎鍛戒护</el-button>-->
<!-- <el-button @click="requestOperate('reset')" type="primary">澶嶄綅</el-button>-->
<br/>
@@ -166,6 +174,8 @@
</el-descriptions-item>
<el-descriptions-item label="鍗囬檷鏃堕暱(H)">{{ tableData[currentIndex].yduration }}
</el-descriptions-item>
+ <el-descriptions-item label="寮傚父鎻愮ず">{{ tableData[currentIndex].errorCrn }}
+ </el-descriptions-item>
</el-descriptions>
</div>
</div>
--
Gitblit v1.9.1