From 255e7ef8d8d282305baa43e77115bfff1cfffccb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 03 十一月 2025 20:13:51 +0800
Subject: [PATCH] *
---
src/main/webapp/views/deviceOperate/devpOperate.html | 10 +++++++++-
src/main/java/com/zy/asrs/controller/CrnController.java | 1 +
src/main/webapp/views/deviceOperate/crnOperate.html | 12 +++++++++++-
src/main/java/com/zy/asrs/domain/vo/CrnListVo.java | 1 +
4 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 573b31f..3032e40 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -331,6 +331,7 @@
}
vo.setInEnable(basCrnp.getInEnable());
vo.setOutEnable(basCrnp.getOutEnable());
+ vo.setHpMk(basCrnp.getHpMk());
vo.setTaskComplete(crnThread.getResetFlag()? "浠诲姟瀹屾垚涓嬪彂绛夊緟":"-");
}
return R.ok().add(list);
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
index baa96a6..79ac01c 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
@@ -112,6 +112,7 @@
// 鍙嚭
private String outEnable;
+ private String hpMk;
private String taskComplete = "鏃�";
private String errorCrn;
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index 1fadd15..15ed4b0 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -77,6 +77,9 @@
<el-form-item label="">
<el-checkbox @change="updateEnableInOut('out')" v-model="enableOut">鍙嚭</el-checkbox>
</el-form-item>
+ <el-form-item label="">
+ <el-checkbox @change="updateEnableInOut('demo')" v-model="hpMkDemo">婕旂ず</el-checkbox>
+ </el-form-item>
</el-form>
<div>
<!-- <el-button @click="requestOperate('put')" type="primary">鍏ュ簱</el-button>-->
@@ -203,7 +206,8 @@
lev: 1
},
enableIn: false,
- enableOut: false
+ enableOut: false,
+ hpMkDemo: false
},
created() {
this.init()
@@ -227,6 +231,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;
@@ -283,6 +288,11 @@
inEnable: this.enableIn ? "Y" : "N",
crnNo: this.formParam.crnNo
}
+ } else if (type == "demo") {
+ param = {
+ hpMk: this.hpMkDemo ? "Y" : "N",
+ crnNo: this.formParam.crnNo
+ }
} else {
param = {
outEnable: this.enableOut ? "Y" : "N",
diff --git a/src/main/webapp/views/deviceOperate/devpOperate.html b/src/main/webapp/views/deviceOperate/devpOperate.html
index 4640278..4cc3164 100644
--- a/src/main/webapp/views/deviceOperate/devpOperate.html
+++ b/src/main/webapp/views/deviceOperate/devpOperate.html
@@ -59,6 +59,9 @@
<el-form-item label="">
<el-checkbox v-model="formParam.outEnable">鍙嚭</el-checkbox>
</el-form-item>
+ <el-form-item label="">
+ <el-checkbox v-model="formParam.hpMk">婕旂ず</el-checkbox>
+ </el-form-item>
</el-form>
<div>
<el-button @click="requestOperate('update')" type="primary">鏇存柊绔欑偣淇℃伅</el-button>
@@ -100,6 +103,9 @@
</el-descriptions-item>
<el-descriptions-item label="鍙嚭">
<el-tag>{{ tableData[currentIndex].outEnable }}</el-tag>
+ </el-descriptions-item>
+ <el-descriptions-item label="婕旂ず">
+ <el-tag>{{ tableData[currentIndex].hpMk }}</el-tag>
</el-descriptions-item>
<el-descriptions-item label="绌烘澘淇″彿">
<el-tag>{{ tableData[currentIndex].emptyMk }}</el-tag>
@@ -143,7 +149,8 @@
staNo: null,
pakMk: null,
inEnable: false,
- outEnable: false
+ outEnable: false,
+ hpMk: false
}
},
created() {
@@ -172,6 +179,7 @@
this.formParam.pakMk = row.pakMk
this.formParam.inEnable = row.inEnable == "Y" ? true : false
this.formParam.outEnable = row.outEnable == "Y" ? true : false
+ this.formParam.hpMk = row.hpMk == "Y" ? true : false
},
getTableData() {
let that = this;
--
Gitblit v1.9.1