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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lishuai
2024-02-29 13:14:05 +08:00
parent 864990b446 f278b71ca0
commit 881ade414e
33 changed files with 502 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue
View File

@@ -135,7 +135,7 @@ export default {
props: {
parentForm: {
type: Object,
required: true
require: true
}
},
cruds() {

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

@@ -166,11 +166,10 @@
</el-table-column>
<el-table-column prop="start_point_code" :label="$t('Inst.table.start_point_code')" :min-width="flexWidth('start_point_code',crud.data,$t('Inst.table.start_point_code'))" />
<el-table-column prop="next_point_code" :label="$t('Inst.table.next_point_code')" :min-width="flexWidth('next_point_code',crud.data,$t('Inst.table.next_point_code'))" />
<!-- <el-table-column prop="start_point_code2" label="取货点2" />-->
<!-- <el-table-column prop="next_point_code2" label="放货点2" />-->
<el-table-column prop="start_point_code2" :label="$t('Inst.table.start_point_code2')" :min-width="flexWidth('start_point_code2',crud.data,$t('Inst.table.start_point_code2'))" />
<el-table-column prop="next_point_code2" :label="$t('Inst.table.next_point_code2')" :min-width="flexWidth('next_point_code2',crud.data,$t('Inst.table.snext_point_code2'))" />
<el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
<el-table-column prop="carno" :label="$t('Inst.table.carno')" :min-width="flexWidth('carno',crud.data,$t('Inst.table.carno'))" />
<el-table-column prop="remark" :label="$t('Inst.table.remark')" :min-width="flexWidth('remark',crud.data,$t('Inst.table.remark'))" />
<el-table-column prop="create_by" :label="$t('Inst.table.create_by')" :min-width="flexWidth('create_by',crud.data,$t('Inst.table.create_by'))" />

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

@@ -286,7 +286,7 @@ export default {
this.$refs.child1.setForm(clickObj)
} else if (clickObj.data.driver_type === 'standard_stacker') {
this.dialogFormVisible4 = true
}else {
} else {
this.dialogFormVisible = true
}
}

12
acs2/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -494,8 +494,8 @@
<el-table-column prop="start_point_code" :label="$t('task.select.Pickup_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Pickup_point'))" />
<!-- <el-table-column prop="put_point_code" label="倒料点" width="100" />-->
<el-table-column prop="next_point_code" :label="$t('task.select.Delivery_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))" />
<!-- <el-table-column prop="start_point_code2" label="取货点2" width="120px" />-->
<!-- <el-table-column prop="next_point_code2" label="放货点2" width="120px" />-->
<el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
<el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
<!-- <el-table-column prop="compound_task" label="复合任务">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.compound_task==='0' ">否</span>-->
@@ -759,7 +759,11 @@ export default {
this.dialogVisible = false
},
saveBtn() {
// 禁用按钮
this.isDisabled = true
crudTask.add(this.form).then(res => {
// 请求完成后启用按钮
this.isDisabled = false
this.crud.toQuery()
this.formDia = false
this.isDisabled = true
@@ -767,6 +771,10 @@ export default {
this.extension = [{
name: '',
value: '' }]
// 设置定时器，等待一定时间后再次允许请求
setTimeout(() => {
this.isDisabled = false // 可根据具体需求进行调整
}, 1000) // 5000 毫秒，即 5 秒钟
},
openDialog() {
this.dialogVisible = true