*

lsh

21 小时以前 255e7ef8d8d282305baa43e77115bfff1cfffccb

*

 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);

 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;


 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",

 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;