From c64b495fa07b7d381df66590894109fb672c20f0 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 08 五月 2025 14:57:50 +0800
Subject: [PATCH] #
---
src/main/webapp/views/deviceOperate/crnOperate.html | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index da33cc7..fe928f9 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="妯″紡">
@@ -79,7 +81,7 @@
<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('reset')" type="primary">澶嶄綅</el-button>
<br/>
<br/>
<el-button @click="requestOperate('auto')" type="warning">鑱旀満</el-button>
@@ -234,27 +236,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