From f68dd32cdd75924ebded3800cf37fa9110f9ec01 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 07 六月 2024 10:31:33 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/rgvOperate.html | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index a61524b..02719de 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -26,6 +26,8 @@
</el-table-column>
<el-table-column property="walkPos" label="璁惧鐘舵��">
</el-table-column>
+ <el-table-column property="barcode" label="鎵樼洏鐮�">
+ </el-table-column>
</el-table>
</div>
@@ -58,7 +60,7 @@
<br/>
<br/>
<el-button @click="requestOperate('stop')" type="warning">杩滅▼鎬ュ仠</el-button>
- <el-button @click="requestOperate('noStop')" type="warning">鍙栨秷鎬ュ仠</el-button>
+<!-- <el-button @click="requestOperate('noStop')" type="warning">鍙栨秷鎬ュ仠</el-button>-->
<el-button @click="requestOperate('reset')" type="warning">绯荤粺澶嶄綅</el-button>
</div>
</div>
@@ -84,26 +86,21 @@
<el-tag>{{ tableData[currentIndex].statusType }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="浠诲姟鐘舵��">
- <div v-if="tableData[currentIndex].wrkStatus == 0">
+
<el-tag>{{ tableData[currentIndex].status}}</el-tag>
- </div>
- <div v-else>
- <el-tag type="success">{{ tableData[currentIndex].wrkStatus$ }}</el-tag>
- </div>
+
+
</el-descriptions-item>
<el-descriptions-item label="璁惧鐘舵��">
<el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="鏈夌墿">
- <el-tag>{{ tableData[currentIndex].loading1 }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].warnCode }}
</el-descriptions-item>
<el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].alarm }}
</el-descriptions-item>
- <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].sourceStaNo }}
+ <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].staNo }}
</el-descriptions-item>
- <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
+ <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].sourceStaNo }}
</el-descriptions-item>
</el-descriptions>
</div>
--
Gitblit v1.9.1