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

rev：更新

Browse Source
This commit is contained in:
gengby
2024-06-28 17:59:25 +08:00
parent fb590f1269
commit dcef47fff8
25 changed files with 1235 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-ui/src/i18n/langs/monitor/en.js
View File

@@ -120,7 +120,7 @@ export default {
'barcode_length': 'Vehicle length',
'last_container': 'Last vehicle number',
'applySucess': 'Request task flag',
'requireSucess': 'Request instruction mark'
'requireSuccess': 'Request instruction mark'
}
}

2
nladmin-ui/src/i18n/langs/monitor/in.js
View File

@@ -120,7 +120,7 @@ export default {
'barcode_length': 'Perjalanan panjang',
'last_container': 'Nomor muatan terakhir',
'applySucess': 'Meminta tanda tugas',
'requireSucess': 'Kode aplikasicomment'
'requireSuccess': 'Kode aplikasicomment'
}
}

2
nladmin-ui/src/i18n/langs/monitor/zh.js
View File

@@ -120,7 +120,7 @@ export default {
'barcode_length': '载具长度',
'last_container': '上次载具号',
'applySucess': '请求任务标记',
'requireSucess': '申请指令标记'
'requireSuccess': '请求标记'
}
}
}

11
nladmin-ui/src/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue
View File

@@ -198,6 +198,11 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="扫码申请AGV任务:" label-width="150px">
<el-switch v-model="form.scanApplyTask" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="自动申请AGV任务:" label-width="150px">
<el-switch v-model="form.applyTask" />
@@ -301,7 +306,7 @@
filterable
clearable
reserve-keyword
placeholder="所属输送线"
placeholder="关联出入点"
style="width: 170px"
>
<el-option
@@ -497,7 +502,9 @@ export default {
toWay: false,
belongToConveyor: null,
linkInOutDevice: '',
samePoint: false
samePoint: false,
scanApplyTask: false,
applyTask: false
},
rules: {}
}

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

@@ -37,7 +37,8 @@
/>
</el-table>
</el-dialog>
<!--弹窗设置设备与图标绑定与角度-->
<!--输送线弹出框-->
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
@@ -46,10 +47,10 @@
<el-form-item :label="$t('monitor.click.bar_code')" label-width="120px">
<el-input v-model="form.hand_barcode" :disabled="false" />
</el-form-item>
<el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
<el-radio-button :label="0">{{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
<el-form-item :label="$t('monitor.click.requireSuccess')" prop="requireSuccess" label-width="120px">
<el-radio-group v-model="requireSuccessDisplay">
<el-radio-button :label="false">{{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="true">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>
@@ -58,136 +59,9 @@
<el-button type="primary" @click="dialogSave">{{ $t('auto.common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--弹窗设置设备与图标绑定与角度-->
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible3" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="80px">
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item :label="$t('monitor.click.device_status')" label-width="80px">
<el-radio-group v-model="form.hasGoodStatus">
<el-radio-button :label="0">{{ $t('monitor.click.out_of_stock') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('monitor.click.with_pallets') }}</el-radio-button>
<el-radio-button :label="2">{{ $t('monitor.click.pallets_and_goods') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('monitor.click.material_code')" prop="material_type" label-width="80px">
<el-input v-model="form.material_type" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible3 = false">{{ $t('auto.common.Cancel') }}</el-button>
<el-button type="primary" @click="dialogSave">{{ $t('auto.common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--弹窗设置设备与图标绑定与角度-->
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible4" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item :label="$t('monitor.click.disabled_manipulator')" prop="is_disable" label-width="120px">
<el-radio-group v-model="form.is_disable">
<el-radio-button :label="0">{{ $t('monitor.click.normal') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('monitor.click.forbidden') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
<el-radio-button :label="0"> {{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible4 = false">{{ $t('auto.common.Cancel') }}</el-button>
<el-button type="primary" @click="dialogSave">{{ $t('auto.common.Confirm') }}</el-button>
</div>
</el-dialog>
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible5" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
<el-radio-button :label="0"> {{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible5 = false">{{ $t('auto.common.Cancel') }}</el-button>
<el-button type="primary" @click="dialogSave">{{ $t('auto.common.Confirm') }}</el-button>
</div>
</el-dialog>
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible7" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item :label="$t('monitor.click.bar_code')" label-width="120px">
<el-input v-model="form.hand_barcode" :disabled="false" />
</el-form-item>
<el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
<el-radio-button :label="0"> {{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible7 = false">{{ $t('auto.common.Cancel') }}</el-button>
<el-button type="primary" @click="dialogSave">{{ $t('auto.common.Confirm') }}</el-button>
</div>
</el-dialog>
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible6" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item label="申请指令标记" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
<el-radio-button :label="0"> {{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="请求任务标记" prop="applySucess" label-width="120px">
<el-radio-group v-model="form.applySucess">
<el-radio-button :label="0"> {{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible5 = false">{{ $t('auto.common.Cancel') }}</el-button>
<el-button type="primary" @click="dialogSave">{{ $t('auto.common.Confirm') }}</el-button>
</div>
</el-dialog>
<!--弹窗设置设备与图标绑定与角度-->
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible1" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="80px">
<el-input v-model="form.device_code" :disabled="true" />
</el-form-item>
<el-form-item :label="$t('monitor.click.bar_code')" prop="device_code" label-width="80px">
<el-input v-model="form.barcode" :disabled="false" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible1 = false">{{ $t('auto.common.Cancel') }}</el-button>
<el-button type="primary" @click="saveBarcode">{{ $t('auto.common.Confirm') }}</el-button>
</div>
</el-dialog>
<!-- 堆垛机弹出框 -->
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible8" width="35%">
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible2" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
@@ -208,15 +82,21 @@
<el-form-item :label="$t('monitor.click.stop_task')" prop="stopReceiveTask" label-width="120px">
<el-switch v-model="form.stopReceiveTask" />
</el-form-item>
<el-form-item :label="$t('monitor.click.requireSucess')" prop="requireSuccess" label-width="120px">
<el-radio-group v-model="form.requireSuccess">
<el-radio-button :label="0"> {{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
<el-form-item :label="$t('monitor.click.requireSuccess')" prop="requireSuccess" label-width="120px">
<el-radio-group v-model="requireSuccessDisplay">
<el-radio-button :label="false">{{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="true">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="异常请求标记" prop="againRequireSuccessDisplay" label-width="120px">
<el-radio-group v-model="againRequireSuccessDisplay">
<el-radio-button :label="false">{{ $t('auto.common.false') }}</el-radio-button>
<el-radio-button :label="true">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible8 = false">{{ $t('auto.common.Cancel') }}</el-button>
<el-button @click="dialogFormVisible2 = false">{{ $t('auto.common.Cancel') }}</el-button>
<el-button type="primary" @click="dialogSave">{{ $t('auto.common.Confirm') }}</el-button>
</div>
</el-dialog>
@@ -248,16 +128,7 @@ export default {
stageSelectList: [],
arr: [], // 显示数组
dialogFormVisible: false,
dialogFormVisible1: false,
dialogFormVisible2: false,
dialogFormVisible3: false,
dialogFormVisible4: false,
dialogFormVisible5: false,
dialogFormVisible6: false,
dialogFormVisible7: false,
dialogFormVisible8: false,
dialogFormVisible9: false,
dialogFormVisible10: false,
Stages: [],
stage_code: '',
form: {
@@ -265,23 +136,36 @@ export default {
hasGoodStatus: null,
barcode: '',
hand_barcode: '',
suspended: null,
material_type: '',
requireSucess: '',
fullrequireSucess: '',
is_disable: '',
applySucess: '',
toCommand: null,
prohibitInWarehouse: false,
prohibitOutWarehouse: false,
stopReceiveTask: false,
requireSuccess: false
requireSuccess: false,
againRequireSuccess: false
},
allDeviceMsg: [],
msgTop: '200px',
msgLeft: '200px'
}
},
computed: {
requireSuccessDisplay: {
get() {
return this.form.requireSuccess === true
},
set(newValue) {
this.form.requireSuccess = !!newValue
}
},
againRequireSuccessDisplay: {
get() {
return this.form.againRequireSuccess === true
},
set(newValue) {
this.form.againRequireSuccess = !!newValue
}
}
},
created() {
selectStageList().then(data => {
this.Stages = data
@@ -393,30 +277,8 @@ export default {
if (clickObj.data.device_type === 'scanner') { // 扫码器
this.dialogFormVisible1 = true
} else {
console.log(clickObj.data.driver_type)
if (clickObj.data.driver_type === 'standard_ordinary_site') {
this.dialogFormVisible3 = true
} else if (clickObj.data.driver_type === 'hailiang_packer_station') {
this.dialogFormVisible4 = true
} else if (clickObj.data.driver_type === 'hailiang_xj_plc_test') {
this.$refs.child1.setForm(clickObj)
} else if (clickObj.data.driver_type === 'slit_two_manipulator') {
this.dialogFormVisible4 = true
} else if (clickObj.data.driver_type === 'siemens_conveyor') {
// if (clickObj.data.device_name.includes('1016')) {
// this.dialogFormVisible7 = true
// } else {
// this.dialogFormVisible5 = true
// }
this.dialogFormVisible7 = true
} else if (clickObj.data.driver_type === 'siemens_conveyor_ckk') {
this.dialogFormVisible7 = true
} else if (clickObj.data.driver_type === 'standard_conveyor_control_with_scanner') {
this.dialogFormVisible6 = true
} else if (clickObj.data.driver_type === 'standard_stacker_device') {
this.dialogFormVisible8 = true
} else if (clickObj.data.driver_type === 'pull_head_manipulator') {
this.dialogFormVisible9 = true
if (clickObj.data.driver_type === 'standard_stacker_device') {
this.dialogFormVisible2 = true
} else {
this.dialogFormVisible = true
}
@@ -424,18 +286,13 @@ export default {
this.form.angle = clickObj.angle
this.form.index = clickObj.index
this.form.device_code = clickObj.device_code
this.form.hasGoodStatus = clickObj.data.hasGoods
this.form.material_type = clickObj.data.material_type
this.form.requireSucess = clickObj.data.requireSucess
this.form.fullrequireSucess = clickObj.data.fullrequireSucess
this.form.is_disable = clickObj.data.is_disable1
this.form.applySucess = clickObj.data.applySucess
this.form.barcode = clickObj.data.barcode
this.form.hand_barcode = clickObj.data.hand_barcode
this.form.hand_barcode = clickObj.data.handBarcode
this.form.prohibitInWarehouse = clickObj.data.prohibitInWarehouse
this.form.prohibitOutWarehouse = clickObj.data.prohibitOutWarehouse
this.form.stopReceiveTask = clickObj.data.stopReceiveTask
this.form.requireSuccess = clickObj.data.requireSuccess
this.form.againRequireSuccess = clickObj.data.againRequireSuccess
this.form.toCommand = null
console.log(this.form)
},
@@ -449,7 +306,7 @@ export default {
}
this.arr = [] // 清空
if (item.device_code && item.data) {
// console.log('item', item)
console.log('item', item)
this.arr = [
{ name: i18n.t('monitor.click.equipment_number'), value: item.device_code },
{ name: i18n.t('monitor.click.device_name'), value: item.device_name }
@@ -463,7 +320,6 @@ export default {
const obj = { name: i18n.t('monitor.click.device_information'), value: data[val] }
this.arr.push(obj)
}
if (val === 'message' && data.isError === 'false') {
const obj = { name: i18n.t('monitor.click.exception_message'), value: data[val] }
this.arr.push(obj)
@@ -481,196 +337,101 @@ export default {
} else if (val === 'ip') {
const obj = { name: 'IP', value: data[val] }
this.arr.push(obj)
} else if (val === 'number') {
const obj = { name: i18n.t('monitor.click.pallet_quantity'), value: data[val] }
this.arr.push(obj)
} else if (val === 'inst_message') {
const obj = { name: i18n.t('monitor.click.instruction_information'), value: data[val] }
this.arr.push(obj)
} else if (val === 'message') {
const obj = { name: i18n.t('monitor.click.note_information'), value: data[val] }
this.arr.push(obj)
} else if (val === 'inst_message') {
const obj = { name: i18n.t('monitor.click.current_instruction_message'), value: data[val] }
this.arr.push(obj)
} else if (val === 'last_inst_message') {
const obj = { name: i18n.t('monitor.click.last_instruction_message'), value: data[val] }
this.arr.push(obj)
} else if (val === 'barcode') {
const obj = { name: i18n.t('monitor.click.barcode'), value: data[val] }
const obj = { name: i18n.t('monitor.click.barcode') + '(电气)', value: data[val] }
this.arr.push(obj)
} else if (val === 'barcode_length') {
const obj = { name: i18n.t('monitor.click.barcode_length'), value: data[val] }
} else if (val === 'inOutMode') {
const obj = { name: '出入库模式', value: data[val] }
this.arr.push(obj)
} else if (val === 'last_container') {
const obj = { name: i18n.t('monitor.click.last_container'), value: data[val] }
this.arr.push(obj)
} else if (val === 'instruction_code') {
const obj = { name: i18n.t('monitor.click.current_instruction_message'), value: data[val] }
this.arr.push(obj)
} else if (val === 'task_code') {
const obj = { name: i18n.t('monitor.click.task_number'), value: data[val] }
this.arr.push(obj)
} else if (val === 'last_instruction_code') {
const obj = { name: i18n.t('monitor.click.last_instruction_message'), value: data[val] }
} else if (val === 'move') {
const obj = { name: '光电信号', value: data[val] }
this.arr.push(obj)
} else if (val === 'action') {
const obj = { name: i18n.t('monitor.click.action_signal'), value: data[val] }
this.arr.push(obj)
} else if (val === 'io_action') {
const obj = { name: i18n.t('monitor.click.clearance_signal'), value: data[val] }
this.arr.push(obj)
} else if (val === 'material') {
const obj = { name: i18n.t('monitor.click.materiel'), value: data[val] }
this.arr.push(obj)
} else if (val === 'batch') {
const obj = { name: i18n.t('monitor.click.lot'), value: data[val] }
this.arr.push(obj)
} else if (val === 'requestSucess') {
const obj = { name: i18n.t('monitor.click.request_task'), value: data[val] }
this.arr.push(obj)
} else if (val === 'applySucess') {
const obj = { name: i18n.t('monitor.click.request_order'), value: data[val] }
this.arr.push(obj)
} else if (val === 'requireApplyLabelingSuccess') {
const obj = { name: i18n.t('monitor.click.apply_labeling'), value: data[val] }
this.arr.push(obj)
} else if (val === 'requireApplyLaStrangulationSuccess') {
const obj = { name: i18n.t('monitor.click.apply_for_bundling'), value: data[val] }
this.arr.push(obj)
} else if (val === 'status') {
const obj = { name: i18n.t('monitor.click.device_status'), value: data[val] }
this.arr.push(obj)
} else if (val === 'weight') {
const obj = { name: i18n.t('monitor.click.weight'), value: data[val] }
this.arr.push(obj)
} else if (val === 'move_1') {
const obj = { name: i18n.t('monitor.click.front_station_photoelectric_signal'), value: data[val] }
this.arr.push(obj)
} else if (val === 'open') {
const obj = { name: i18n.t('monitor.click.open'), value: data[val] }
this.arr.push(obj)
} else if (val === 'close') {
const obj = { name: i18n.t('monitor.click.close'), value: data[val] }
this.arr.push(obj)
} else if (val === 'phase') {
const obj = { name: i18n.t('monitor.click.AGV_phase'), value: data[val] }
this.arr.push(obj)
} else if (val === 'phase_name') {
const obj = { name: i18n.t('monitor.click.description_of_the_AGV_phase'), value: data[val] }
this.arr.push(obj)
} else if (val === 'option') {
const obj = { name: i18n.t('monitor.click.AGV_action'), value: data[val] }
this.arr.push(obj)
} else if (val === 'agv_power') {
const obj = { name: i18n.t('monitor.click.AGV_power'), value: data[val] }
this.arr.push(obj)
} else if (val === 'move_2') {
const obj = { name: i18n.t('monitor.click.station_photoelectric_signal'), value: data[val] }
this.arr.push(obj)
} else if (val === 'action_1') {
const obj = { name: i18n.t('monitor.click.front_station_action_signal'), value: data[val] }
this.arr.push(obj)
} else if (val === 'action_2') {
const obj = { name: i18n.t('monitor.click.back_station_action_signal'), value: data[val] }
this.arr.push(obj)
} else if (val === 'walk_y') {
const obj = { name: i18n.t('monitor.click.walk_y'), value: data[val] }
this.arr.push(obj)
} else if (val === 'task1') {
const obj = { name: i18n.t('monitor.click.previous_station_task'), value: data[val] }
this.arr.push(obj)
} else if (val === 'task2') {
const obj = { name: i18n.t('monitor.click.back_station_task'), value: data[val] }
const obj = { name: '动作信号', value: data[val] }
this.arr.push(obj)
} else if (val === 'task') {
const obj = { name: i18n.t('monitor.click.task_number'), value: data[val] }
const obj = { name: '任务号', value: data[val] }
this.arr.push(obj)
} else if (val === 'is_disable') {
const obj = { name: i18n.t('monitor.click.disable'), value: data[val] }
} else if (val === 'weight') {
const obj = { name: '重量', value: data[val] }
this.arr.push(obj)
} else if (val === 'temperature') {
const obj = { name: i18n.t('monitor.click.current_temperature'), value: data[val] }
} else if (val === 'height') {
const obj = { name: '高度', value: data[val] }
this.arr.push(obj)
} else if (val === 'finish') {
const obj = { name: i18n.t('monitor.click.oven_finish'), value: data[val] }
} else if (val === 'prohibitInWarehouse') {
const obj = { name: '禁止入库', value: data[val] }
this.arr.push(obj)
} else if (val === 'countdown_house') {
const obj = { name: i18n.t('monitor.click.house'), value: data[val] }
} else if (val === 'prohibitOutWarehouse') {
const obj = { name: '禁止出库', value: data[val] }
this.arr.push(obj)
} else if (val === 'countdown_min') {
const obj = { name: i18n.t('monitor.click.minutes'), value: data[val] }
} else if (val === 'stopReceiveTask') {
const obj = { name: '停止接收任务', value: data[val] }
this.arr.push(obj)
} else if (val === 'countdown_sec') {
const obj = { name: i18n.t('monitor.click.seconds'), value: data[val] }
} else if (val === 'requireSuccess') {
const obj = { name: '请求标记', value: data[val] }
this.arr.push(obj)
} else if (val === 'door') {
const obj = { name: i18n.t('monitor.click.gate_state'), value: data[val] }
} else if (val === 'againRequireSuccess') {
const obj = { name: '异常请求标记', value: data[val] }
this.arr.push(obj)
} else if (val === 'notCreateTaskMessage') {
const obj = { name: i18n.t('monitor.click.task_creation_failure'), value: data[val] }
} else if (val === 'front_command') {
const obj = { name: '前叉动作命令', value: data[val] }
this.arr.push(obj)
} else if (val === 'notCreateInstMessage') {
const obj = { name: i18n.t('monitor.click.failed_to_create_instruction'), value: data[val] }
} else if (val === 'front_task') {
const obj = { name: '前叉任务号', value: data[val] }
this.arr.push(obj)
} else if (val === 'feedMessage') {
const obj = { name: i18n.t('monitor.click.no_electrical_signal_feedback_cause'), value: data[val] }
} else if (val === 'front_Zerror') {
const obj = { name: '前叉报警信息', value: data[val] }
this.arr.push(obj)
} else if (val === 'requireSucess') {
const obj = { name: i18n.t('monitor.click.request_success_flag'), value: data[val] }
} else if (val === 'front_z') {
const obj = { name: '前叉行走排', value: data[val] }
this.arr.push(obj)
} else if (val === 'applySucess') {
const obj = { name: 'applySucess', value: data[val] }
} else if (val === 'front_x') {
const obj = { name: '前叉行走列', value: data[val] }
this.arr.push(obj)
} else if (val === 'out_finish') {
const obj = { name: i18n.t('monitor.click.delivery_completed'), value: data[val] }
} else if (val === 'front_y') {
const obj = { name: '前叉行走层', value: data[val] }
this.arr.push(obj)
} else if (val === 'inventory_qty') {
const obj = { name: i18n.t('monitor.click.inventory_quantity'), value: data[val] }
} else if (val === 'back_command') {
const obj = { name: '后叉动作命令', value: data[val] }
this.arr.push(obj)
} else if (val === 'hand_barcode') {
const obj = { name: 'barcode', value: data[val] }
} else if (val === 'back_task') {
const obj = { name: '后叉任务号', value: data[val] }
this.arr.push(obj)
} else if (val === 'x') {
const obj = { name: 'X', value: data[val] }
} else if (val === 'back_Zerror') {
const obj = { name: '后叉报警信息', value: data[val] }
this.arr.push(obj)
} else if (val === 'y') {
const obj = { name: 'Y', value: data[val] }
} else if (val === 'back_z') {
const obj = { name: '后叉行走排', value: data[val] }
this.arr.push(obj)
} else if (val === 'angle') {
const obj = { name: i18n.t('monitor.click.angle'), value: data[val] }
} else if (val === 'back_x') {
const obj = { name: '后叉行走列', value: data[val] }
this.arr.push(obj)
} else if (val === 'electricity') {
const obj = { name: i18n.t('monitor.click.electric_quantity'), value: data[val] }
} else if (val === 'back_y') {
const obj = { name: '后叉行走层', value: data[val] }
this.arr.push(obj)
} else if (val === 'status_name') {
const obj = { name: i18n.t('monitor.click.status'), value: data[val] }
} else if (val === 'strategy') {
const obj = { name: '堆垛机策略', value: data[val] }
this.arr.push(obj)
} else if (val === 'fault') {
const obj = { name: i18n.t('monitor.click.abnormal'), value: data[val] }
} else if (val === 'unExecutedMessage') {
const obj = { name: '未执行任务原因', value: data[val] }
this.arr.push(obj)
} else if (val === 'map_id') {
const obj = { name: i18n.t('monitor.click.floor'), value: data[val] }
} else if (val === 'inOutMode') {
const obj = { name: '出入库模式', value: data[val] }
this.arr.push(obj)
} else if (val === 'power') {
const obj = { name: i18n.t('monitor.click.electric_quantity'), value: data[val] }
} else if (val === 'switchInOut') {
const obj = { name: '允许切换出入模式', value: data[val] }
this.arr.push(obj)
} else if (val === 'pallet') {
const obj = { name: i18n.t('monitor.click.tray'), value: data[val] }
this.arr.push(obj)
} else if (val === 'load') {
const obj = { name: i18n.t('monitor.click.loading_or_not'), value: data[val] }
this.arr.push(obj)
} else if (val === 'alarm') {
const obj = { name: i18n.t('monitor.click.alarm'), value: data[val] }
this.arr.push(obj)
} else if (val === 'task_id') {
const obj = { name: i18n.t('monitor.click.task_number'), value: data[val] }
} else if (val === 'handBarcode') {
const obj = { name: '载具号(补码)', value: data[val] }
this.arr.push(obj)
}
}
}
// console.log('arr:', this.arr)
console.log('11111')
console.log('arr:', this.arr)
},
initStatus() { // 初始化所有节点的设备信息，通过节点id对应设备编号
let resion = {}
@@ -711,22 +472,11 @@ export default {
deviceCrud.changeDeviceStatus(this.form).then(res => {
this.$notify({ title: '操作成功', message: '', type: 'success' })
this.dialogFormVisible = false
this.dialogFormVisible3 = false
this.dialogFormVisible4 = false
this.dialogFormVisible5 = false
this.dialogFormVisible6 = false
this.dialogFormVisible7 = false
this.dialogFormVisible8 = false
this.dialogFormVisible9 = false
this.dialogFormVisible2 = false
this.initStageData()
}).catch(err => {
this.dialogFormVisible = false
this.dialogFormVisible3 = false
this.dialogFormVisible4 = false
this.dialogFormVisible5 = false
this.dialogFormVisible7 = false
this.dialogFormVisible8 = false
this.dialogFormVisible9 = false
this.dialogFormVisible2 = false
console.log(err.response.data.message)
})
},
@@ -739,6 +489,16 @@ export default {
this.dialogFormVisible1 = false
console.log(err.response.data.message)
})
},
initStageData() {
// 获取舞台编码
if (this.stage_code !== '') {
crudStage.getNewStageDataByCode(this.stage_code).then(res => { // 通过舞台编码获取舞台数据并且赋值到lf对象
data = JSON.parse(res.stage_data)
lf.render(data)
this.initStatus() // 初始化状态
})
}
}
}
}
@@ -760,12 +520,74 @@ body {
height: 100%;
}
.newDialog /deep/ .el-dialog__header {
padding: 1vh 1vw 0 1vw;
/deep/ .el-dialog {
background-color: transparent;
background-color: rgba(2, 11, 47, 0.9);
border: 1px solid #4dbeff;
box-shadow: inset 4px 4px 8px 0px rgba(77, 190, 255, .9), inset -4px -4px 8px 0px rgba(77, 190, 255, .9);
/* background-image: url('../../../../assets/images/kanban.svg'); */
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: top center;
padding: 10px 14px;
}
.newDialog /deep/ .el-dialog__body {
padding: 1vh 1vw;
/deep/ .el-dialog__header {
padding: 1vh 1vw 0 1vw;
border-bottom: 1px solid #395d6f;
background: linear-gradient(to right, #00b3ee 0%, rgba(2, 11, 47, 0.3) 30%, rgba(2, 11, 47, 0) 100%);
}
/deep/ .el-dialog__title {
font-size: 16px;
color: #fff;
}
/deep/ .el-dialog__body {
padding-top: 20px !important;
}
/deep/ .el-form-item__label, /deep/ .el-dialog__headerbtn .el-dialog__close {
color: #fff;
}
/deep/ .el-input.is-disabled .el-input__inner, /deep/ .el-radio-button__inner {
background-color: #00557c;
border-color: #00b3ee;
color: #fff;
}
/deep/ .el-radio-button:first-child .el-radio-button__inner {
border-left-color: #00b3ee;
}
.newDialog /deep/ .el-dialog__body .el-table tr, .newDialog /deep/ .el-dialog__body .el-table .el-table__header-wrapper th, .newDialog /deep/ .el-dialog__body .el-table {
background-color: transparent;
}
.newDialog /deep/ .el-table--border, .newDialog /deep/ .el-table--border .el-table__cell {
border: 0;
color: #00afff;
}
.newDialog /deep/ .el-table::before {
height: 0;
}
.newDialog /deep/ .el-table--border::after {
width: 0;
}
.newDialog /deep/ .el-table_1_column_1, .newDialog /deep/ .el-table_2_column_3 {
color: #fff;
}
.newDialog /deep/ .el-table_1_column_2, .newDialog /deep/ .el-table_2_column_4 {
color: #00b3ee;
}
.newDialog /deep/ .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
background-color: #00557c;
}
.toolbar-sty {
@@ -783,22 +605,24 @@ body {
background: #e5e5e5;
}
::v-deep.el-radio-button{
::v-deep.el-radio-button {
margin-right: 15px;
border-radius:4px;
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;
}
.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>