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
03013975
Commit
03013975
authored
Sep 13, 2022
by
“yiyousong”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:修改站点id获取方式
parent
2ce36050
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
20 deletions
+18
-20
device-manager-ui/admin/src/views/Home.vue
device-manager-ui/admin/src/views/Home.vue
+9
-13
device-manager-ui/admin/src/views/alarm/sms/send/list.vue
device-manager-ui/admin/src/views/alarm/sms/send/list.vue
+4
-3
device-manager-ui/admin/src/views/device/log/list.vue
device-manager-ui/admin/src/views/device/log/list.vue
+5
-4
No files found.
device-manager-ui/admin/src/views/Home.vue
View file @
03013975
...
...
@@ -445,6 +445,7 @@
<
script
>
import
{
formatterDate
}
from
"
@/assets/utils/index
"
;
import
session
from
"
@/assets/utils/session
"
;
export
default
{
computed
:
{
userData
()
{
...
...
@@ -468,15 +469,14 @@ export default {
window
.
removeEventListener
(
"
resize
"
,
this
.
adapterEcharts
);
},
created
()
{
this
.
siteId
=
window
.
sessionStorage
.
getItem
(
'
siteid
'
)
||
null
// this.siteId = window.sessionStorage.getItem("siteid") || null
this
.
siteId
=
session
.
getSession
(
"
siteid
"
)
||
null
;
let
today
=
new
Date
();
let
query
=
{
year
:
today
.
getFullYear
(),
month
:
today
.
getMonth
()
+
1
,
day
:
today
.
getDate
(),
siteId
:
this
.
siteId
siteId
:
this
.
siteId
,
};
//查询今日设备统计
this
.
loading
=
true
;
...
...
@@ -492,14 +492,10 @@ export default {
});
//默认查询15天数据
let
beforeday
=
new
Date
(
today
);
beforeday
.
setDate
(
beforeday
.
getDate
()
-
15
);
this
.
findDeviceTotalStat
(
beforeday
);
this
.
findDeviceStat
(
beforeday
);
this
.
findDeviceAlarm
(
beforeday
);
this
.
findDevicePush
(
beforeday
);
},
methods
:
{
...
...
@@ -529,7 +525,7 @@ export default {
findDeviceTotalStat
(
beforeday
)
{
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
//当前选择站点id
query
.
siteId
=
this
.
siteId
query
.
siteId
=
this
.
siteId
;
console
.
log
(
query
);
this
.
$post
(
"
/device/stat/list
"
,
query
)
.
then
((
res
)
=>
{
...
...
@@ -561,7 +557,7 @@ export default {
findDeviceStat
(
beforeday
)
{
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
query
.
siteId
=
this
.
siteId
query
.
siteId
=
this
.
siteId
;
this
.
$post
(
"
/device/stat/list
"
,
query
)
.
then
((
res
)
=>
{
if
(
res
.
code
==
1
)
{
...
...
@@ -591,7 +587,7 @@ export default {
findDeviceAlarm
(
beforeday
)
{
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
query
.
siteId
=
this
.
siteId
query
.
siteId
=
this
.
siteId
;
this
.
$post
(
"
/device/stat/list
"
,
query
)
.
then
((
res
)
=>
{
if
(
res
.
code
==
1
)
{
...
...
@@ -620,7 +616,7 @@ export default {
findDevicePush
(
beforeday
)
{
let
query
=
{
createTimeStart
:
this
.
formatterDate
(
beforeday
)
};
query
.
siteId
=
this
.
siteId
query
.
siteId
=
this
.
siteId
;
this
.
$post
(
"
/device/stat/list
"
,
query
)
.
then
((
res
)
=>
{
if
(
res
.
code
==
1
)
{
...
...
@@ -1104,7 +1100,7 @@ export default {
},
data
()
{
return
{
siteId
:
null
,
siteId
:
null
,
timer
:
""
,
loading
:
false
,
indexStatInfo
:
{},
...
...
device-manager-ui/admin/src/views/alarm/sms/send/list.vue
View file @
03013975
...
...
@@ -20,14 +20,15 @@
/** 表单弹出框模式需引入 */
import
drawerShow
from
"
./drawershow
"
;
import
table
from
"
@/assets/mixins/table
"
;
import
session
from
"
@/assets/utils/session
"
;
export
default
{
name
:
"
AlarmSmsSend
"
,
components
:
{
drawerShow
},
mixins
:
[
table
],
created
()
{
this
.
query
=
Object
.
assign
({},
this
.
query
,
{
siteId
:
1
});
this
.
query
=
Object
.
assign
({},
this
.
query
,
{
siteId
:
session
.
getSession
(
"
siteid
"
)
||
null
,
});
},
methods
:
{
/** 重写新增方法 */
...
...
device-manager-ui/admin/src/views/device/log/list.vue
View file @
03013975
...
...
@@ -11,14 +11,15 @@
/** 表单弹出框模式需引入 */
import
dialogShow
from
"
./dialogshow
"
;
import
table
from
"
@/assets/mixins/table
"
;
import
session
from
"
@/assets/utils/session
"
;
export
default
{
name
:
"
DeviceLog
"
,
components
:
{
dialogShow
},
mixins
:
[
table
],
created
()
{
this
.
siteId
=
window
.
sessionStorage
.
getItem
(
'
siteid
'
)
||
null
this
.
query
=
Object
.
assign
({},
this
.
query
,
{
siteId
:
this
.
siteId
})
;
//
this.siteId=window.sessionStorage.getItem('siteid') || null
this
.
siteId
=
session
.
getSession
(
"
siteid
"
)
||
null
;
this
.
query
=
Object
.
assign
({},
this
.
query
,
{
siteId
:
this
.
siteId
});
},
methods
:
{
/** 重写新增方法 */
...
...
@@ -36,7 +37,7 @@ export default {
},
data
()
{
return
{
siteId
:
null
,
siteId
:
null
,
config
:
{
search
:
[
{
...
...
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