From 3b5b98a9911e3231cefe5ab4f47a4c9d94e5a2f7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 十一月 2023 16:15:01 +0800
Subject: [PATCH] #将错误码存入备注字段进行展示
---
src/main/webapp/views/deviceOperate/crnOperate.html | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 04c9394..da33cc7 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -15,14 +15,14 @@
<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
<div style="width: 100%;">
<el-table ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
- max-height="250" style="width: 100%">
+ max-height="350" style="width: 100%">
<el-table-column property="crnNo" label="鍫嗗灈鏈�">
</el-table-column>
<el-table-column property="workNo" label="宸ヤ綔鍙�">
</el-table-column>
<el-table-column property="statusType" label="妯″紡">
</el-table-column>
- <el-table-column property="wrkStatus" label="浠诲姟鐘舵��">
+ <el-table-column property="wrkStatus$" label="浠诲姟鐘舵��">
</el-table-column>
<el-table-column property="deviceStatus" label="璁惧鐘舵��">
</el-table-column>
@@ -80,6 +80,17 @@
<el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>
<el-button @click="requestOperate('clearCommand')" type="primary">娓呴櫎鍛戒护</el-button>
<el-button @click="requestOperate('handleReset')" type="primary">澶嶄綅</el-button>
+ <br/>
+ <br/>
+ <el-button @click="requestOperate('auto')" type="warning">鑱旀満</el-button>
+ <el-button @click="requestOperate('semiAutomatic')" type="warning">鍗婅嚜鍔�</el-button>
+ <el-button @click="requestOperate('hand')" type="warning">鎵嬪姩</el-button>
+ <el-button @click="requestOperate('onlineWrk4')" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
+ <el-button @click="requestOperate('onlineWrk3')" type="warning">娓呴櫎鑱旀満浠诲姟</el-button>
+ <el-button @click="requestOperate('onlineWrk1')" type="warning">鐢宠瀹屾垚浠诲姟</el-button>
+ <br/>
+ <br/>
+ <el-button @click="requestOperate('onlineWrk2')" type="warning">鐢宠鍙栨秷浠诲姟</el-button>
</div>
</div>
</el-card>
--
Gitblit v1.9.1