From 7be75a0302732bb0ec2f4bd9eeeb1d1c9701af96 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 三月 2024 13:39:26 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/rgvOperate.html | 113 ++++++++------------------------------------------------
1 files changed, 17 insertions(+), 96 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/rgvOperate.html b/src/main/webapp/views/deviceOperate/rgvOperate.html
index 478fc0c..f00cab1 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>
@@ -50,66 +50,15 @@
<el-input v-model="formParam.sourceLev" 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.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>
+ <el-button @click="requestOperate('restoreTask')" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
+ <el-button @click="requestOperate('compTask')" type="warning">寮哄埗瀹屾垚浠诲姟</el-button>
<br/>
<br/>
- <el-button @click="requestOperate('onlineWrk2')" type="warning">鐢宠鍙栨秷浠诲姟</el-button>
+ <el-button @click="requestOperate('stop')" type="warning">杩滅▼鎬ュ仠</el-button>
+ <el-button @click="requestOperate('reset')" type="warning">绯荤粺澶嶄綅</el-button>
</div>
</div>
</el-card>
@@ -125,63 +74,35 @@
</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>
+ <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].deviceStatus }}</el-tag>
+ <el-tag>{{ tableData[currentIndex].walkPos }}</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].loading1 }}</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>
</div>
@@ -199,7 +120,7 @@
currentTitle: "鏈�夋嫨璁惧",
currentIndex: null,
formParam: {
- crnNo: null,
+ rgvNo: null,
sourceStaNo: null,
sourceRow: 1,
sourceBay: 0,
@@ -243,8 +164,8 @@
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
},
@@ -272,7 +193,7 @@
type: 'warning'
}).then(()=>{
$.ajax({
- url: baseUrl + "/crn/operator/" + method,
+ url: baseUrl + "/rgv/operator/" + method,
headers: {
'token': localStorage.getItem('token')
},
@@ -301,12 +222,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