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

opt: 国际化,页面优化

Browse Source
This commit is contained in:
yanps
2024-06-21 09:45:04 +08:00
parent 769d08d77b
commit 0be3799d6d
19 changed files with 92 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,20 @@
<el-option v-for="item in regions" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="是否配置">
<el-select
v-model="query.is_config"
clearable
filterable
size="small"
placeholder="是否配置"
class="filter-item"
style="width: 200px"
@change="crud.toQuery"
>
<el-option v-for="item in is_configs" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<rrOperation />
</el-form>
</div>
@@ -259,6 +273,7 @@ export default {
device_types: [],
uploadShow: false,
regions: [],
is_configs: [],
rules: {
device_code: [
{ required: true, message: '设备编码不能为空', trigger: 'blur' }
@@ -282,6 +297,10 @@ export default {
get('region_type').then(data => {
this.regions = data.content
})
// 是否
get('TrueOrFalse').then(data => {
this.is_configs = data.content
})
})
},
methods: {

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

@@ -209,6 +209,7 @@
v-model="form.start_point_code"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.select.Placeholder')"
@change="showStartStorage"
>
@@ -257,6 +258,7 @@
v-model="form.next_point_code"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.select.Placeholder')"
@change="showEndStorage"
>
@@ -312,6 +314,7 @@
v-model="form.start_point_code2"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.select.Placeholder')"
>
<el-option
@@ -359,6 +362,7 @@
v-model="form.next_point_code2"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.select.Placeholder')"
>
<el-option
@@ -502,7 +506,7 @@
<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="$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="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true":show-overflow-tooltip="true" width="150px" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true" width="150px" />
<el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />

20
acs2/nladmin-ui/src/views/system/dict/dictDetail.vue
View File

@@ -21,6 +21,16 @@
</div>
</div>
<!--表单组件-->
<!-- <el-button
slot="right"
class="filter-item"
type="warning"
icon="el-icon-upload2"
size="mini"
@click="uploadShow = true"
>
{{ $t('auto.common.import') }}
</el-button> -->
<el-dialog
append-to-body
:close-on-click-modal="false"
@@ -33,13 +43,13 @@
<el-form-item :label="$t('dict.other.Department_label')" prop="label">
<el-input v-model="form.label" style="width: 370px;" />
</el-form-item>
<el-form-item :label="$t('dict.other.Department_label_zh')" prop="label">
<el-form-item :label="$t('dict.other.Department_label_zh')" prop="zh_label">
<el-input v-model="form.zh_label" style="width: 370px;" />
</el-form-item>
<el-form-item :label="$t('dict.other.Department_label_en')" prop="label">
<el-form-item :label="$t('dict.other.Department_label_en')" prop="en_label">
<el-input v-model="form.en_label" style="width: 370px;" />
</el-form-item>
<el-form-item :label="$t('dict.other.Department_label_in')" prop="label">
<el-form-item :label="$t('dict.other.Department_label_in')" prop="in_label">
<el-input v-model="form.in_label" style="width: 370px;" />
</el-form-item>
<el-form-item :label="$t('dict.other.Dictionary_value')" prop="value">
@@ -116,7 +126,9 @@ import rrOperation from '@crud/RR.operation'
import udOperation from '@crud/UD.operation'
import i18n from '@/i18n'
const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dictType: null, para1: null, para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null, updateTime: null }
const defaultForm = { dict_id: null, name: null, label: null, value: null, dict_sort: null, dictType: null, para1: null,
para2: null, para3: null, createId: null, createName: null, createTime: null, updateId: null, updateName: null,
updateTime: null, zh_label: null, in_label: null, en_label: null }
export default {
components: { pagination, rrOperation, udOperation },

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

@@ -138,6 +138,12 @@
<el-radio-button :label="1">{{ $t('auto.common.true') }}</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="申请指令标记" prop="requireActionSucess" label-width="120px">
<el-radio-group v-model="form.requireActionSucess">
<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>
@@ -406,13 +412,18 @@ export default {
}
this.Stages.push(tempObject)
}
if (this.language === 'in') {
if (i18n.locale === 'in') {
const tempObject = {
'stage_name': data[i].in_stage_name,
'stage_code': data[i].stage_code
}
this.Stages.push(tempObject)
}
/* const tempObject = {
'stage_name': data[i].in_stage_name,
'stage_code': data[i].stage_code
}
this.Stages.push(tempObject) */
}
console.log(this.Stages)
})
@@ -459,11 +470,6 @@ export default {
} 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
@@ -563,7 +569,7 @@ export default {
const obj = { name: i18n.t('monitor.click.last_instruction_message'), value: data[val] }
this.arr.push(obj)
} else if (val === 'container_type') {
const obj = { name: '托盘类型', value: data[val] }
const obj = { name: i18n.t('monitor.click.pallet_type'), value: data[val] }
this.arr.push(obj)
} else if (val === 'barcode') {
const obj = { name: i18n.t('monitor.click.barcode'), value: data[val] }
@@ -656,7 +662,7 @@ export default {
const obj = { name: i18n.t('monitor.click.task_number'), value: data[val] }
this.arr.push(obj)
} else if (val === 'last_task') {
const obj = { name: '上次任务号', value: data[val] }
const obj = { name: i18n.t('monitor.click.last_mission_number'), value: data[val] }
this.arr.push(obj)
} else if (val === 'is_disable') {
const obj = { name: i18n.t('monitor.click.disable'), value: data[val] }
@@ -706,6 +712,9 @@ export default {
} else if (val === 'hand_barcode') {
const obj = { name: '补码信息', value: data[val] }
this.arr.push(obj)
} else if (val === 'hand_barcode1') {
const obj = { name: i18n.t('monitor.click.the_subvolume_number'), value: data[val] }
this.arr.push(obj)
} else if (val === 'x') {
const obj = { name: 'X', value: data[val] }
this.arr.push(obj)