root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix : 申请任务先找指令

Browse Source
This commit is contained in:
lishuai
2024-02-01 16:37:50 +08:00
parent 10c25d60a6
commit bf368ec156
22 changed files with 972 additions and 613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs2/nladmin-ui/src/views/acs/monitor/device/index.vue
View File

@@ -240,6 +240,7 @@ export default {
dialogFormVisible2: false,
dialogFormVisible3: false,
dialogFormVisible4: false,
dialogFormVisible5: false,
arr2: [],
currentItem: '',
stageSelectList: [],
@@ -283,7 +284,9 @@ export default {
this.dialogFormVisible4 = true
} else if (clickObj.data.driver_type === 'hailiang_xj_plc_test') {
this.$refs.child1.setForm(clickObj)
} else {
} else if (clickObj.data.driver_type === 'standard_stacker') {
this.dialogFormVisible4 = true
}else {
this.dialogFormVisible = true
}
}

38
acs2/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -32,15 +32,16 @@
<!--弹窗设置设备与图标绑定与角度-->
<el-dialog title="设备设置" :visible.sync="dialogFormVisible" width="35%">
<el-form :model="form" size="small">
<el-form-item label="设备编号" prop="device_code" label-width="80px">
<el-form-item label="设备编号" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="设备状态" label-width="80px">
<el-radio-group v-model="form.option">
<el-radio-button :label="0">禁止进出</el-radio-button>
<el-radio-button :label="1">允许进入</el-radio-button>
<el-radio-button :label="2">允许离开</el-radio-button>
<el-form-item label="条码" label-width="120px">
<el-input v-model="form.hand_barcode" :disabled="false" />
</el-form-item>
<el-form-item label="请求标记" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
<el-radio-button :label="0">否</el-radio-button>
<el-radio-button :label="1">是</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>
@@ -49,7 +50,6 @@
<el-button type="primary" @click="dialogSave">确 定</el-button>
</div>
</el-dialog>
<!--弹窗设置设备与图标绑定与角度-->
<el-dialog title="设备设置" :visible.sync="dialogFormVisible3" width="35%">
<el-form :model="form" size="small">
@@ -186,7 +186,7 @@
</el-form-item>
<el-form-item label="作业命令" prop="toCommand" label-width="120px">
<el-radio-group v-model="form.toCommand">
<el-radio-button :label="7">召回</el-radio-button>
<el-radio-button :label="7" >召回</el-radio-button>
<el-radio-button :label="8">急停</el-radio-button>
<el-radio-button :label="5">清警</el-radio-button>
</el-radio-group>
@@ -387,7 +387,7 @@ export default {
this.dialogFormVisible7 = true
} else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') {
this.dialogFormVisible6 = true
} else if (clickObj.data.driver_type === 'double_station_stacker') {
} else if (clickObj.data.driver_type === 'standard_stacker') {
this.dialogFormVisible8 = true
} else {
this.dialogFormVisible = true
@@ -750,4 +750,22 @@ body {
z-index: 10;
background: #e5e5e5;
}
::v-deep.el-radio-button{
margin-right: 15px;
border-radius:4px;
.el-radio-button__inner {
width: 90px;
height: 30px;
background: #F7F8FA;
color:#333;
border: 0 !important;
}
.el-radio-button__orig-radio:checked + .el-radio-button__inner {
color: #fff;
background-color: blue;
border-color: blue;
box-shadow: -1px 0 0 0 blue;
}
}
</style>