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
3d91158d
Commit
3d91158d
authored
Apr 15, 2019
by
van.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交一下
parent
d4a1e0b2
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
14 deletions
+18
-14
module-detail.component.html
src/app/main/module-detail/module-detail.component.html
+5
-7
module-detail.component.ts
src/app/main/module-detail/module-detail.component.ts
+2
-0
sensor-mgr.component.ts
src/app/main/sensor-mgr/sensor-mgr.component.ts
+1
-1
topic-module-detail.component.html
...in/topic-module-detail/topic-module-detail.component.html
+3
-5
zh.json
src/assets/i18n/zh.json
+2
-1
styles.scss
src/styles.scss
+5
-0
No files found.
src/app/main/module-detail/module-detail.component.html
View file @
3d91158d
<div
class=
"searchBar"
@
fade
>
<app-search-date
[
label
]="'
topicModuleName
'
|
translate
"
[(
value
)]="
req
.
startTime
"
showTime=
"true"
></app-search-date>
<div
class=
"btnLine"
>
<button
nz-button
[
nzType
]="'
primary
'"
[
nzLoading
]="
isLoading
"
(
click
)="
onSearch
()"
><span>
{{'search' | translate}}
</span></button>
<button
nz-button
class=
"btnAll"
[
nzLoading
]="
isLoading
"
(
click
)="
onGetAll
()"
><span>
{{'allData' | translate}}
</span></button>
</div>
</div>
<div
class=
"tableBar"
@
fade
>
<div
class=
"tableBar"
@
fade
>
<div
class=
"btnLine"
style=
"margin-bottom: 10px"
>
<label
class=
"subTitle"
>
123456 通道模板{{'detail' | translate}}
</label>
<button
nz-button
[
nzType
]="'
primary
'"
[
nzLoading
]="
isLoading
"
(
click
)="
add
()"
><span>
{{'addWay' | translate}}
</span></button>
<app-back
[
isLoading
]="
isLoading
"
></app-back>
</div>
<nz-table
#
nzTable
<nz-table
#
nzTable
[
nzData
]="
data
"
[
nzData
]="
data
"
[
nzSize
]="'
middle
'"
[
nzSize
]="'
middle
'"
...
...
src/app/main/module-detail/module-detail.component.ts
View file @
3d91158d
...
@@ -74,4 +74,6 @@ export class ModuleDetailComponent implements OnInit {
...
@@ -74,4 +74,6 @@ export class ModuleDetailComponent implements OnInit {
update
(
one
)
{}
update
(
one
)
{}
deleteConfirm
(
one
)
{}
deleteConfirm
(
one
)
{}
add
()
{}
}
}
src/app/main/sensor-mgr/sensor-mgr.component.ts
View file @
3d91158d
...
@@ -135,7 +135,7 @@ export class SensorMgrComponent implements OnInit {
...
@@ -135,7 +135,7 @@ export class SensorMgrComponent implements OnInit {
// 跳转详情
// 跳转详情
toSee
(
e
)
{
toSee
(
e
)
{
this
.
router
.
navigate
([
'/app/deviceCenter/
gatewayMgr/gatewaySee
'
]);
this
.
router
.
navigate
([
'/app/deviceCenter/
sensorMgr/sensorDetail
'
]);
}
}
// 单个的方法
// 单个的方法
...
...
src/app/main/topic-module-detail/topic-module-detail.component.html
View file @
3d91158d
<div
class=
"
search
Bar"
@
fade
>
<div
class=
"
table
Bar"
@
fade
>
<
app-search-date
[
label
]="'
topicModuleName
'
|
translate
"
[(
value
)]="
req
.
startTime
"
showTime=
"true"
></app-search-date
>
<
div
class=
"btnLine"
style=
"margin-bottom: 10px"
>
<div
class=
"btnLine"
>
<label
class=
"subTitle"
>
123456 主题配置模板{{'detail' | translate}}
</label
>
<button
nz-button
[
nzType
]="'
primary
'"
[
nzLoading
]="
isLoading
"
(
click
)="
onSearch
()"
><span>
{{'search' | translate}}
</span></button>
<button
nz-button
[
nzType
]="'
primary
'"
[
nzLoading
]="
isLoading
"
(
click
)="
onSearch
()"
><span>
{{'search' | translate}}
</span></button>
<button
nz-button
class=
"btnAll"
[
nzLoading
]="
isLoading
"
(
click
)="
onGetAll
()"
><span>
{{'allData' | translate}}
</span></button>
<button
nz-button
class=
"btnAll"
[
nzLoading
]="
isLoading
"
(
click
)="
onGetAll
()"
><span>
{{'allData' | translate}}
</span></button>
</div>
</div>
</div>
<div
class=
"tableBar"
@
fade
>
<nz-table
#
nzTable
<nz-table
#
nzTable
[
nzData
]="
data
"
[
nzData
]="
data
"
[
nzSize
]="'
middle
'"
[
nzSize
]="'
middle
'"
...
...
src/assets/i18n/zh.json
View file @
3d91158d
...
@@ -119,5 +119,6 @@
...
@@ -119,5 +119,6 @@
"moduleNum"
:
"通道编号"
,
"moduleNum"
:
"通道编号"
,
"moduleAlias"
:
"通道别名"
,
"moduleAlias"
:
"通道别名"
,
"isAlarm"
:
"是否报警"
,
"isAlarm"
:
"是否报警"
,
"saveOther"
:
"另存为"
"saveOther"
:
"另存为"
,
"addWay"
:
"添加通道"
}
}
src/styles.scss
View file @
3d91158d
...
@@ -379,3 +379,8 @@ span.addSpan {
...
@@ -379,3 +379,8 @@ span.addSpan {
text-indent
:
5px
;
text-indent
:
5px
;
font-weight
:
500
;
font-weight
:
500
;
}
}
label
.subTitle
{
position
:
absolute
;
left
:
15px
;
}
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