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
42e0c134
Commit
42e0c134
authored
Feb 20, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改站点请求地址
parent
4827577f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
device-manager-ui/admin/src/views/device/list.vue
device-manager-ui/admin/src/views/device/list.vue
+6
-4
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
...n/java/com/mortals/xhx/busiz/web/DeviceApiController.java
+0
-1
No files found.
device-manager-ui/admin/src/views/device/list.vue
View file @
42e0c134
...
...
@@ -319,12 +319,14 @@ export default {
},
changeStat
(
val
,
enabled
)
{
let
param
=
{
"
siteId
"
:
this
.
siteId
}
param
=
Object
.
assign
(
param
,
{
deviceStatus
:
val
});
//去除其它条件
delete
this
.
query
[
"
productId
"
]
delete
this
.
query
[
"
deviceName
"
]
delete
this
.
query
[
"
deviceCode
"
]
this
.
query
=
Object
.
assign
(
this
.
query
,
{
deviceStatus
:
val
});
if
(
!
enabled
)
{
this
.
query
=
Object
.
assign
(
param
,
{
this
.
query
=
Object
.
assign
(
this
.
query
,
{
deviceStatusList
:
[
1
,
2
],
enabled
:
enabled
,
});
...
...
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @
42e0c134
...
...
@@ -501,7 +501,6 @@ public class DeviceApiController {
ProductVersionEntity
productVersionEntity
=
productVersionService
.
selectOne
(
productVersionQuery
);
if
(
ObjectUtils
.
isEmpty
(
productVersionEntity
))
{
throw
new
AppException
(
DEVICE_VERSION_UNEXIST
,
DEVICE_VERSION_UNEXIST_CONTENT
);
}
ProductVersionInfo
productVersionInfo
=
new
ProductVersionInfo
();
...
...
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