From 0819a18ba9da9f51fa981906ae19ed85b4629b25 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 16 五月 2024 10:46:33 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/rgvOperate.html | 311 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 283 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index f00cab1..b57746d 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="pakMk" label="閿佸畾鐘舵��">
+ </el-table-column>
</el-table>
</div>
@@ -36,29 +38,84 @@
<span>璁惧璋冭瘯</span>
</div>
<div>
- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
+ <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline" v-if="rgvMode !== 2 && rgvMode !== 1 ">
<!-- <el-form-item label="婧愮珯/婧愬簱浣�">-->
<!-- <el-input v-model="formParam.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>-->
<!-- </el-form-item>-->
- <el-form-item label="婧愭帓">
- <el-input v-model="formParam.sourceRow" placeholder="鎺�"></el-input>
+ <el-form-item label="璧峰绔�">
+ <el-input v-model="formParam.sourceRow" placeholder="璧峰绔�"></el-input>
</el-form-item>
- <el-form-item label="婧愬垪">
- <el-input v-model="formParam.sourceBay" placeholder="鍒�"></el-input>
+ <el-form-item label="鐩爣绔�">
+ <el-input v-model="formParam.sourceBay" placeholder="鐩爣绔�"></el-input>
</el-form-item>
- <el-form-item label="婧愬眰">
- <el-input v-model="formParam.sourceLev" placeholder="灞�"></el-input>
+ <el-form-item label="鍚姩">
+ <el-button @click="initiate" type="warning">鎵ц浠诲姟</el-button>
</el-form-item>
</el-form>
- <div>
- <el-button @click="requestOperate('auto')" type="warning">鑱旀満</el-button>
- <el-button @click="requestOperate('restoreTask')" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
- <el-button @click="requestOperate('compTask')" type="warning">寮哄埗瀹屾垚浠诲姟</el-button>
- <br/>
- <br/>
- <el-button @click="requestOperate('stop')" type="warning">杩滅▼鎬ュ仠</el-button>
- <el-button @click="requestOperate('reset')" type="warning">绯荤粺澶嶄綅</el-button>
+ <div v-if="rgvMode === 2 ">
+ <el-form :model="formParamD" label-position="top" :inline="true" class="demo-form-inline">
+ <el-form-item label="璧峰绔�">
+ <el-input v-model="formParamD.sourceRow" placeholder="璧峰绔�"></el-input>
+ </el-form-item>
+ <el-form-item label="鐩爣绔�">
+ <el-input v-model="formParamD.sourceBay" placeholder="鐩爣绔�"></el-input>
+ </el-form-item>
+ <el-form-item label="鍚姩">
+ <el-button @click="initiateD(1)" type="warning">鍙栬揣</el-button>
+ <el-button @click="initiateD(2)" type="warning">鏀捐揣</el-button>
+ <el-button @click="initiateD(3)" type="warning">XY绉诲姩</el-button>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div v-if="demo === 'N' ">
+ <el-button v-if="rgvMode === 0 " type="danger">鏈煡</el-button>
+ <el-button v-if="rgvMode === -1 " type="danger">鏈煡</el-button>
+ <el-button v-if="rgvMode === 3 " type="primary">鑱旀満</el-button>
+ <el-button v-if="rgvMode === 2 " type="primary">鍗曟満</el-button>
+ <el-button v-if="rgvMode === 1 " type="warning">鎵嬪姩</el-button>
+ </div>
+ <div v-if="demo === 'N' ">
+ <div style="margin: 10px auto 10px auto">
+ <el-button v-if="demo === 'N' " @click="demos('true')" type="info">婕旂ず</el-button>
+ <el-button v-if="demo === 'Y' " @click="demos('false')" type="info">鍙栨秷婕旂ず</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button v-if="rgvMode !== 3 " @click="rgvStatus(15)" type="primary">鑱旀満</el-button>
+ <el-button v-if="rgvMode !== 2 " @click="rgvStatus(14)" type="primary">鍗曟満</el-button>
+ <el-button v-if="rgvMode !== 1 " @click="rgvStatus(12)" type="warning">鎵嬪姩</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button @click="rgvStatus(8)" type="primary">鍚姩</el-button>
+ <el-button @click="rgvStatus(9)" type="primary">鍋滄</el-button>
+ <el-button @click="rgvStatus(11)" type="primary">澶嶄綅鎸夐挳</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button @click="rgvStatus(7)" type="warning">鎶ヨ娑堥煶</el-button>
+ <el-button v-if="rgvMode === 1 " @click="rgvStatus(13)" type="warning">鎵嬪姩瀹氫綅</el-button>
+ </div>
+ <div style="margin: 10px auto 10px auto" v-if="demo === 'N' ">
+ <el-button :style="" @click="rgvStatus(5)" type="danger">寮哄埗鍚姩</el-button>
+ <el-button @click="rgvStatus(10)" type="danger">鎬ュ仠</el-button>
+ <el-button @click="rgvStatus(16)" type="danger">璐у弶瀹氫綅鍥炰腑</el-button>
+ </div>
+ <div style="margin-top: 5px" v-if="demo === 'Y'">
+ <el-button @click="staTova(2,1)" type="warning">杈撻��-缃崲1</el-button>
+ <el-button @click="staTova(2,3)" type="warning">杈撻��-缃崲2</el-button>
+ <el-button @click="staTova(2,5)" type="warning">杈撻��-缃崲3</el-button>
+ <el-button @click="staTova(2,7)" type="warning">杈撻��-缃崲4</el-button>
+ </div>
+ <div style="margin-top: 5px" v-if="demo === 'Y'">
+ <el-button @click="staTova(2,4)" type="warning">杈撻��-鐏岃1</el-button>
+ <el-button @click="staTova(2,6)" type="warning">杈撻��-鐏岃2</el-button>
+ <el-button @click="staTova(2,8)" type="warning">杈撻��-鐏岃3</el-button>
+ </div>
+ <div style="margin-top: 5px" v-if="demo === 'Y'">
+ <el-button @click="staTova(1,10)" type="warning">缃崲1-鏀捐揣</el-button>
+ <el-button @click="staTova(2,10)" type="warning">缃崲2-鏀捐揣</el-button>
+ <el-button @click="staTova(3,10)" type="warning">缃崲3-鏀捐揣</el-button>
+ <el-button @click="staTova(4,10)" type="warning">缃崲4-鏀捐揣</el-button>
+ </div>
</div>
</div>
</el-card>
@@ -83,28 +140,23 @@
<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>
- <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].staNo }}
- </el-descriptions-item>
+<!-- <el-descriptions-item label="婧愮珯">{{ tableData[currentIndex].staNo }}-->
+<!-- </el-descriptions-item>-->
+<!-- <el-descriptions-item label="鐩爣绔�">{{ tableData[currentIndex].sourceStaNo }}-->
+<!-- </el-descriptions-item>-->
</el-descriptions>
+
</div>
</div>
</el-card>
@@ -133,6 +185,20 @@
barcodeType:null,
emptyContainer:null
},
+ formParamD: {
+ rgvNo: null,
+ sourceStaNo: null,
+ sourceRow: 1,
+ sourceBay: 0,
+ sourceLev: 1,
+ staNo: null,
+ row: 1,
+ bay: 0,
+ lev: 1,
+ barcode:null,
+ barcodeType:null,
+ emptyContainer:null
+ },
enableIn: false,
enableOut: false,
options:[
@@ -144,7 +210,9 @@
value:'0',
label:'鍚�'
}
- ]
+ ],
+ demo: 'X',
+ rgvMode: 0
},
created() {
this.init()
@@ -153,11 +221,46 @@
},
methods: {
+ staTova(sta,end){
+ let that = this
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + "/rgv/rgvDemoTask",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ rgvNo : this.formParam.rgvNo,
+ sta : sta,
+ end : end
+ },
+ method: 'Get',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ })
+ },
init() {
this.getTableData()
setInterval(() => {
this.getTableData()
+ this.demoStatus()
}, 1000)
},
handleRowClick(row, col, event) {
@@ -185,6 +288,158 @@
}
});
},
+ demoStatus() {
+ let that = this;
+ $.ajax({
+ url: baseUrl + "/rgv/demo/status",
+ data:{
+ rgvNo : this.formParam.rgvNo
+ },
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ contentType: 'application/json;charset=UTF-8',
+ method: 'get',
+ success: function (res) {
+ // console.log(res)
+ that.demo = res.data.demo
+ that.rgvMode = res.data.rgvMode
+ }
+ });
+ },
+ initiate(){
+ let that = this
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + "/rgv/operator/put",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: this.formParam,
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ })
+ },
+ initiateD(method){
+ let urlS = "/rgv/operator/single/step/three/put";
+ if (method===1){
+ urlS = "/rgv/operator/single/step/one/put";
+ }else if (method === 2){
+ urlS = "/rgv/operator/single/step/two/put";
+ }else if (method === 3){
+ urlS = "/rgv/operator/single/step/three/put";
+ }
+ let that = this
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + urlS,
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: this.formParam,
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ })
+ },
+ demos(method){
+ let that = this
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + "/rgv/demo/status/" + method,
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ rgvNo : this.formParam.rgvNo
+ },
+ method: 'Get',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ })
+ },
+ rgvStatus(method){
+ let that = this
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + "/rgv/demo/status/rgvStatus",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data:{
+ rgvNo : this.formParam.rgvNo,
+ status : Number(method)
+ },
+ method: 'Get',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ })
+ },
requestOperate(method) {
let that = this
that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
--
Gitblit v1.9.1