Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
894fc8ca
Commit
894fc8ca
authored
Nov 16, 2023
by
“yiyousong”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: 优化设备详情页面
parent
76621a8f
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
425 additions
and
325 deletions
+425
-325
device-manager-ui/admin/src/assets/mixins/formdialog.js
device-manager-ui/admin/src/assets/mixins/formdialog.js
+64
-59
device-manager-ui/admin/src/assets/mixins/table.js
device-manager-ui/admin/src/assets/mixins/table.js
+3
-2
device-manager-ui/admin/src/views/device/dialogshow.vue
device-manager-ui/admin/src/views/device/dialogshow.vue
+176
-137
device-manager-ui/admin/src/views/device/drawershow.vue
device-manager-ui/admin/src/views/device/drawershow.vue
+139
-121
device-manager-ui/admin/src/views/device/drawerview.vue
device-manager-ui/admin/src/views/device/drawerview.vue
+8
-1
device-manager-ui/admin/src/views/device/list.vue
device-manager-ui/admin/src/views/device/list.vue
+3
-2
device-manager-ui/admin/src/views/device/view.vue
device-manager-ui/admin/src/views/device/view.vue
+32
-3
No files found.
device-manager-ui/admin/src/assets/mixins/formdialog.js
View file @
894fc8ca
...
@@ -8,15 +8,13 @@ export default {
...
@@ -8,15 +8,13 @@ export default {
methods
:
{
methods
:
{
// 渲染前置处理
// 渲染前置处理
beforeRender
(
data
)
{
beforeRender
(
data
)
{
return
data
return
data
;
},
},
// 渲染后置处理
// 渲染后置处理
afterRender
(
data
)
{
afterRender
(
data
)
{},
},
// 提交表单的前置处理
// 提交表单的前置处理
beforeSubmit
(
data
)
{
beforeSubmit
(
data
)
{
return
data
return
data
;
},
},
// 提交表单的后置处理, 会阻断默认的回退行为
// 提交表单的后置处理, 会阻断默认的回退行为
afterSubmit
(
data
)
{
afterSubmit
(
data
)
{
...
@@ -46,19 +44,18 @@ export default {
...
@@ -46,19 +44,18 @@ export default {
res
.
entity
=
this
.
util_toDateStr
(
res
.
entity
,
this
.
toDate
);
res
.
entity
=
this
.
util_toDateStr
(
res
.
entity
,
this
.
toDate
);
this
.
form
=
Object
.
assign
({},
this
.
form
,
res
.
entity
);
this
.
form
=
Object
.
assign
({},
this
.
form
,
res
.
entity
);
this
.
dict
=
Object
.
assign
({},
this
.
dict
,
res
.
dict
);
this
.
dict
=
Object
.
assign
({},
this
.
dict
,
res
.
dict
);
this
.
afterRender
(
res
);
this
.
afterRender
(
res
);
})
})
.
catch
(
error
=>
{
.
catch
(
(
error
)
=>
{
this
.
$message
.
error
(
error
.
message
)
this
.
$message
.
error
(
error
.
message
)
;
throw
error
throw
error
;
})
})
.
then
(
data
=>
{
.
then
(
(
data
)
=>
{
clearTimeout
(
this
.
loadingTimer
);
clearTimeout
(
this
.
loadingTimer
);
this
.
loadingTimer
=
setTimeout
(()
=>
{
this
.
loadingTimer
=
setTimeout
(()
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
},
300
);
},
300
);
})
})
;
},
},
// 提交表单
// 提交表单
submitForm
(
ref
)
{
submitForm
(
ref
)
{
...
@@ -66,70 +63,81 @@ export default {
...
@@ -66,70 +63,81 @@ export default {
el
.
validate
((
valid
)
=>
{
el
.
validate
((
valid
)
=>
{
if
(
!
valid
)
return
;
if
(
!
valid
)
return
;
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
$post
(
this
.
urls
.
saveUrl
||
this
.
pageInfo
.
saveUrl
,
this
.
beforeSubmit
(
this
.
form
))
this
.
$post
(
.
then
(
res
=>
{
this
.
urls
.
saveUrl
||
this
.
pageInfo
.
saveUrl
,
this
.
beforeSubmit
(
this
.
form
)
)
.
then
((
res
)
=>
{
this
.
$message
.
success
(
res
.
msg
);
this
.
$message
.
success
(
res
.
msg
);
this
.
afterSubmit
(
res
);
this
.
afterSubmit
(
res
);
})
})
.
catch
(
error
=>
{
.
catch
(
(
error
)
=>
{
this
.
$message
.
error
(
error
.
message
);
this
.
$message
.
error
(
error
.
message
);
})
})
.
then
(
data
=>
{
.
then
(
(
data
)
=>
{
clearTimeout
(
this
.
loadingTimer
);
clearTimeout
(
this
.
loadingTimer
);
this
.
loadingTimer
=
setTimeout
(()
=>
{
this
.
loadingTimer
=
setTimeout
(()
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
},
200
);
},
200
);
})
})
;
});
});
},
},
// 复制一个数组或对象
// 复制一个数组或对象
util_copy
(
data
)
{
util_copy
(
data
)
{
return
JSON
.
parse
(
JSON
.
stringify
(
data
))
return
JSON
.
parse
(
JSON
.
stringify
(
data
))
;
},
},
// 工具方法,把数字转化为字符串
// 工具方法,把数字转化为字符串
util_toString
(
data
,
array
)
{
util_toString
(
data
,
array
)
{
//原始数据
//原始数据
const
dataCopy
=
Object
.
assign
({},
data
);
const
dataCopy
=
Object
.
assign
({},
data
);
array
.
forEach
(
item
=>
{
array
.
forEach
(
(
item
)
=>
{
//如果相等做操作
//如果相等做操作
dataCopy
[
item
]
=
dataCopy
[
item
]
===
undefined
?
''
:
dataCopy
[
item
]
+
''
;
dataCopy
[
item
]
=
})
dataCopy
[
item
]
===
undefined
?
""
:
dataCopy
[
item
]
+
""
;
});
return
dataCopy
;
return
dataCopy
;
},
},
// 工具方法,把字符串转化为数组
// 工具方法,把字符串转化为数组
util_toArrays
(
data
,
array
)
{
util_toArrays
(
data
,
array
)
{
const
dataCopy
=
Object
.
assign
({},
data
);
const
dataCopy
=
Object
.
assign
({},
data
);
array
.
forEach
(
item
=>
{
array
.
forEach
((
item
)
=>
{
dataCopy
[
item
]
=
dataCopy
[
item
]
===
undefined
?
[]
:
dataCopy
[
item
].
split
(
"
,
"
);
dataCopy
[
item
]
=
})
dataCopy
[
item
]
===
undefined
?
[]
:
dataCopy
[
item
].
split
(
"
,
"
);
});
return
dataCopy
;
return
dataCopy
;
},
},
// 工具方法,把字符串转化为格式化日期
// 工具方法,把字符串转化为格式化日期
util_toDateStr
(
data
,
array
)
{
util_toDateStr
(
data
,
array
)
{
const
dataCopy
=
Object
.
assign
({},
data
);
const
dataCopy
=
Object
.
assign
({},
data
);
array
.
forEach
(
item
=>
{
array
.
forEach
((
item
)
=>
{
dataCopy
[
item
]
=
dataCopy
[
item
]
===
undefined
?
''
:
this
.
util_formatterDate
(
dataCopy
[
item
]);
dataCopy
[
item
]
=
})
dataCopy
[
item
]
===
undefined
?
""
:
this
.
util_formatterDate
(
dataCopy
[
item
]);
});
return
dataCopy
;
return
dataCopy
;
},
},
util_formatterDate
(
time
)
{
util_formatterDate
(
time
)
{
let
date
=
new
Date
(
Number
(
time
));
let
date
=
new
Date
(
Number
(
time
));
let
Y
=
date
.
getFullYear
()
+
'
-
'
;
let
Y
=
date
.
getFullYear
()
+
"
-
"
;
let
M
=
(
date
.
getMonth
()
+
1
<
10
?
'
0
'
+
(
date
.
getMonth
()
+
1
)
:
date
.
getMonth
()
+
1
)
+
'
-
'
;
let
M
=
let
D
=
this
.
panLeft
(
date
.
getDate
())
+
'
'
;
(
date
.
getMonth
()
+
1
<
10
let
h
=
this
.
panLeft
(
date
.
getHours
())
+
'
:
'
;
?
"
0
"
+
(
date
.
getMonth
()
+
1
)
let
m
=
this
.
panLeft
(
date
.
getMinutes
())
+
'
:
'
;
:
date
.
getMonth
()
+
1
)
+
"
-
"
;
let
D
=
this
.
panLeft
(
date
.
getDate
())
+
"
"
;
let
h
=
this
.
panLeft
(
date
.
getHours
())
+
"
:
"
;
let
m
=
this
.
panLeft
(
date
.
getMinutes
())
+
"
:
"
;
let
s
=
this
.
panLeft
(
date
.
getSeconds
());
let
s
=
this
.
panLeft
(
date
.
getSeconds
());
return
Y
+
M
+
D
+
h
+
m
+
s
;
return
Y
+
M
+
D
+
h
+
m
+
s
;
},
},
panLeft
(
num
)
{
panLeft
(
num
)
{
return
num
<
10
?
'
0
'
+
num
:
num
;
return
num
<
10
?
"
0
"
+
num
:
num
;
},
},
// 从dict字段暴力取值,取不到则返回原值
// 从dict字段暴力取值,取不到则返回原值
util_formatter
(
key
,
val
)
{
util_formatter
(
key
,
val
)
{
try
{
try
{
return
this
.
dict
[
key
][
val
]
return
this
.
dict
[
key
][
val
]
;
}
catch
(
error
)
{
}
catch
(
error
)
{
return
val
;
return
val
;
}
}
...
@@ -142,24 +150,24 @@ export default {
...
@@ -142,24 +150,24 @@ export default {
}
}
});
});
},
0
);
},
0
);
}
}
,
},
},
computed
:
{
computed
:
{
pageInfo
()
{
pageInfo
()
{
let
currUrl
=
this
.
$route
.
path
;
let
currUrl
=
this
.
$route
.
path
;
let
urlArray
=
currUrl
.
split
(
'
/
'
);
let
urlArray
=
currUrl
.
split
(
"
/
"
);
let
type
=
urlArray
.
pop
();
let
type
=
urlArray
.
pop
();
urlArray
.
push
(
'
save
'
);
urlArray
.
push
(
"
save
"
);
let
saveUrl
=
urlArray
.
join
(
'
/
'
);
let
saveUrl
=
urlArray
.
join
(
"
/
"
);
urlArray
.
pop
();
urlArray
.
pop
();
urlArray
.
push
(
'
edit
'
);
urlArray
.
push
(
"
edit
"
);
let
editUrl
=
urlArray
.
join
(
'
/
'
);
let
editUrl
=
urlArray
.
join
(
"
/
"
);
urlArray
.
pop
();
urlArray
.
pop
();
urlArray
.
push
(
'
add
'
);
urlArray
.
push
(
"
add
"
);
let
addUrl
=
urlArray
.
join
(
'
/
'
);
let
addUrl
=
urlArray
.
join
(
"
/
"
);
urlArray
.
pop
();
urlArray
.
pop
();
urlArray
.
push
(
'
view
'
);
urlArray
.
push
(
"
view
"
);
let
viewUrl
=
urlArray
.
join
(
'
/
'
);
let
viewUrl
=
urlArray
.
join
(
"
/
"
);
return
{
return
{
type
,
type
,
currUrl
,
currUrl
,
...
@@ -183,9 +191,6 @@ export default {
...
@@ -183,9 +191,6 @@ export default {
toString
:
[],
// 需要把number转化为string的表单字段name数组
toString
:
[],
// 需要把number转化为string的表单字段name数组
toArrays
:
[],
// 需要把number转化为arrays的表单字段name数组
toArrays
:
[],
// 需要把number转化为arrays的表单字段name数组
toDate
:
[],
// 需要把number转化为date的表单字段name数组
toDate
:
[],
// 需要把number转化为date的表单字段name数组
}
};
}
},
}
};
device-manager-ui/admin/src/assets/mixins/table.js
View file @
894fc8ca
...
@@ -176,13 +176,14 @@ export default {
...
@@ -176,13 +176,14 @@ export default {
// 格式化单元格数据
// 格式化单元格数据
formatter
(
row
,
column
,
val
)
{
formatter
(
row
,
column
,
val
)
{
const
content
=
formatter
(
this
.
tableData
,
column
,
val
);
const
content
=
formatter
(
this
.
tableData
,
column
,
val
);
return
content
?
(
return
content
?
(
<
el
-
tag
type
=
{
"
info
"
}
size
=
"
mini
"
>
<
el
-
tag
type
=
{
"
info
"
}
size
=
"
mini
"
>
{
content
}
{
content
}
<
/el-tag
>
<
/el-tag
>
)
:
(
)
:
val
?
(
val
val
)
:
(
"
--
"
);
);
},
},
...
...
device-manager-ui/admin/src/views/device/dialogshow.vue
View file @
894fc8ca
...
@@ -4,10 +4,38 @@
...
@@ -4,10 +4,38 @@
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-row>
<el-row>
<!--
<Field
:span=
"20"
label=
"设备名称"
prop=
"deviceName"
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
-->
<!--
<Field
:span=
"20"
label=
"设备名称"
prop=
"deviceName"
v-model=
"form.deviceName"
placeholder=
"请输入设备名称"
/>
-->
<Field
:span=
"20"
label=
"设备编码"
prop=
"deviceCode"
v-model=
"form.deviceCode"
placeholder=
"请输入设备编码"
/>
<Field
<Field
:span=
"20"
label=
"平台类型"
prop=
"platformId"
v-model=
"form.platformId"
type=
"select"
:enumData=
"dict.platformId"
placeholder=
"请选择平台类型"
/>
:span=
"20"
<Field
:span=
"20"
label=
"产品类型"
prop=
"productId"
v-model=
"form.productId"
type=
"select"
:enumData=
"dict.productId"
placeholder=
"请选择产品类型"
/>
label=
"设备编码"
<Field
:span=
"20"
label=
"设备的MAC地址"
prop=
"deviceMac"
v-model=
"form.deviceMac"
placeholder=
"请输入设备的MAC地址"
/>
prop=
"deviceCode"
v-model=
"form.deviceCode"
placeholder=
"请输入设备编码"
/>
<Field
:span=
"20"
label=
"平台类型"
prop=
"platformId"
v-model=
"form.platformId"
type=
"select"
:enumData=
"dict.platformId"
placeholder=
"请选择平台类型"
/>
<Field
:span=
"20"
label=
"产品类型"
prop=
"productId"
v-model=
"form.productId"
type=
"select"
:enumData=
"dict.productId"
placeholder=
"请选择产品类型"
/>
<Field
:span=
"20"
label=
"设备的MAC地址"
prop=
"deviceMac"
v-model=
"form.deviceMac"
placeholder=
"请输入设备的MAC地址"
/>
<!--
<Field
:span=
"20"
label=
"中心设备编码"
v-model=
"form.centernum"
placeholder=
"请输入中心设备编码"
/>
-->
<!--
<Field
:span=
"20"
label=
"中心设备编码"
v-model=
"form.centernum"
placeholder=
"请输入中心设备编码"
/>
-->
<Field
:span=
"20"
disabled
label=
"设备访问ip"
v-model=
"form.ip"
/>
<Field
:span=
"20"
disabled
label=
"设备访问ip"
v-model=
"form.ip"
/>
<Field
:span=
"20"
disabled
label=
"端口"
v-model=
"form.port"
/>
<Field
:span=
"20"
disabled
label=
"端口"
v-model=
"form.port"
/>
...
@@ -21,27 +49,45 @@
...
@@ -21,27 +49,45 @@
type=
"select"
type=
"select"
:enumData=
"dict.deviceFirmId"
:enumData=
"dict.deviceFirmId"
/>
/>
<Field
:span=
"20"
label=
"备注"
prop=
"deviceRemark"
v-model=
"form.deviceRemark"
type=
"textarea"
placeholder=
"请输入备注"
/>
<Field
<Field
:span=
"20"
label=
"启用状态 "
prop=
"status"
v-model=
"form.status"
type=
"radio"
:enumData=
"dict.status"
placeholder=
"请选择启用状态 "
/>
:span=
"20"
label=
"备注"
prop=
"deviceRemark"
v-model=
"form.deviceRemark"
type=
"textarea"
placeholder=
"请输入备注"
/>
<Field
:span=
"20"
label=
"启用状态 "
prop=
"status"
v-model=
"form.status"
type=
"radio"
:enumData=
"dict.status"
placeholder=
"请选择启用状态 "
/>
</el-row>
</el-row>
</el-form>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
class=
"addclass"
v-if=
"pageInfo.type !== 'view'"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
type=
"primary"
class=
"addclass"
v-if=
"pageInfo.type !== 'view'"
@
click=
"submitForm"
>
确 定
</el-button
>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
</
template
>
</
template
>
<
script
>
<
script
>
import
form
from
"
@/assets/mixins/formdialog
"
;
import
form
from
"
@/assets/mixins/formdialog
"
;
import
dialogShow
from
"
./dialogshow
"
;
import
dialogShow
from
"
./dialogshow
"
;
export
default
{
export
default
{
mixins
:
[
form
],
mixins
:
[
form
],
components
:
{
components
:
{
dialogShow
,
dialogShow
,
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -51,61 +97,54 @@
...
@@ -51,61 +97,54 @@
title
:
"
设备
"
,
title
:
"
设备
"
,
// 是否显示弹出层
// 是否显示弹出层
open
:
false
,
open
:
false
,
direction
:
"
rtl
"
,
direction
:
"
rtl
"
,
toString
:[
toString
:
[
"
deviceType
"
,
"
deviceOnlineStatus
"
,
"
status
"
,
"
deviceFirmId
"
],
"
deviceType
"
,
"
deviceOnlineStatus
"
,
"
status
"
,
"
deviceFirmId
"
],
// 表单校验
// 表单校验
rules
:
{
rules
:
{
deviceName
:
[
deviceName
:
[
{
required
:
true
,
message
:
"
请输入设备名称
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入设备名称
"
,
trigger
:
"
blur
"
},
{
max
:
20
,
message
:
"
最多只能录入20个字符
"
,
trigger
:
"
blur
"
,
},
{
max
:
20
,
message
:
"
最多只能录入20个字符
"
,
trigger
:
"
blur
"
},
],
],
deviceType
:
[
deviceType
:
[
{
required
:
true
,
message
:
"
请输入设备类型
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入设备类型
"
,
trigger
:
"
blur
"
},
],
],
deviceOnlineStatus
:
[
deviceOnlineStatus
:
[
{
required
:
true
,
message
:
"
请输入在线状态
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入在线状态
"
,
trigger
:
"
blur
"
},
],
],
status
:
[
status
:
[
{
required
:
true
,
message
:
"
请输入启用状态
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入启用状态
"
,
trigger
:
"
blur
"
},
],
createTime
:
[
{
required
:
true
,
message
:
"
请选择创建时间
"
},
],
],
}
createTime
:
[{
required
:
true
,
message
:
"
请选择创建时间
"
}],
},
};
};
},
},
methods
:
{
methods
:
{
/** 编辑 */
/** 编辑 */
edit
(
row
)
{
edit
(
row
)
{
this
.
reset
()
this
.
reset
();
this
.
query
=
{
id
:
row
.
id
};
this
.
query
=
{
id
:
row
.
id
};
this
.
urls
.
currUrl
=
this
.
pageInfo
.
editUrl
;
;
this
.
urls
.
currUrl
=
this
.
pageInfo
.
editUrl
;
this
.
getData
();
this
.
getData
();
this
.
pageInfo
.
type
=
"
edit
"
this
.
pageInfo
.
type
=
"
edit
"
;
this
.
title
=
"
修改设备
"
;
this
.
title
=
"
修改设备
"
;
},
},
/** 新增 */
/** 新增 */
add
(
row
)
{
add
(
row
)
{
this
.
reset
()
this
.
reset
();
this
.
query
=
{
id
:
row
.
id
};
this
.
query
=
{
id
:
row
.
id
};
this
.
urls
.
currUrl
=
this
.
pageInfo
.
addUrl
;
this
.
urls
.
currUrl
=
this
.
pageInfo
.
addUrl
;
this
.
getData
();
this
.
getData
();
this
.
pageInfo
.
type
=
"
add
"
this
.
pageInfo
.
type
=
"
add
"
;
this
.
title
=
"
新增设备
"
;
this
.
title
=
"
新增设备
"
;
},
},
/** 查看*/
/** 查看*/
view
(
row
)
{
view
(
row
)
{
this
.
reset
()
this
.
reset
();
this
.
query
=
{
id
:
row
.
id
};
this
.
query
=
{
id
:
row
.
id
};
this
.
urls
.
currUrl
=
this
.
pageInfo
.
viewUrl
;
;
this
.
urls
.
currUrl
=
this
.
pageInfo
.
viewUrl
;
this
.
getData
();
this
.
getData
();
this
.
pageInfo
.
type
=
"
view
"
this
.
pageInfo
.
type
=
"
view
"
;
this
.
title
=
"
设备详细
"
;
this
.
title
=
"
设备详细
"
;
},
},
/**取消按钮 */
/**取消按钮 */
...
@@ -125,21 +164,21 @@
...
@@ -125,21 +164,21 @@
// 表单重置
// 表单重置
reset
()
{
reset
()
{
this
.
form
=
{
this
.
form
=
{
deviceName
:
""
,
deviceName
:
""
,
deviceCode
:
""
,
deviceCode
:
""
,
deviceType
:
1
,
deviceType
:
1
,
deviceMac
:
""
,
deviceMac
:
""
,
ip
:
""
,
ip
:
""
,
centernum
:
""
,
centernum
:
""
,
port
:
""
,
port
:
""
,
siteNum
:
""
,
siteNum
:
""
,
deviceFirmId
:
null
,
deviceFirmId
:
null
,
deviceFirmname
:
""
,
deviceFirmname
:
""
,
deviceOnlineStatus
:
0
,
deviceOnlineStatus
:
0
,
status
:
0
,
status
:
0
,
deviceRemark
:
""
,
deviceRemark
:
""
,
onlineTime
:
null
,
onlineTime
:
null
,
offlineTime
:
null
,
offlineTime
:
null
,
};
};
this
.
resetForm
(
"
form
"
);
this
.
resetForm
(
"
form
"
);
},
},
...
@@ -149,5 +188,5 @@
...
@@ -149,5 +188,5 @@
}
}
},
},
},
},
};
};
</
script
>
</
script
>
device-manager-ui/admin/src/views/device/drawershow.vue
View file @
894fc8ca
...
@@ -152,15 +152,33 @@
...
@@ -152,15 +152,33 @@
placeholder=
"请选择启用状态 "
placeholder=
"请选择启用状态 "
/>
/>
<Field
label=
"显示短信"
prop=
"showSms"
v-model=
"form.showSms"
type=
"radio"
:enumData=
"dict.showSms"
placeholder=
"请选择是否显示短信"
/>
<Field
<Field
label=
"显示打印机"
prop=
"showPrint"
v-model=
"form.showPrint"
type=
"radio"
:enumData=
"dict.showPrint"
placeholder=
"请选择是否显示打印机"
/>
label=
"显示短信"
<Field
label=
"小程序二维码"
prop=
"showWechatQrCode"
v-model=
"form.showWechatQrCode"
type=
"radio"
:enumData=
"dict.showWechatQrCode"
placeholder=
"请选择是否显示小程序二维码"
/>
prop=
"showSms"
v-model=
"form.showSms"
type=
"radio"
<Field
:span=
"24"
label=
"上传图片"
:enumData=
"dict.showSms"
>
placeholder=
"请选择是否显示短信"
<ImageUpload
v-model=
"form.devicePhotoPath"
prePath=
"/file/preview"
/>
<Field
label=
"显示打印机"
prop=
"showPrint"
v-model=
"form.showPrint"
type=
"radio"
:enumData=
"dict.showPrint"
placeholder=
"请选择是否显示打印机"
/>
<Field
label=
"小程序二维码"
prop=
"showWechatQrCode"
v-model=
"form.showWechatQrCode"
type=
"radio"
:enumData=
"dict.showWechatQrCode"
placeholder=
"请选择是否显示小程序二维码"
/>
/>
<Field
:span=
"24"
label=
"上传图片"
>
<ImageUpload
v-model=
"form.devicePhotoPath"
prePath=
"/file/preview"
/>
</Field>
</Field>
<Field
<Field
label=
"授权码"
label=
"授权码"
...
@@ -180,7 +198,7 @@
...
@@ -180,7 +198,7 @@
placeholder=
"请输入备注"
placeholder=
"请输入备注"
/>
/>
</el-row>
</el-row>
<form-buttons
@
submit=
"submitForm"
noCancelBtn
/>
<form-buttons
@
submit=
"submitForm"
noCancelBtn
/>
</el-form>
</el-form>
</el-drawer>
</el-drawer>
</
template
>
</
template
>
...
@@ -229,20 +247,20 @@ export default {
...
@@ -229,20 +247,20 @@ export default {
// 表单校验
// 表单校验
rules
:
{
rules
:
{
deviceName
:
[
deviceName
:
[
{
required
:
true
,
message
:
"
请输入设备名称
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入设备名称
"
,
trigger
:
"
blur
"
},
{
max
:
20
,
message
:
"
最多只能录入20个字符
"
,
trigger
:
"
blur
"
},
{
max
:
20
,
message
:
"
最多只能录入20个字符
"
,
trigger
:
"
blur
"
},
],
],
deviceCode
:
[
deviceCode
:
[
{
required
:
true
,
message
:
"
请输入设备编码
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入设备编码
"
,
trigger
:
"
blur
"
},
],
],
deviceMac
:
[
deviceMac
:
[
{
required
:
true
,
message
:
"
请输入Mac地址
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请输入Mac地址
"
,
trigger
:
"
blur
"
},
],
],
platformId
:
[
platformId
:
[
{
required
:
true
,
message
:
"
请选择平台
"
,
trigger
:
"
blur
"
},
{
required
:
true
,
message
:
"
请选择平台
"
,
trigger
:
"
blur
"
},
],
],
productId
:
[{
required
:
true
,
message
:
"
请选择产品
"
,
trigger
:
"
blur
"
}],
productId
:
[{
required
:
true
,
message
:
"
请选择产品
"
,
trigger
:
"
blur
"
}],
},
},
};
};
},
},
...
@@ -252,13 +270,14 @@ export default {
...
@@ -252,13 +270,14 @@ export default {
this
.
form
.
productCode
=
this
.
dict
.
productCode
[
val
];
this
.
form
.
productCode
=
this
.
dict
.
productCode
[
val
];
},
},
skinSelect
(
val
)
{
skinSelect
(
val
)
{
this
.
form
.
skinName
=
this
.
form
.
skinName
=
this
.
dict
.
skinProductCodeMap
[
this
.
form
.
productCode
][
this
.
dict
.
skinProductCodeMap
[
this
.
form
.
productCode
][
val
];
val
];
},
},
/** 编辑 */
/** 编辑 */
edit
(
row
)
{
edit
(
row
)
{
this
.
reset
();
this
.
reset
();
this
.
query
=
{
id
:
row
.
id
};
this
.
query
=
{
id
:
row
.
id
};
this
.
urls
.
currUrl
=
"
/device/edit
"
;
this
.
urls
.
currUrl
=
"
/device/edit
"
;
this
.
siteName
=
row
.
siteName
;
this
.
siteName
=
row
.
siteName
;
this
.
siteCode
=
row
.
siteCode
;
this
.
siteCode
=
row
.
siteCode
;
...
@@ -280,7 +299,7 @@ export default {
...
@@ -280,7 +299,7 @@ export default {
/** 查看*/
/** 查看*/
view
(
row
)
{
view
(
row
)
{
this
.
reset
();
this
.
reset
();
this
.
query
=
{
id
:
row
.
id
};
this
.
query
=
{
id
:
row
.
id
};
this
.
urls
.
currUrl
=
"
/device/view
"
;
this
.
urls
.
currUrl
=
"
/device/view
"
;
this
.
getData
();
this
.
getData
();
this
.
pageInfo
.
type
=
"
view
"
;
this
.
pageInfo
.
type
=
"
view
"
;
...
@@ -314,8 +333,7 @@ export default {
...
@@ -314,8 +333,7 @@ export default {
this
.
$refs
[
refName
].
resetFields
();
this
.
$refs
[
refName
].
resetFields
();
}
}
},
},
handleClose
()
{
handleClose
()
{},
},
},
},
};
};
</
script
>
</
script
>
device-manager-ui/admin/src/views/device/drawerview.vue
View file @
894fc8ca
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"120px"
>
<el-tabs
style=
"margin-left: 10px"
v-model=
"activeName"
>
<el-tabs
style=
"margin-left: 10px"
v-model=
"activeName"
>
<el-tab-pane
label=
"设备详情"
name=
"deviceDetail"
>
<el-tab-pane
label=
"设备详情"
name=
"deviceDetail"
>
<view-show
:form=
"viewInfo"
:dict=
"dict"
/>
<view-show
:
siteInfo=
"siteInfo"
:
form=
"viewInfo"
:dict=
"dict"
/>
</el-tab-pane>
</el-tab-pane>
<el-tab-pane
label=
"告警记录"
name=
"alarmLog"
>
<el-tab-pane
label=
"告警记录"
name=
"alarmLog"
>
<alarm-list
:queryIn=
"
{ alarmDevice: form.id }" />
<alarm-list
:queryIn=
"
{ alarmDevice: form.id }" />
...
@@ -42,6 +42,13 @@ export default {
...
@@ -42,6 +42,13 @@ export default {
alarmList
,
alarmList
,
moduleList
,
moduleList
,
},
},
props
:
{
siteInfo
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
{},
},
},
data
()
{
data
()
{
return
{
return
{
activeName
:
"
deviceDetail
"
,
activeName
:
"
deviceDetail
"
,
...
...
device-manager-ui/admin/src/views/device/list.vue
View file @
894fc8ca
...
@@ -254,7 +254,7 @@
...
@@ -254,7 +254,7 @@
<drawer-show
ref=
"drawerform"
@
ok=
"getData"
/>
<drawer-show
ref=
"drawerform"
@
ok=
"getData"
/>
<drawer-view
ref=
"drawerViewform"
@
ok=
"getData"
/>
<drawer-view
ref=
"drawerViewform"
:siteInfo=
"siteInfo"
@
ok=
"getData"
/>
</div>
</div>
</
template
>
</
template
>
...
@@ -310,7 +310,7 @@ export default {
...
@@ -310,7 +310,7 @@ export default {
siteId
:
null
,
siteId
:
null
,
siteName
:
""
,
siteName
:
""
,
siteCode
:
""
,
siteCode
:
""
,
siteInfo
:
{},
updateSiteId
:
null
,
updateSiteId
:
null
,
updateSiteName
:
""
,
updateSiteName
:
""
,
updateSiteCode
:
""
,
updateSiteCode
:
""
,
...
@@ -476,6 +476,7 @@ export default {
...
@@ -476,6 +476,7 @@ export default {
//this.info=res.data
//this.info=res.data
this
.
siteName
=
res
.
data
.
siteName
;
this
.
siteName
=
res
.
data
.
siteName
;
this
.
siteCode
=
res
.
data
.
siteCode
;
this
.
siteCode
=
res
.
data
.
siteCode
;
this
.
siteInfo
=
res
.
data
;
}
}
})
})
.
catch
((
error
)
=>
{
.
catch
((
error
)
=>
{
...
...
device-manager-ui/admin/src/views/device/view.vue
View file @
894fc8ca
...
@@ -102,7 +102,7 @@
...
@@ -102,7 +102,7 @@
{{
form
.
lon
}}
{{
form
.
lon
}}
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
<el-descriptions-item
label=
"
经
度"
label=
"
纬
度"
label-class-name=
"labelClass"
label-class-name=
"labelClass"
content-class-name=
"contentClass"
content-class-name=
"contentClass"
>
>
...
@@ -231,7 +231,27 @@
...
@@ -231,7 +231,27 @@
设备位置
设备位置
</
template
>
</
template
>
</el-descriptions>
</el-descriptions>
<Map></Map>
<!-- <Map></Map> -->
<div
class=
"map"
>
<el-amap
vid=
"amaps"
:zoom=
"20"
viewMode=
"3D"
expandZoomRange
:center=
"[siteInfo.longitude, siteInfo.latitude]"
>
<el-amap-marker
vid=
"2"
topWhenClick
:label=
"{
content: `我在${siteInfo.detailAddress}`,
offset: [0, -20],
}"
:position=
"[siteInfo.longitude, siteInfo.latitude]"
:icon=
"require('@/assets/images/d.png')"
></el-amap-marker>
</el-amap>
</div>
</layout-view>
</layout-view>
</template>
</template>
...
@@ -248,6 +268,11 @@ export default {
...
@@ -248,6 +268,11 @@ export default {
type
:
Object
,
type
:
Object
,
default
:
null
,
default
:
null
,
},
},
siteInfo
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
{},
},
},
},
components
:
{},
components
:
{},
created
()
{},
created
()
{},
...
@@ -326,4 +351,8 @@ export default {
...
@@ -326,4 +351,8 @@ export default {
.contentClass {
.contentClass {
width: 600px;
width: 600px;
}
}
.map {
width: 100%;
height: 600px;
}
</
style
>
</
style
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment