Skip to content

M
multiSystem
Commit 85aa1a35 authored by Gakki's avatar Gakki
Browse files
Options

Merge branch 'dev' into xuhui

parents df258ee7 9669a588
Expand all Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 441 deletions
src/views/home.vue
View file @ 85aa1a35
This diff is collapsed.
src/views/houseData/shebei.vue
View file @ 85aa1a35
...@@ -62,12 +62,6 @@ export default { ...@@ -62,12 +62,6 @@ export default {
], ],
// 大门 // 大门
damen: [ damen: [
{
title: '安装位置',
dataIndex: 'ieAddr',
key: 'ieAddr',
width: '20%'
},
{ {
title: '设备名称', title: '设备名称',
// width: 240, // width: 240,
...@@ -76,6 +70,12 @@ export default { ...@@ -76,6 +70,12 @@ export default {
width: '20%' width: '20%'
}, },
{
title: '安装位置',
dataIndex: 'ieAddr',
key: 'ieAddr',
width: '20%'
},
{ {
title: '设备类型', title: '设备类型',
dataIndex: 'ieType', dataIndex: 'ieType',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment