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
51f77358
Commit
51f77358
authored
Apr 28, 2019
by
van.chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
刷新
parent
64873932
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
4 deletions
+17
-4
sensor-detail.component.html
src/app/main/sensor-detail/sensor-detail.component.html
+6
-0
sensor-detail.component.ts
src/app/main/sensor-detail/sensor-detail.component.ts
+4
-0
sensor-mgr.component.html
src/app/main/sensor-mgr/sensor-mgr.component.html
+3
-1
zh.json
src/assets/i18n/zh.json
+2
-1
environment.ts
src/environments/environment.ts
+2
-2
No files found.
src/app/main/sensor-detail/sensor-detail.component.html
View file @
51f77358
...
@@ -98,6 +98,12 @@
...
@@ -98,6 +98,12 @@
<!--</nz-table>-->
<!--</nz-table>-->
<!--</nz-tab>-->
<!--</nz-tab>-->
<nz-tab
nzTitle=
"运行状态"
>
<nz-tab
nzTitle=
"运行状态"
>
<div
class=
"subTitle"
>
<div
class=
"backBtnOnTabset"
style=
"top: -2px"
>
<button
nz-button
class=
"btnAll"
[
nzLoading
]="
isLoading
"
(
click
)="
refresh
()"
><span>
{{'refresh' | translate}}
</span></button>
</div>
</div>
<nz-tabset
style=
"margin-top: -20px;"
>
<nz-tabset
style=
"margin-top: -20px;"
>
<nz-tab
nzTitle=
"表格"
>
<nz-tab
nzTitle=
"表格"
>
<nz-table
#
nzTable5
<nz-table
#
nzTable5
...
...
src/app/main/sensor-detail/sensor-detail.component.ts
View file @
51f77358
...
@@ -272,4 +272,8 @@ export class SensorDetailComponent implements OnInit {
...
@@ -272,4 +272,8 @@ export class SensorDetailComponent implements OnInit {
trans
:
{
companyNo
:
'selectCompany'
,
newTopicModelName
:
'moduleName'
},
trans
:
{
companyNo
:
'selectCompany'
,
newTopicModelName
:
'moduleName'
},
field
:
[
'companyNo'
,
'deviceNo'
,
'newTopicModelName'
]};
field
:
[
'companyNo'
,
'deviceNo'
,
'newTopicModelName'
]};
}
}
refresh
()
{
this
.
getCurrent
();
}
}
}
src/app/main/sensor-mgr/sensor-mgr.component.html
View file @
51f77358
...
@@ -148,7 +148,9 @@
...
@@ -148,7 +148,9 @@
</nz-autocomplete>
</nz-autocomplete>
</div>
</div>
</div>
</div>
<app-search-item
*
ngIf=
"!isUpdate"
isMust=
"true"
inModal=
"true"
[
label
]="'
belongAddress
'
|
translate
"
[(
value
)]="
req3
.
address
"
></app-search-item>
<app-search-item
*
ngIf=
"!isUpdate"
isMust=
"true"
inModal=
"true"
[
label
]="
isMulti
?
('
bindStartTongxinAddr
'
|
translate
)
:
('
bindTongxinAddr
'
|
translate
)"
nz-tooltip
[
nzTitle
]="'
gatewayBindTips
'
|
translate
"
[(
value
)]="
req3
.
address
"
></app-search-item>
</ng-template>
</ng-template>
<ng-template
#
foot3
>
<ng-template
#
foot3
>
<button
nz-button
nzType=
"default"
[
nzLoading
]="
isLoading
"
(
click
)="
cancel
('
isBindConV
')"
>
<button
nz-button
nzType=
"default"
[
nzLoading
]="
isLoading
"
(
click
)="
cancel
('
isBindConV
')"
>
...
...
src/assets/i18n/zh.json
View file @
51f77358
...
@@ -166,5 +166,6 @@
...
@@ -166,5 +166,6 @@
"wrongEng"
:
"部分字段要求为英文格式"
,
"wrongEng"
:
"部分字段要求为英文格式"
,
"addNum"
:
"新增数量"
,
"addNum"
:
"新增数量"
,
"startSN"
:
"起始序列号"
,
"startSN"
:
"起始序列号"
,
"confirmUnbindSelectedRecord"
:
"确认解绑选中的这些设备吗"
"confirmUnbindSelectedRecord"
:
"确认解绑选中的这些设备吗"
,
"refresh"
:
"刷新"
}
}
src/environments/environment.ts
View file @
51f77358
...
@@ -6,8 +6,8 @@ export const environment = {
...
@@ -6,8 +6,8 @@ export const environment = {
production
:
false
,
production
:
false
,
// baseUrl: 'http://cloud-test.witium.com/api', // 对外访问测试网地址
// baseUrl: 'http://cloud-test.witium.com/api', // 对外访问测试网地址
// baseUrl: 'http://172.16.1.53:8092', // cy
// baseUrl: 'http://172.16.1.53:8092', // cy
//
baseUrl: 'http://172.16.1.52:8094', // zz
baseUrl
:
'http://172.16.1.52:8094'
,
// zz
baseUrl
:
'http://172.16.1.13:8094'
,
// 测试
//
baseUrl: 'http://172.16.1.13:8094', // 测试
};
};
/*
/*
...
...
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