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

fix:优化前端页面以及修复点位管理功能bug

Browse Source
This commit is contained in:
tuqiang
2024-05-10 17:51:15 +08:00
parent 9e45690cd0
commit f9667ee9a1
7 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue
View File

@@ -14,7 +14,7 @@
<el-select
v-model="query.route_plan_id"
:placeholder="$t('route.placeholder.please_type')"
style="width: 250px;"
style="width: 200px;"
>
<el-option
v-for="item in routePlanList"
@@ -30,7 +30,7 @@
clearable
size="small"
:placeholder="$t('route.placeholder.enter_code')"
style="width: 250px;"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
@@ -41,7 +41,7 @@
clearable
size="small"
:placeholder="$t('route.placeholder.enter_next_device_code')"
style="width: 250px;"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
@@ -176,18 +176,18 @@
:label="$t('device.device_table_title.device_encoding')"
:min-width="flexWidth('device_code',crud.data,$t('device.device_table_title.device_encoding'))"
/>
<el-table-column prop="start_device_type" min-width="120" :label="$t('route.table_title.device_type')" />
<el-table-column prop="start_device_type" :min-width="flexWidth('start_device_type',crud.data,$t('route.table_title.device_type'))" :label="$t('route.table_title.device_type')" />
<el-table-column v-if="false" prop="device_code" :label="$t('device.device_table_title.device_name')" />
<el-table-column prop="type" :label="$t('route.table_title.type')">
<el-table-column prop="type" :min-width="flexWidth('type',crud.data,$t('route.table_title.type'))" :label="$t('route.table_title.type')">
<template slot-scope="scope">
<span v-if="scope.row.type=='0' ">{{ $t('route.table_title.transport_route') }}</span>
<span v-if="scope.row.type=='1' ">{{ $t('route.table_title.agv_route') }}</span>
</template>
</el-table-column>
<el-table-column prop="next_device_code" min-width="120" :label="$t('route.table_title.next_device_code')" />
<el-table-column v-if="false" prop="next_device_code" min-width="120" label="后置设备名称" />
<el-table-column prop="next_device_type" min-width="120" :label="$t('route.table_title.next_device_type')" />
<el-table-column prop="weights" :label="$t('route.table_title.weights')" />
<el-table-column prop="next_device_code" :min-width="flexWidth('next_device_code',crud.data,$t('route.table_title.next_device_code'))" :label="$t('route.table_title.next_device_code')" />
<el-table-column v-if="false" prop="next_device_code" :min-width="flexWidth('next_device_code',crud.data,$t('route.table_title.next_device_code'))" :label="$t('route.table_title.next_device_code')" />
<el-table-column prop="next_device_type" :min-width="flexWidth('next_device_type',crud.data,$t('route.table_title.next_device_type'))" :label="$t('route.table_title.next_device_type')" />
<el-table-column prop="weights" :min-width="flexWidth('weights',crud.data,$t('route.table_title.weights'))" :label="$t('route.table_title.weights')" />
<el-table-column
:label="$t('auto.common.is_on')"
@@ -207,12 +207,12 @@
</template>
</el-table-column>
<el-table-column prop="update_by" :label="$t('auto.common.update_by')" />
<el-table-column prop="update_time" min-width="160" :label="$t('auto.common.update_time')" />
<el-table-column prop="update_by" :min-width="flexWidth('update_by',crud.data,$t('auto.common.update_by'))" :label="$t('auto.common.update_by')" />
<el-table-column prop="update_time" :min-width="flexWidth('update_time',crud.data,$t('auto.common.update_time'))" :label="$t('auto.common.update_time')" />
<el-table-column
v-permission="['admin','routeLine:edit','routeLine:del']"
:label="$t('auto.common.Operate')"
width="150px"
width="100px"
align="center"
>
<template slot-scope="scope">

7
acs2/nladmin-ui/src/views/system/menu/index.vue
View File

@@ -16,15 +16,18 @@
clearable
size="mini"
:placeholder="$t('menu.placeholder.fuzzy_search')"
style="width: 200px;margin-bottom: 10px"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="queryBlurry"
/>
</el-form-item>
<el-form-item :label="$t('menu.placeholder.owning_system')">
<el-select
clearable
size="mini"
v-model="query.system_type"
style="width: 200px; margin-bottom: 10px"
class="filter-item"
style="width: 200px;"
:placeholder="$t('menu.placeholder.owning_system')"
@change="changetype"
>

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

@@ -139,7 +139,7 @@
<el-table-column
v-permission="['admin','timing:edit','timing:del']"
:label="$t('auto.common.Operate')"
width="170px"
width="250px"
align="center"
fixed="right"
>