From a55f49c966b25bf983645830baf58d1ba102f942 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 08:06:27 +0800
Subject: [PATCH] *
---
src/main/webapp/views/deviceOperate/crnOperate.html | 170 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 135 insertions(+), 35 deletions(-)
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 04c9394..adf4e71 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -15,16 +15,22 @@
<div id="app" style="display: flex;justify-content: center;flex-wrap: wrap;">
<div style="width: 100%;">
<el-table ref="singleTable" :data="tableData" highlight-current-row @row-click="handleRowClick"
- max-height="250" style="width: 100%">
+ 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="妯″紡">
</el-table-column>
- <el-table-column property="wrkStatus" label="浠诲姟鐘舵��">
+ <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>
@@ -37,9 +43,9 @@
</div>
<div>
<el-form :model="formParam" label-position="top" :inline="true" class="demo-form-inline">
- <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.sourceStaNo" placeholder="婧愮珯/婧愬簱浣�"></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="鎺�">
<el-input v-model="formParam.sourceRow" placeholder="鎺�"></el-input>
</el-form-item>
@@ -51,9 +57,9 @@
</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.staNo" placeholder="鐩爣绔�/鐩爣搴撲綅"></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="鎺�">
<el-input v-model="formParam.row" placeholder="鎺�"></el-input>
</el-form-item>
@@ -64,6 +70,20 @@
<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.locMastDemoCount" placeholder="娴嬭瘯搴撲綅鏁伴噺"></el-input>
+ </el-form-item>
+ <el-form-item label="娴嬭瘯搴撲綅">
+ <el-input v-model="formParam.locMastDemo" placeholder="娴嬭瘯搴撲綅 鍒嗛殧绗�;"></el-input>
+ </el-form-item>
+ <el-form-item label="鐩爣绔�/鐩爣搴撲綅">
+ <el-input v-model="formParam.staOutDemo" placeholder="鍫嗗灈鏈烘斁璐х珯鐐�"></el-input>
+ </el-form-item>
+ <el-form-item label="鐩爣绔�/鐩爣搴撲綅">
+ <el-input v-model="formParam.staIntDemo" placeholder="鍫嗗灈鏈哄彇璐х珯鐐�"></el-input>
+ </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>
@@ -71,15 +91,33 @@
<el-form-item label="">
<el-checkbox @change="updateEnableInOut('out')" v-model="enableOut">鍙嚭</el-checkbox>
</el-form-item>
+ <el-form-item label="">
+ <el-checkbox @change="updateDemo('demo')" v-model="hpMkDemo">婕旂ず</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('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>
+
+ <div style="margin-top: 10px">
+ <el-button @click="requestOperate('taskComplete')" type="primary">浠诲姟瀹屾垚</el-button>
+ <el-button @click="requestOperate('taskCompleteClearCommand')" type="primary">浠诲姟瀹屾垚鎸囦护娓呴櫎</el-button>
+ </div>
+<!-- <el-button @click="requestOperate('siteMove')" 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>
</div>
</el-card>
@@ -153,6 +191,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>
@@ -175,12 +215,17 @@
sourceBay: 0,
sourceLev: 1,
staNo: null,
+ locMastDemoCount: 3,
+ locMastDemo: null,
+ staOutDemo: null,
+ staIntDemo: null,
row: 1,
bay: 0,
lev: 1
},
enableIn: false,
- enableOut: false
+ enableOut: false,
+ hpMkDemo: false
},
created() {
this.init()
@@ -204,6 +249,7 @@
this.formParam.crnNo = row.crnNo
this.enableIn = row.inEnable == "Y" ? true : false
this.enableOut = row.outEnable == "Y" ? true : false
+ this.hpMkDemo = row.hpMk == "Y" ? true : false
},
getTableData() {
let that = this;
@@ -223,27 +269,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
@@ -281,6 +334,53 @@
}
}
});
+ },
+ updateDemo(type) {
+ let that = this
+ let param = {}
+ that.$confirm('灏嗗惎鍔ㄦ紨绀烘ā寮忥紝鏄惁缁х画','鎻愮ず',{
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(()=>{
+ if (type == "demo") {
+ param = {
+ hpMk: this.hpMkDemo ? "Y" : "N",
+ staOutDemo: this.formParam.staOutDemo,
+ staIntDemo: this.formParam.staIntDemo,
+ locMastDemo: this.formParam.locMastDemo,
+ locMastDemoCount: this.formParam.locMastDemoCount,
+ crnNo: this.formParam.crnNo
+ }
+ } else {
+ param = {
+ crnNo: this.formParam.crnNo
+ }
+ }
+
+
+ $.ajax({
+ url: baseUrl + "/basCrnp/update/demo/auth",
+ headers: {
+ 'token': localStorage.getItem('token')
+ },
+ data: param,
+ method: 'POST',
+ success: function (res) {
+ if (res.code == 200) {
+ that.$message({
+ message: res.msg,
+ type: 'success'
+ });
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
+ }
+ });
+ })
}
}
})
--
Gitblit v1.9.1