feat: asset model 增加 type,sysObjectId

This commit is contained in:
@changcode
2022-03-11 14:26:14 +08:00
parent 0887af075c
commit 878207d722
4 changed files with 42 additions and 2 deletions

View File

@@ -198,6 +198,16 @@ export function arrLength (rule, value, callback) { // 校验数组
}
}
export function sysObjectIdInput (rule, value, callback) {
const sysId = /^(\d+\.)+\d${color}/
setTimeout(() => {
if (sysId.test(value)) {
callback()
} else {
callback(new Error(vm.$t('validate.sysId')))
}
}, 100)
}
export function longAndLat (rule, value, callback) { // 校验经纬度
}

View File

@@ -19,6 +19,12 @@
<el-option :id="'module-project-'+item.id" v-for="item in brandList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<!-- type -->
<el-form-item :label='$t("overall.type")' prop="typeId">
<el-select value-key="id" class="right-box__select" popper-class="right-box-select-top prevent-clickoutside" v-model="editModel.typeId" placeholder="" size="small">
<el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<!-- ChartTemplate -->
<el-form-item :label="$t('config.model.ChartTemplate')" prop="ChartTemplate">
<v-selectpage
@@ -40,6 +46,10 @@
:result-format="resultFormat"
></v-selectpage>
</el-form-item>
<!-- sys object id -->
<el-form-item :label="$t('config.model.sysObjectId')" prop="sysObjectId">
<el-input maxlength="64" show-word-limit v-model="editModel.sysObjectId" size="small" type="text"></el-input>
</el-form-item>
<!--remark-->
<el-form-item :label="$t('overall.remark')" prop="remark">
<el-input maxlength="256" show-word-limit v-model="editModel.remark" size="small" type="text"></el-input>
@@ -62,6 +72,7 @@
// import { host, port } from '@/components/common/js/validate'
import selectWalk from '../../popBox/selectWalk'
import editRigthBox from '../../mixin/editRigthBox'
import { sysObjectIdInput } from '@/components/common/js/validate'
export default {
name: 'modelBox',
@@ -87,6 +98,7 @@ export default {
editModel: {},
brandList: [], // brand 列表数据
editModule: {},
typeList: [],
chartlList: [], // chart 列表数据
ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
{ title: 'ID', data: 'id' },
@@ -104,6 +116,12 @@ export default {
],
brandId: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' }
],
typeId: [
{ required: true, message: this.$t('validate.required'), trigger: 'change' }
],
sysObjectId: [
{ validator: sysObjectIdInput, trigger: 'blur' }
]
}
}

View File

@@ -123,6 +123,16 @@ export default {
show: true,
width: 120,
sortable: 'custom'
}, {
label: this.$t('overall.type'),
prop: 'type',
minWidth: 200,
show: true
}, {
label: this.$t('config.model.sysObjectId'),
prop: 'sysObjectId',
minWidth: 200,
show: false
}, {
label: this.$t('overall.remark'),
prop: 'remark',

View File

@@ -90,6 +90,8 @@ export default {
id: '',
name: '',
chartIds: '',
sysObjectId: '',
type: { id: '', name: '' },
remark: ''
},
tableId: 'modelTable',