From a09baeeeeeea5c36159952482a895eb79c5740f4 Mon Sep 17 00:00:00 2001 From: 1 <1@123> Date: 星期五, 09 五月 2025 18:05:27 +0800 Subject: [PATCH] # --- src/main/webapp/views/deviceOperate/rgvOperate.html | 64 ++++++++++++++----------------- 1 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html index fa2ba58..d7146bd 100644 --- a/src/main/webapp/views/deviceOperate/rgvOperate.html +++ b/src/main/webapp/views/deviceOperate/rgvOperate.html @@ -16,13 +16,19 @@ <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> </div> @@ -36,27 +42,19 @@ <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-input v-model="formParam.taskNo" 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.rgvPosDestination" 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.rgvStaNo" 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('walk')" type="warning">琛岃蛋</el-button> </div> </div> </el-card> @@ -109,12 +107,10 @@ currentTitle: "鏈�夋嫨璁惧", currentIndex: null, formParam: { - devNo: null, - workNo: null, - staNo: null, - pakMk: null, - inEnable: false, - outEnable: false + rgvNo: 0, + taskNo: 0, + rgvStaNo: 0, + rgvPosDestination: 0 } }, created() { @@ -135,19 +131,17 @@ 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.taskNo = row.taskNo + this.formParam.rgvStaNo = row.rgvStaNo + this.formParam.rgvPosDestination = row.rgvPosDestination }, getTableData() { let that = this; $.ajax({ - url: baseUrl + "/site/list/auth", + url: baseUrl + "/rgv/status/all", headers: { 'token': localStorage.getItem('token') }, @@ -168,7 +162,7 @@ type: 'warning' }).then(()=>{ $.ajax({ - url: baseUrl + "/site/detl/"+method, + url: baseUrl + "/rgv/run/"+method, headers: { 'token': localStorage.getItem('token') }, -- Gitblit v1.9.1