From c1ef2d1fc4c0dae2bc8452924dcd77a0ff3a1ef5 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期四, 19 六月 2025 15:02:52 +0800
Subject: [PATCH] #改造
---
src/main/webapp/views/deviceOperate/rgvOperate.html | 80 +++++++++++++++++++++++----------------
1 files changed, 47 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index d7146bd..fe04738 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -28,7 +28,9 @@
</el-table-column>
<el-table-column property="rgvPosDestination" label="鐩爣瀹氫綅缃�">
</el-table-column>
- <el-table-column property="loaded" label="鏈夌墿">
+ <el-table-column property="loaded" label="鎺㈢墿">
+ </el-table-column>
+ <el-table-column property="errorRgv" label="鎻愮ず">
</el-table-column>
</el-table>
</div>
@@ -41,20 +43,23 @@
</div>
<div>
<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="宸ヤ綔鍙�">
- <el-input v-model="formParam.taskNo" placeholder="宸ヤ綔鍙�"></el-input>
- </el-form-item>
<el-form-item label="鐩爣瀹氫綅缃�">
<el-input v-model="formParam.rgvPosDestination" placeholder="鐩爣瀹氫綅缃�"></el-input>
</el-form-item>
+ <el-form-item label="鍙栬揣绔欑偣">
+ <el-input v-model="formParam.rgvStaNoTake" placeholder="鐩爣绔欑偣"></el-input>
+ </el-form-item>
<el-form-item label="鐩爣绔欑偣">
- <el-input v-model="formParam.rgvStaNo" placeholder="鐩爣绔欑偣"></el-input>
+ <el-input v-model="formParam.rgvStaNoPut" placeholder="鐩爣绔欑偣"></el-input>
</el-form-item>
</el-form>
<div>
<el-button @click="requestOperate('take')" type="primary">鍙栬揣</el-button>
<el-button @click="requestOperate('put')" type="primary">鏀捐揣</el-button>
+ <el-button @click="requestOperate('TakeAndPut')" type="primary">鍙栨斁璐�</el-button>
<el-button @click="requestOperate('walk')" type="warning">琛岃蛋</el-button>
+ <el-button @click="requestOperate('del')" type="warning">浠诲姟娓呯┖</el-button>
+ <el-button @click="requestOperate('delRgvTask')" type="warning">灏忚溅寮哄埗澶嶄綅锛堣繍琛屾椂涓嶈鎿嶄綔,闇�瑕侀厤鍚堟寜閽級</el-button>
</div>
</div>
</el-card>
@@ -62,36 +67,28 @@
<div style="width: 45%;">
<el-card class="box-card">
<div slot="header" class="clearfix">
- <span>璁惧鐘舵��</span>
+ <span>璁惧褰撳墠浠诲姟</span>
</div>
<div>
<div v-if="currentIndex == null">
<el-empty description="璇烽�夋嫨璁惧"></el-empty>
</div>
<div v-else>
- <el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
- <el-descriptions-item label="绔欑偣">{{ tableData[currentIndex].devNo }}
- </el-descriptions-item>
- <el-descriptions-item label="宸ヤ綔鍙�">
- {{ tableData[currentIndex].workNo }}
- </el-descriptions-item>
- <el-descriptions-item label="鑷姩">{{ tableData[currentIndex].autoing }}
- </el-descriptions-item>
- <el-descriptions-item label="鏈夌墿">{{ tableData[currentIndex].loading }}
- </el-descriptions-item>
- <el-descriptions-item label="鍙叆">{{ tableData[currentIndex].inEnable }}
- </el-descriptions-item>
- <el-descriptions-item label="鍙嚭">{{ tableData[currentIndex].outEnable }}
- </el-descriptions-item>
- <el-descriptions-item label="鍏ュ簱鏍囪">{{ tableData[currentIndex].pakMk }}
- </el-descriptions-item>
- <el-descriptions-item label="绌烘澘淇″彿">{{ tableData[currentIndex].emptyMk }}
- </el-descriptions-item>
- <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
- </el-descriptions-item>
- <el-descriptions-item label="楂樹綆搴撲綅">{{ tableData[currentIndex].locType1 }}
- </el-descriptions-item>
- </el-descriptions>
+ <el-table ref="singleTable" :data="taskAllData" highlight-current-row @row-click="handleRowClick"
+ max-height="450" style="width: 100%">
+ <el-table-column property="rgvNo" label="灏忚溅鍙�">
+ </el-table-column>
+ <el-table-column property="taskNo" label="宸ヤ綔鍙�">
+ </el-table-column>
+ <el-table-column property="taskStatus" label="浣滀笟妯″紡">
+ </el-table-column>
+ <el-table-column property="isRunning" label="鐘舵��">
+ </el-table-column>
+ <el-table-column property="targetPosition" label="鐩爣瀹氫綅缃�">
+ </el-table-column>
+ <el-table-column property="direction" label="鏂瑰悜">
+ </el-table-column>
+ </el-table>
</div>
</div>
</el-card>
@@ -103,13 +100,14 @@
el: '#app',
data: {
tableData: [],
+ taskAllData: [],
currentRow: null,
currentTitle: "鏈�夋嫨璁惧",
currentIndex: null,
formParam: {
rgvNo: 0,
- taskNo: 0,
- rgvStaNo: 0,
+ rgvStaNoTake: 0,
+ rgvStaNoPut: 0,
rgvPosDestination: 0
}
},
@@ -134,9 +132,25 @@
this.currentTitle = row.rgvNo + "灏忚溅"
this.formParam.rgvNo = row.rgvNo
- this.formParam.taskNo = row.taskNo
- this.formParam.rgvStaNo = row.rgvStaNo
+ this.formParam.rgvStaNoTake = row.rgvStaNoTake
+ this.formParam.rgvStaNoPut = row.rgvStaNoPut
this.formParam.rgvPosDestination = row.rgvPosDestination
+
+ this.getTaskAllData(index+1)
+ },
+ getTaskAllData(index) {
+ let that = this;
+ $.ajax({
+ url: baseUrl + "/rgv/task/cache/all",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: {rgvNo: index},
+ method: 'POST',
+ success: function (res) {
+ that.taskAllData = res.data
+ }
+ });
},
getTableData() {
let that = this;
--
Gitblit v1.9.1