Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
W
witiumCloud2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
WitCloud
witiumCloud2
Commits
68cef080
Commit
68cef080
authored
Apr 14, 2020
by
frank
🏀
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
传感器历史数据页面增加了一个主题的选择框
parent
d4a38d7d
Pipeline
#251
passed with stage
in 0 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
33 deletions
+48
-33
sensor-detail.component.html
src/app/main/sensor-detail/sensor-detail.component.html
+45
-32
sensor-detail.component.ts
src/app/main/sensor-detail/sensor-detail.component.ts
+3
-1
No files found.
src/app/main/sensor-detail/sensor-detail.component.html
View file @
68cef080
...
@@ -143,6 +143,18 @@
...
@@ -143,6 +143,18 @@
</nz-table>
</nz-table>
</nz-tab>
</nz-tab>
<nz-tab
nzTitle=
"图表"
>
<nz-tab
nzTitle=
"图表"
>
<nz-row
style=
"min-height: 50px;"
>
<nz-col
[
nzSpan
]="
2
"
>
<p>
请选择主题
</p>
</nz-col>
<nz-col
[
nzSpan
]="
5
"
>
<nz-select
[(
ngModel
)]="
selectedTopicValue
"
nzAllowClear
nzPlaceHolder=
"Choose"
style=
"min-width: 300px"
>
<nz-option
*
ngFor=
"let one of deviceData"
[
nzValue
]="
one
.
topicName
"
[
nzLabel
]="
one
.
topicName
"
></nz-option>
</nz-select>
</nz-col>
</nz-row>
<nz-row>
<div
class=
"cards"
>
<div
class=
"cards"
>
<div
class=
"card"
*
ngFor=
"let one of actualData;let i = index"
>
<div
class=
"card"
*
ngFor=
"let one of actualData;let i = index"
>
<div
class=
"title"
>
<div
class=
"title"
>
...
@@ -179,6 +191,7 @@
...
@@ -179,6 +191,7 @@
<span>
{{'close' | translate}}
</span></button>
<span>
{{'close' | translate}}
</span></button>
</div>
</div>
</div>
</div>
</nz-row>
</nz-tab>
</nz-tab>
</nz-tabset>
</nz-tabset>
</nz-tab>
</nz-tab>
...
...
src/app/main/sensor-detail/sensor-detail.component.ts
View file @
68cef080
...
@@ -52,6 +52,7 @@ export class SensorDetailComponent implements OnInit {
...
@@ -52,6 +52,7 @@ export class SensorDetailComponent implements OnInit {
hisTopicName
;
hisTopicName
;
hisAlias
;
hisAlias
;
hisDevInfo
;
hisDevInfo
;
selectedTopicValue
;
constructor
(
private
api
:
ApiService
,
private
message
:
NzMessageService
,
private
router
:
Router
,
private
ck
:
CheckService
,
constructor
(
private
api
:
ApiService
,
private
message
:
NzMessageService
,
private
router
:
Router
,
private
ck
:
CheckService
,
private
ac
:
ActivatedRoute
,
private
modalService
:
NzModalService
,
private
translate
:
TranslateService
)
{
private
ac
:
ActivatedRoute
,
private
modalService
:
NzModalService
,
private
translate
:
TranslateService
)
{
...
@@ -180,7 +181,8 @@ export class SensorDetailComponent implements OnInit {
...
@@ -180,7 +181,8 @@ export class SensorDetailComponent implements OnInit {
getHistoryData
():
void
{
getHistoryData
():
void
{
this
.
hisTopicName
=
this
.
wayData
[
0
].
topicName
;
// this.hisTopicName = this.wayData[0].topicName;
this
.
hisTopicName
=
this
.
selectedTopicValue
;
this
.
api
.
data
.
getHisData
([{
alias
:
this
.
hisDevInfo
.
alias
,
deviceList
:
[{
sn
:
this
.
hisDevInfo
.
SN
,
this
.
api
.
data
.
getHisData
([{
alias
:
this
.
hisDevInfo
.
alias
,
deviceList
:
[{
sn
:
this
.
hisDevInfo
.
SN
,
type
:
this
.
hisDevInfo
.
dType
}],
endTime
:
this
.
selectTime3
?
new
Date
().
getTime
()
:
this
.
req3
.
startTime
,
type
:
this
.
hisDevInfo
.
dType
}],
endTime
:
this
.
selectTime3
?
new
Date
().
getTime
()
:
this
.
req3
.
startTime
,
offset
:
0
-
new
Date
().
getTimezoneOffset
()
/
60
,
offset
:
0
-
new
Date
().
getTimezoneOffset
()
/
60
,
...
...
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