Browse Source

Merge branch 'zhangtao' of gitadmin/tuoheng_pilot_web into develop

pull/89/head
zhangtao 1 year ago
parent
commit
902f5dd422
2 changed files with 5 additions and 5 deletions
  1. +3
    -3
      src/views/equipment-library/uva-manage/tools/form.js
  2. +2
    -2
      src/views/equipment-library/uva-manage/tools/table.js

+ 3
- 3
src/views/equipment-library/uva-manage/tools/form.js View File

code: null, code: null,
name: null, name: null,
powerType: null, powerType: null,
srt_type: null,
srtType: null,
accuracy: null, accuracy: null,
manufacturer: null manufacturer: null
}, },
code: [{ required: true, message: '请输入设备编号', trigger: 'blur' }], code: [{ required: true, message: '请输入设备编号', trigger: 'blur' }],
name: [{ required: true, message: '请输入设备名称', type: 'string', trigger: 'blur' }], name: [{ required: true, message: '请输入设备名称', type: 'string', trigger: 'blur' }],
powerType: [{ required: true, type: 'number', message: '请选择动力类型', trigger: 'blur' }], powerType: [{ required: true, type: 'number', message: '请选择动力类型', trigger: 'blur' }],
srt_type: [{ required: true, type: 'number', message: '请选择文件类型', trigger: 'blur' }],
srtType: [{ required: true, type: 'number', message: '请选择文件类型', trigger: 'blur' }],
accuracy: [{ required: true, type: 'number', message: '请输入定位精度', trigger: 'blur' }], accuracy: [{ required: true, type: 'number', message: '请输入定位精度', trigger: 'blur' }],
manufacturer: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }] manufacturer: [{ required: true, message: '请输入生产厂家', trigger: 'blur' }]
}, },
{ type: 'input', key: 'code', label: '设备编号', props: { maxlength: '20', placeholder: '请输入设备编号', clearable: true }}, { type: 'input', key: 'code', label: '设备编号', props: { maxlength: '20', placeholder: '请输入设备编号', clearable: true }},
{ type: 'input', key: 'name', label: '设备名称', props: { maxlength: '20', placeholder: '请输入设备名称', clearable: true }}, { type: 'input', key: 'name', label: '设备名称', props: { maxlength: '20', placeholder: '请输入设备名称', clearable: true }},
{ type: 'select', key: 'powerType', label: '动力类型', props: { options: POWER_TYPE, clearable: true }}, { type: 'select', key: 'powerType', label: '动力类型', props: { options: POWER_TYPE, clearable: true }},
{ type: 'select', key: 'srt_type', label: '文件类型', props: { options: FILE_TYPE, clearable: true }},
{ type: 'select', key: 'srtType', label: '文件类型', props: { options: FILE_TYPE, clearable: true }},
{ type: 'number', key: 'accuracy', label: '定位精度', props: { min: 0, placeholder: '请输入通道编码', showButton: false, clearable: true }, suffix: '米' }, { type: 'number', key: 'accuracy', label: '定位精度', props: { min: 0, placeholder: '请输入通道编码', showButton: false, clearable: true }, suffix: '米' },
{ type: 'input', key: 'manufacturer', label: '生产厂家', props: { maxlength: '20', placeholder: '请输入生产厂家', clearable: true }} { type: 'input', key: 'manufacturer', label: '生产厂家', props: { maxlength: '20', placeholder: '请输入生产厂家', clearable: true }}
] ]

+ 2
- 2
src/views/equipment-library/uva-manage/tools/table.js View File

}, },
{ {
title: '文件类型', title: '文件类型',
key: 'srt_type',
key: 'srtType',
align: 'center', align: 'center',
render(row) { render(row) {
return h(TableTags, { return h(TableTags, {
data: row.srt_type,
data: row.srtType,
filters: FILE_TYPE filters: FILE_TYPE
}) })
} }

Loading…
Cancel
Save