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 | 414 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 295 insertions(+), 119 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index 478fc0c..b57746d 100644
--- a/src/main/webapp/views/deviceOperate/rgvOperate.html
+++ b/src/main/webapp/views/deviceOperate/rgvOperate.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
- <title>鍫嗗灈鏈鸿澶�</title>
+ <title>RGV璁惧</title>
<link rel="stylesheet" href="../../static/wcs/css/element.css">
<script type="text/javascript" src="../../static/wcs/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/wcs/js/common.js"></script>
@@ -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,80 +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>
- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
-<!-- <el-form-item label="鐩爣绔�/鐩爣搴撲綅">-->
-<!-- <el-input v-model="formParam.staNo" placeholder="鐩爣绔�/鐩爣搴撲綅"></el-input>-->
-<!-- </el-form-item>-->
- <el-form-item label="鐩爣鎺�">
- <el-input v-model="formParam.row" placeholder="鎺�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣鍒�">
- <el-input v-model="formParam.bay" placeholder="鍒�"></el-input>
- </el-form-item>
- <el-form-item label="鐩爣灞�">
- <el-input v-model="formParam.lev" placeholder="灞�"></el-input>
- </el-form-item>
- </el-form>
- <el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="鎵樼洏鐮�">
- <el-input v-model="formParam.barcode" placeholder="鏉＄爜"></el-input>
- </el-form-item>
- <el-form-item label="鎵樼洏绫诲瀷">
- <el-input v-model="formParam.barcodeType" placeholder="绫诲瀷"></el-input>
- </el-form-item>
- <el-form-item label="绌烘墭鐩�">
- <el-select v-model="formParam.emptyContainer" placeholder="鏄惁涓虹┖鎵樼洏">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- </el-form>
- <el-form label-position="top" :inline="true" class="demo-form-inline">
- <el-form-item label="">
- <el-checkbox @change="updateEnableInOut('in')" v-model="enableIn">鍙叆</el-checkbox>
- </el-form-item>
- <el-form-item label="">
- <el-checkbox @change="updateEnableInOut('out')" v-model="enableOut">鍙嚭</el-checkbox>
- </el-form-item>
- </el-form>
- <div>
- <el-button @click="requestOperate('put')" type="primary">鍏ュ簱</el-button>
- <el-button @click="requestOperate('take')" type="primary">鍑哄簱</el-button>
- <el-button @click="requestOperate('stockMove')" type="primary">搴撲綅杞Щ</el-button>
- <el-button @click="requestOperate('siteMove')" type="primary">绔欏埌绔�</el-button>
- <el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>
- <el-button @click="requestOperate('clearCommand')" type="primary">娓呴櫎鍛戒护</el-button>
- <el-button @click="requestOperate('reset')" type="primary">澶嶄綅</el-button>
- <br/>
- <br/>
- <el-button @click="requestOperate('auto')" type="warning">鑱旀満</el-button>
- <el-button @click="requestOperate('semiAutomatic')" type="warning">鍗婅嚜鍔�</el-button>
- <el-button @click="requestOperate('hand')" type="warning">鎵嬪姩</el-button>
- <el-button @click="requestOperate('onlineWrk4')" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
- <el-button @click="requestOperate('onlineWrk3')" type="warning">娓呴櫎鑱旀満浠诲姟</el-button>
- <el-button @click="requestOperate('onlineWrk1')" type="warning">鐢宠瀹屾垚浠诲姟</el-button>
- <br/>
- <br/>
- <el-button @click="requestOperate('onlineWrk2')" 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>
@@ -125,65 +131,32 @@
</div>
<div v-else>
<el-descriptions :title="currentTitle" direction="vertical" :column="4" border>
- <el-descriptions-item label="鍫嗗灈鏈�">{{ tableData[currentIndex].crnNo }}
+ <el-descriptions-item label="RGV">{{ tableData[currentIndex].rgvNo }}
</el-descriptions-item>
<el-descriptions-item label="宸ヤ綔鍙�">
- {{ tableData[currentIndex].workNo }}
+ {{ tableData[currentIndex].workNo1 }}
</el-descriptions-item>
<el-descriptions-item label="妯″紡">
<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].wrkStatus$ }}</el-tag>
- </div>
- <div v-else>
- <el-tag type="success">{{ tableData[currentIndex].wrkStatus$ }}</el-tag>
- </div>
+
+ <el-tag>{{ tableData[currentIndex].status}}</el-tag>
+
</el-descriptions-item>
<el-descriptions-item label="璁惧鐘舵��">
- <el-tag>{{ tableData[currentIndex].deviceStatus }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="鏈夌墿">
- <el-tag>{{ tableData[currentIndex].loading }}</el-tag>
- </el-descriptions-item>
- <el-descriptions-item label="鍒�">{{ tableData[currentIndex].bay }}
- </el-descriptions-item>
- <el-descriptions-item label="灞�">{{ tableData[currentIndex].lev }}
+ <el-tag>{{ tableData[currentIndex].walkPos }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="鏁呴殰浠ｇ爜">{{ tableData[currentIndex].warnCode }}
</el-descriptions-item>
- <el-descriptions-item label="鏁呴殰鎻忚堪">{{ tableData[currentIndex].lev }}
+ <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].sourceLocNo }}
- </el-descriptions-item>
- <el-descriptions-item label="鐩爣搴撲綅">{{ tableData[currentIndex].locNo }}
- </el-descriptions-item>
- <el-descriptions-item label="璐у弶瀹氫綅">{{ tableData[currentIndex].forkOffset }}
- </el-descriptions-item>
- <el-descriptions-item label="杞借揣鍙板畾浣�">{{ tableData[currentIndex].liftPos }}
- </el-descriptions-item>
- <el-descriptions-item label="璧拌鍦ㄥ畾浣�">{{ tableData[currentIndex].walkPos }}
- </el-descriptions-item>
- <el-descriptions-item label="璧拌閫熷害(m/min)">{{ tableData[currentIndex].xspeed }}
- </el-descriptions-item>
- <el-descriptions-item label="鍗囬檷閫熷害(m/min)">{{ tableData[currentIndex].yspeed }}
- </el-descriptions-item>
- <el-descriptions-item label="鍙夌墮閫熷害(m/min)">{{ tableData[currentIndex].zspeed }}
- </el-descriptions-item>
- <el-descriptions-item label="璧拌璺濈(Km)">{{ tableData[currentIndex].xdistance }}
- </el-descriptions-item>
- <el-descriptions-item label="鍗囬檷璺濈(Km)">{{ tableData[currentIndex].ydistance }}
- </el-descriptions-item>
- <el-descriptions-item label="璧拌鏃堕暱(H)">{{ tableData[currentIndex].xduration }}
- </el-descriptions-item>
- <el-descriptions-item label="鍗囬檷鏃堕暱(H)">{{ tableData[currentIndex].yduration }}
- </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>
@@ -199,7 +172,21 @@
currentTitle: "鏈�夋嫨璁惧",
currentIndex: null,
formParam: {
- crnNo: null,
+ rgvNo: null,
+ sourceStaNo: null,
+ sourceRow: 1,
+ sourceBay: 0,
+ sourceLev: 1,
+ staNo: null,
+ row: 1,
+ bay: 0,
+ lev: 1,
+ barcode:null,
+ barcodeType:null,
+ emptyContainer:null
+ },
+ formParamD: {
+ rgvNo: null,
sourceStaNo: null,
sourceRow: 1,
sourceBay: 0,
@@ -223,7 +210,9 @@
value:'0',
label:'鍚�'
}
- ]
+ ],
+ demo: 'X',
+ rgvMode: 0
},
created() {
this.init()
@@ -232,19 +221,54 @@
},
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) {
const index = this.tableData.indexOf(row)
this.currentRow = row;
this.currentIndex = index
- this.currentTitle = row.crnNo + "鍙峰爢鍨涙満"
- this.formParam.crnNo = row.crnNo
+ this.currentTitle = row.rgvNo + "鍙稲GV"
+ this.formParam.rgvNo = row.rgvNo
this.enableIn = row.inEnable == "Y" ? true : false
this.enableOut = row.outEnable == "Y" ? true : false
},
@@ -264,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('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
@@ -272,7 +448,7 @@
type: 'warning'
}).then(()=>{
$.ajax({
- url: baseUrl + "/crn/operator/" + method,
+ url: baseUrl + "/rgv/operator/" + method,
headers: {
'token': localStorage.getItem('token')
},
@@ -301,12 +477,12 @@
if (type == "in") {
param = {
inEnable: this.enableIn ? "Y" : "N",
- crnNo: this.formParam.crnNo
+ rgvNo: this.formParam.rgvNo
}
} else {
param = {
outEnable: this.enableOut ? "Y" : "N",
- crnNo: this.formParam.crnNo
+ rgvNo: this.formParam.rgvNo
}
}
--
Gitblit v1.9.1