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 | 128 ++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 60 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index 8dd7e98..fe04738 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -16,13 +16,21 @@
<div style="width: 100%;">
<el-table ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
max-height="450" style="width: 100%">
- <el-table-column property="devNo" label="绔欏彿">
+ <el-table-column property="rgvNo" label="灏忚溅鍙�">
</el-table-column>
- <el-table-column property="workNo" label="宸ヤ綔鍙�">
+ <el-table-column property="taskNo" label="宸ヤ綔鍙�">
</el-table-column>
- <el-table-column property="locType1" label="楂樹綆搴撲綅">
+ <el-table-column property="mode" label="浣滀笟妯″紡">
</el-table-column>
- <el-table-column property="pakMk" label="鍏ュ簱鏍囪">
+ <el-table-column property="status" label="鐘舵��">
+ </el-table-column>
+ <el-table-column property="rgvPos" label="褰撳墠瀹氫綅鍊�">
+ </el-table-column>
+ <el-table-column property="rgvPosDestination" label="鐩爣瀹氫綅缃�">
+ </el-table-column>
+ <el-table-column property="loaded" label="鎺㈢墿">
+ </el-table-column>
+ <el-table-column property="errorRgv" label="鎻愮ず">
</el-table-column>
</el-table>
</div>
@@ -35,28 +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.workNo" placeholder="宸ヤ綔鍙�"></el-input>
+ <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.staNo" placeholder="鐩爣绔�"></el-input>
+ <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.pakMk" placeholder="鍏ュ簱鏍囪"></el-input>
- </el-form-item>
- </el-form>
- <el-form label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="">
- <el-checkbox v-model="formParam.inEnable">鍙叆</el-checkbox>
- </el-form-item>
- <el-form-item label="">
- <el-checkbox v-model="formParam.outEnable">鍙嚭</el-checkbox>
+ <el-form-item label="鐩爣绔欑偣">
+ <el-input v-model="formParam.rgvStaNoPut" placeholder="鐩爣绔欑偣"></el-input>
</el-form-item>
</el-form>
<div>
- <el-button @click="requestOperate('update')" type="primary">鏇存柊</el-button>
- <el-button @click="requestOperate('out')" type="warning">鍙栬揣瀹屾垚</el-button>
- <el-button @click="requestOperate('in')" type="warning">鏀捐揣瀹屾垚</el-button>
+ <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>
@@ -64,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>
@@ -105,16 +100,15 @@
el: '#app',
data: {
tableData: [],
+ taskAllData: [],
currentRow: null,
currentTitle: "鏈�夋嫨璁惧",
currentIndex: null,
formParam: {
- devNo: null,
- workNo: null,
- staNo: null,
- pakMk: null,
- inEnable: false,
- outEnable: false
+ rgvNo: 0,
+ rgvStaNoTake: 0,
+ rgvStaNoPut: 0,
+ rgvPosDestination: 0
}
},
created() {
@@ -135,19 +129,33 @@
const index = this.tableData.indexOf(row)
this.currentRow = row;
this.currentIndex = index
- this.currentTitle = row.devNo + "绔欑偣"
+ this.currentTitle = row.rgvNo + "灏忚溅"
- this.formParam.devNo = row.devNo
- this.formParam.workNo = row.workNo
- this.formParam.staNo = row.staNo
- this.formParam.pakMk = row.pakMk
- this.formParam.inEnable = row.inEnable == "Y" ? true : false
- this.formParam.outEnable = row.outEnable == "Y" ? true : false
+ this.formParam.rgvNo = row.rgvNo
+ 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;
$.ajax({
- url: baseUrl + "/site/list/auth",
+ url: baseUrl + "/rgv/status/all",
headers: {
'token': localStorage.getItem('token')
},
@@ -168,7 +176,7 @@
type: 'warning'
}).then(()=>{
$.ajax({
- url: baseUrl + "/site/detl/"+method,
+ url: baseUrl + "/rgv/run/"+method,
headers: {
'token': localStorage.getItem('token')
},
--
Gitblit v1.9.1