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
aaa27ee8
Commit
aaa27ee8
authored
Aug 29, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改接口设备更新站点后,站点名称和编码未更新问题
parent
a23f125a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
6 deletions
+39
-6
device-manager-ui/admin/src/views/device/list.vue
device-manager-ui/admin/src/views/device/list.vue
+36
-6
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
...java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
+3
-0
No files found.
device-manager-ui/admin/src/views/device/list.vue
View file @
aaa27ee8
...
...
@@ -43,7 +43,7 @@
:disabled=
"isExport"
>
导出
</el-button
>
<el-tag
slot=
"table-head-row2-left"
size=
"mini"
<el-tag
slot=
"table-head-row2-left"
size=
"mini"
class=
"cursord"
@
click=
"changeStat(null)"
>
设备总数:
{{
tableData
.
totalCount
}}
台
</el-tag
>
...
...
@@ -52,6 +52,8 @@
size=
"mini"
style=
"margin: 5px"
type=
"success"
class=
"cursord"
@
click=
"changeStat(2)"
>
在线:
{{
tableData
.
onlineCount
}}
台
</el-tag
>
...
...
@@ -60,6 +62,8 @@
size=
"mini"
style=
"margin: 5px"
type=
"danger"
class=
"cursord"
@
click=
"changeStat(1)"
>
离线:
{{
tableData
.
offlineCount
}}
台
</el-tag
>
...
...
@@ -68,6 +72,8 @@
size=
"mini"
style=
"margin: 5px"
type=
"danger"
class=
"cursord"
@
click=
"changeStat(null,0)"
>
停用:
{{
tableData
.
stopCount
}}
台
</el-tag
>
...
...
@@ -76,6 +82,8 @@
size=
"mini"
style=
"margin: 5px"
type=
"danger"
class=
"cursord"
@
click=
"changeStat(0)"
>
未激活:
{{
tableData
.
unActiveCount
}}
台
</el-tag
>
</LayoutTable>
...
...
@@ -284,6 +292,24 @@ export default {
this
.
$refs
.
drawerViewform
.
view
(
row
);
},
changeStat
(
val
,
enabled
){
this
.
query
=
Object
.
assign
(
this
.
query
,{
deviceStatus
:
val
});
if
(
!
enabled
){
this
.
query
=
Object
.
assign
(
this
.
query
,{
deviceStatusList
:[
1
,
2
],
enabled
:
enabled
});
}
this
.
getData
();
// delete this.query.deviceStatus
// delete this.query.deviceStatusList
},
downMsg
(
row
)
{
this
.
$prompt
(
"
请输入下发消息内容
"
,
"
提示
"
,
{
confirmButtonText
:
"
确定
"
,
...
...
@@ -425,11 +451,11 @@ export default {
label
:
"
设备编码
"
,
fuzzy
:
true
,
},
{
name
:
"
deviceStatus
"
,
type
:
"
select
"
,
label
:
"
状态
"
,
},
//
{
//
name: "deviceStatus",
//
type: "select",
//
label: "状态",
//
},
],
columns
:
[
{
...
...
@@ -540,4 +566,8 @@ export default {
background
:
0
0
;
border-top
:
1px
solid
#e8eaec
;
}
.cursord
{
cursor
:
pointer
}
</
style
>
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
View file @
aaa27ee8
...
...
@@ -58,4 +58,7 @@ public class DeviceVo extends BaseEntityLong {
private
List
<
Long
>
productIdList
;
private
List
<
Integer
>
deviceStatusList
;
}
\ No newline at end of file
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