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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/xg_agv_car/XgAgvCarDeviceDriver.java
This commit is contained in:
lishuai
2024-07-08 17:26:18 +08:00
parent 447c175049 050daf64d6
commit da4d4c0352
21 changed files with 259 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs2/nladmin-ui/src/i18n/langs/task/en.js
View File

@@ -22,6 +22,7 @@ export default {
'Task': 'Task',
'start_or_end': 'Origin Or Destination',
'time': 'Time',
'empty_shaft_position': 'Empty shaft position',
'extension_field': 'Extension Field'
},
'select': {

1
acs2/nladmin-ui/src/i18n/langs/task/in.js
View File

@@ -22,6 +22,7 @@ export default {
'Task': 'Tugas',
'start_or_end': 'Asal Atau Tujuan',
'time': 'Waktu',
'empty_shaft_position': 'Posisi poros kosong',
'extension_field': 'Bidang Perluasan'
},
'select': {

1
acs2/nladmin-ui/src/i18n/langs/task/zh.js
View File

@@ -22,6 +22,7 @@ export default {
'Task': '任务',
'start_or_end': '起点或终点',
'time': '时间段',
'empty_shaft_position': '空轴位',
'extension_field': '扩展字段'
},
'select': {

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

@@ -157,7 +157,7 @@
</el-table-column>
<el-table-column prop="dbr_value2">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
<el-link type="primary" :underline="false" @click.native="test_read2()">测试读</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
@@ -354,6 +354,15 @@ export default {
console.log(err.response.data.message)
})
},
test_read2() {
testRead(this.data2, this.opc_id).then(data => {
this.data2 = data
console.log(this.data2)
this.notify('操作成功!', 'success')
}).catch(err => {
console.log(err.response.data.message)
})
},
doSubmit() {
this.$refs['form'].validate((valid) => {
if (valid) {

4
acs2/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue
View File

@@ -73,7 +73,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="关联设备" prop="device_code" label-width="135px">
<el-select
v-model="form.link_device_code"
@@ -89,7 +89,7 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
</el-form>
</el-card>

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

@@ -429,8 +429,21 @@
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="空轴位">
<el-input v-model="form.empty_site" style="width: 370px;" @change="isDisabled=false" />
<el-form-item :label="$t('task.txt_box.empty_shaft_position')">
<el-select
v-model="form.empty_site"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.txt_box.empty_shaft_position')"
>
<el-option
v-for="item in dict.empty_shaft_position"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.extension_field')">
<div>
@@ -615,7 +628,7 @@ import i18n from '@/i18n'
export default {
name: 'Task',
components: { pagination, crudOperation, rrOperation },
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan'],
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan', 'empty_shaft_position'],
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({ title: i18n.t('task.txt_box.Task'), url: 'api/task', idField: 'task_id', sort: 'task_id,desc',
@@ -677,6 +690,7 @@ export default {
formDia: false,
isDisabled: false,
deviceList: [],
empty_shaft_position: [],
materialList: [],
statusList: [],
routeList: [],

12
acs2/nladmin-ui/src/views/monitor/logQuery/search.vue
View File

@@ -8,14 +8,18 @@
<!-- style="width: 200px;"-->
<!-- class="filter-item"-->
<!-- />-->
<el-input
<el-select
v-model="query.method"
clearable
filterable
size="small"
placeholder="请输入你要搜索的方法名"
style="width: 200px;"
class="filter-item"
/>
style="width: 200px"
@change="crud.toQuery"
>
<el-option v-for="item in methods" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
<el-input
v-model="query.requestparam"
clearable
@@ -104,7 +108,7 @@ export default {
queryAddressCodeList().then(data => {
this.methods = data.content
})
},
}
}
</script>

4
acs2/nladmin-ui/src/views/monitor/lucene/index.vue
View File

@@ -14,7 +14,7 @@
>
<!-- <el-table-column type="selection" width="55"/>-->
<!-- <el-table-column v-if="false" prop="id" label="id"/>-->
<el-table-column prop="device_code" label="设备号" width="100px" />
<el-table-column prop="device_code" label="设备号" width="120px" />
<!-- <el-table-column prop="trace_id" label="链路追踪" /> -->
<el-table-column prop="task_code" label="任务编号" width="100px" />
<el-table-column prop="instruct_code" label="指令编号" width="100px" />
@@ -53,7 +53,7 @@ export default {
page: 0
},
query: {
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))],
createTime: [new Date(new Date().setTime(new Date().getTime() - 3600 * 1000)), new Date(new Date().setTime(new Date().getTime() + 3600 * 1000))]
}
})
},

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

@@ -641,7 +641,7 @@ export default {
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] }
const obj = { name: i18n.t('monitor.click.post-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] }