pull/1/head
pnoker 4 years ago
parent c86df40f4a
commit 992a602d14

@ -23,7 +23,7 @@
</template> </template>
<script> <script>
import {deviceApi, groupApi, profileApi,dictionaryApi} from '@/api/manager' import {deviceApi, dictionaryApi} from '@/api/manager'
import {successMessage} from "@/util/util"; import {successMessage} from "@/util/util";
export default { export default {
@ -69,34 +69,6 @@
search: true, search: true,
searchSpan: 5, searchSpan: 5,
disabled: true disabled: true
}, {
label: '状态',
prop: 'status',
width: 80,
search: true,
searchSpan: 4,
disabled: true,
type: 'select',
searchFilterable: true,
value: 2,
dicData: [
{
label: '离线',
value: 0
}, {
label: '在线',
value: 1
}, {
label: '维护',
value: 2
}, {
label: '故障',
value: 3
}, {
label: '失效',
value: 4
}
]
}, { }, {
label: '所属模板', label: '所属模板',
prop: 'profileId', prop: 'profileId',
@ -129,6 +101,34 @@
trigger: 'click' trigger: 'click'
} }
] ]
}, {
label: '状态',
prop: 'status',
width: 80,
search: true,
searchSpan: 4,
disabled: true,
type: 'select',
searchFilterable: true,
value: 2,
dicData: [
{
label: '离线',
value: 0
}, {
label: '在线',
value: 1
}, {
label: '维护',
value: 2
}, {
label: '故障',
value: 3
}, {
label: '失效',
value: 4
}
]
}, { }, {
label: '备注', label: '备注',
prop: 'description', prop: 'description',

@ -39,6 +39,7 @@
addBtn: false, addBtn: false,
viewBtn: true, viewBtn: true,
editBtn: false, editBtn: false,
delBtn: false,
height: 664, height: 664,
align: 'center', align: 'center',
column: [ column: [

@ -40,6 +40,7 @@
addBtn: false, addBtn: false,
viewBtn: true, viewBtn: true,
editBtn: false, editBtn: false,
delBtn: false,
height: 664, height: 664,
align: 'center', align: 'center',
column: [ column: [

@ -42,9 +42,9 @@
align: 'center', align: 'center',
column: [ column: [
{ {
label: '属性', label: '所属模板',
prop: 'driverAttributeId', prop: 'profileId',
span: 12, span: 24,
search: true, search: true,
searchSpan: 12, searchSpan: 12,
type: 'tree', type: 'tree',
@ -53,18 +53,14 @@
rules: [ rules: [
{ {
required: true, required: true,
message: '请选择属性', message: '请选择所属模板',
trigger: 'click' trigger: 'click'
} }
] ]
}, { }, {
label: '内容', label: '属性',
prop: 'value', prop: 'driverAttributeId',
span: 12 span: 12,
}, {
label: '所属模板',
prop: 'profileId',
span: 24,
search: true, search: true,
searchSpan: 12, searchSpan: 12,
type: 'tree', type: 'tree',
@ -73,10 +69,14 @@
rules: [ rules: [
{ {
required: true, required: true,
message: '请选择所属模板', message: '请选择属性',
trigger: 'click' trigger: 'click'
} }
] ]
}, {
label: '内容',
prop: 'value',
span: 12
}, { }, {
label: '备注', label: '备注',
prop: 'description', prop: 'description',

@ -23,7 +23,7 @@
</template> </template>
<script> <script>
import {pointApi, profileApi,dictionaryApi} from '@/api/manager' import {dictionaryApi, pointApi} from '@/api/manager'
import {successMessage} from "@/util/util"; import {successMessage} from "@/util/util";
export default { export default {
@ -42,10 +42,27 @@
align: 'center', align: 'center',
column: [ column: [
{ {
label: '所属模板',
prop: 'profileId',
width: 220,
span: 12,
search: true,
searchSpan: 6,
type: 'tree',
dicData: [],
defaultExpandAll: true,
rules: [
{
required: true,
message: '请选择所属模板',
trigger: 'click'
}
]
}, {
label: '位号', label: '位号',
prop: 'name', prop: 'name',
width: 220, width: 220,
span: 16, span: 12,
search: true, search: true,
searchSpan: 6, searchSpan: 6,
rules: [ rules: [
@ -157,37 +174,16 @@
} }
] ]
}, { }, {
label: '值', label: '基值',
prop: 'value', prop: 'base',
width: 100, width: 80,
span: 8,
searchSpan: 12,
disabled: true,
value: '--'
}, {
label: '最小值',
prop: 'minimum',
width: 100,
span: 8,
searchSpan: 12,
value: -999999,
rules: [
{
pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
message: '请输入 正确格式的最小值'
}
]
}, {
label: '最大值',
prop: 'maximum',
width: 100,
span: 8, span: 8,
searchSpan: 12, searchSpan: 12,
value: 999999, value: 0,
rules: [ rules: [
{ {
pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/, pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
message: '请输入 正确格式的最大值' message: '请输入 正确格式的基值'
} }
] ]
}, { }, {
@ -208,30 +204,43 @@
} }
] ]
}, { }, {
label: '基值', label: '格式',
prop: 'base', prop: 'format',
width: 80, width: 80,
span: 8, span: 8,
searchSpan: 12, searchSpan: 12,
value: 0, value: '%.3f',
rules: [
{
required: true,
message: '请输入 格式',
trigger: 'blur'
}
]
}, {
label: '最小值',
prop: 'minimum',
width: 100,
span: 8,
searchSpan: 12,
value: -999999,
rules: [ rules: [
{ {
pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/, pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
message: '请输入 正确格式的基值' message: '请输入 正确格式的最小值'
} }
] ]
}, { }, {
label: '格式', label: '最大值',
prop: 'format', prop: 'maximum',
width: 80, width: 100,
span: 8, span: 8,
searchSpan: 12, searchSpan: 12,
value: '%.3f', value: 999999,
rules: [ rules: [
{ {
required: true, pattern: /^-?(([0-9]*(\.[0-9]{1,3})$)|([0-9]+$))/,
message: '请输入 格式', message: '请输入 正确格式的最大值'
trigger: 'blur'
} }
] ]
}, { }, {
@ -240,23 +249,6 @@
width: 80, width: 80,
span: 8, span: 8,
searchSpan: 12 searchSpan: 12
}, {
label: '所属模板',
prop: 'profileId',
width: 220,
span: 24,
search: true,
searchSpan: 6,
type: 'tree',
dicData: [],
defaultExpandAll: true,
rules: [
{
required: true,
message: '请选择所属模板',
trigger: 'click'
}
]
}, { }, {
label: '备注', label: '备注',
prop: 'description', prop: 'description',

@ -37,7 +37,10 @@
index: true, index: true,
stripe: true, stripe: true,
border: true, border: true,
addBtn: false,
viewBtn: true, viewBtn: true,
editBtn: false,
delBtn: false,
height: 664, height: 664,
align: 'center', align: 'center',
column: [ column: [

@ -42,8 +42,8 @@
align: 'center', align: 'center',
column: [ column: [
{ {
label: '属性', label: '所属设备',
prop: 'pointAttributeId', prop: 'deviceId',
span: 12, span: 12,
search: true, search: true,
searchSpan: 8, searchSpan: 8,
@ -53,17 +53,13 @@
rules: [ rules: [
{ {
required: true, required: true,
message: '请选择属性', message: '请选择所属设备',
trigger: 'click' trigger: 'click'
} }
] ]
}, { }, {
label: '内容', label: '所属位号',
prop: 'value', prop: 'pointId',
span: 12
}, {
label: '所属设备',
prop: 'deviceId',
span: 12, span: 12,
search: true, search: true,
searchSpan: 8, searchSpan: 8,
@ -73,13 +69,13 @@
rules: [ rules: [
{ {
required: true, required: true,
message: '请选择所属设备', message: '请选择所属位号',
trigger: 'click' trigger: 'click'
} }
] ]
}, { }, {
label: '所属位号', label: '属性',
prop: 'pointId', prop: 'pointAttributeId',
span: 12, span: 12,
search: true, search: true,
searchSpan: 8, searchSpan: 8,
@ -89,10 +85,14 @@
rules: [ rules: [
{ {
required: true, required: true,
message: '请选择所属位号', message: '请选择属性',
trigger: 'click' trigger: 'click'
} }
] ]
}, {
label: '内容',
prop: 'value',
span: 12
}, { }, {
label: '备注', label: '备注',
prop: 'description', prop: 'description',

Loading…
Cancel
Save