From cce8b8793ca1466ca1330f3bd62e11ae6551261e Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 13:51:58 +0800
Subject: [PATCH] #改造
---
src/main/webapp/views/deviceOperate/crnOperate.html | 82 ++++++++++++++++++++++++----------------
1 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 432afb9..a8ab6cd 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -18,6 +18,8 @@
max-height="350" style="width: 100%">
<el-table-column property="crnNo" label="鍫嗗灈鏈�">
</el-table-column>
+ <el-table-column property="laneNo" label="宸烽亾鍙�">
+ </el-table-column>
<el-table-column property="workNo" label="宸ヤ綔鍙�">
</el-table-column>
<el-table-column property="statusType" label="妯″紡">
@@ -25,6 +27,10 @@
<el-table-column property="wrkStatus$" label="浠诲姟鐘舵��">
</el-table-column>
<el-table-column property="deviceStatus" label="璁惧鐘舵��">
+ </el-table-column>
+ <el-table-column property="taskComplete" label="浠诲姟瀹屾垚鎸囦护">
+ </el-table-column>
+ <el-table-column property="errorCrn" label="寮傚父鎻愮ず">
</el-table-column>
</el-table>
</div>
@@ -73,24 +79,25 @@
</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('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('handleReset')" type="primary">澶嶄綅</el-button>
+ <el-button @click="requestOperate('taskCompleteClearCommand')" 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('restoreOnlineWrk')" type="warning">鎭㈠鑱旀満浠诲姟</el-button>
- <el-button @click="requestOperate('cancelOnlineWrk')" type="warning">鍙栨秷鑱旀満浠诲姟</el-button>
- <el-button @click="requestOperate('finishWrk')" type="warning">鐢宠瀹屾垚浠诲姟</el-button>
+<!-- <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('cancelWrk')" type="warning">鐢宠鍙栨秷浠诲姟</el-button>
+<!-- <el-button @click="requestOperate('onlineWrk2')" type="warning">鐢宠鍙栨秷浠诲姟</el-button>-->
</div>
</div>
</el-card>
@@ -164,6 +171,8 @@
</el-descriptions-item>
<el-descriptions-item label="鍗囬檷鏃堕暱(H)">{{ tableData[currentIndex].yduration }}
</el-descriptions-item>
+ <el-descriptions-item label="寮傚父鎻愮ず">{{ tableData[currentIndex].errorCrn }}
+ </el-descriptions-item>
</el-descriptions>
</div>
</div>
@@ -234,27 +243,34 @@
},
requestOperate(method) {
let that = this
- $.ajax({
- url: baseUrl + "/crn/operator/" + method,
- 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'
- });
+ that.$confirm('姝ゆ搷浣滃瓨鍦ㄩ闄╋紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ $.ajax({
+ url: baseUrl + "/crn/operator/" + method,
+ 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'
+ });
+ }
}
- }
- });
+ });
+ })
+
},
updateEnableInOut(type) {
let that = this
--
Gitblit v1.9.1