Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
muChangApp
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
muChangApp
Commits
3021fe72
Commit
3021fe72
authored
Nov 07, 2019
by
yating.lin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改:替换配置页时间和日期的formart
parent
29a2d8f3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
5 deletions
+40
-5
package-lock.json
package-lock.json
+19
-2
package.json
package.json
+1
-1
app.module.ts
src/app/app.module.ts
+3
-1
env-change-model.page.ts
src/app/envCtrl/env-change-model/env-change-model.page.ts
+17
-1
No files found.
package-lock.json
View file @
3021fe72
...
@@ -6066,6 +6066,24 @@
...
@@ -6066,6 +6066,24 @@
"integrity"
:
"sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
,
"integrity"
:
"sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
,
"dev"
:
true
"dev"
:
true
},
},
"ionic-native"
:
{
"version"
:
"2.9.0"
,
"resolved"
:
"https://registry.npm.taobao.org/ionic-native/download/ionic-native-2.9.0.tgz"
,
"integrity"
:
"sha1-6aNshQ7aGAkYQHwojl1jSXjjIFI="
,
"requires"
:
{
"rxjs"
:
"5.0.1"
},
"dependencies"
:
{
"rxjs"
:
{
"version"
:
"5.0.1"
,
"resolved"
:
"https://registry.npm.taobao.org/rxjs/download/rxjs-5.0.1.tgz"
,
"integrity"
:
"sha1-Omm9+fDKCphjAzcNRwj3K9+sg1Y="
,
"requires"
:
{
"symbol-observable"
:
"^1.0.1"
}
}
}
},
"ionicons"
:
{
"ionicons"
:
{
"version"
:
"4.6.2"
,
"version"
:
"4.6.2"
,
"resolved"
:
"https://registry.npmjs.org/ionicons/-/ionicons-4.6.2.tgz"
,
"resolved"
:
"https://registry.npmjs.org/ionicons/-/ionicons-4.6.2.tgz"
,
...
@@ -10365,8 +10383,7 @@
...
@@ -10365,8 +10383,7 @@
"symbol-observable"
:
{
"symbol-observable"
:
{
"version"
:
"1.2.0"
,
"version"
:
"1.2.0"
,
"resolved"
:
"http://registry.npm.taobao.org/symbol-observable/download/symbol-observable-1.2.0.tgz"
,
"resolved"
:
"http://registry.npm.taobao.org/symbol-observable/download/symbol-observable-1.2.0.tgz"
,
"integrity"
:
"sha1-wiaIrtTqs83C3+rLtWFmBWCgCAQ="
,
"integrity"
:
"sha1-wiaIrtTqs83C3+rLtWFmBWCgCAQ="
"dev"
:
true
},
},
"tapable"
:
{
"tapable"
:
{
"version"
:
"1.1.3"
,
"version"
:
"1.1.3"
,
...
...
package.json
View file @
3021fe72
...
@@ -102,4 +102,4 @@
...
@@ -102,4 +102,4 @@
"ios"
"ios"
]
]
}
}
}
}
\ No newline at end of file
src/app/app.module.ts
View file @
3021fe72
...
@@ -58,6 +58,7 @@ import {NgxDatatableModule} from '@swimlane/ngx-datatable';
...
@@ -58,6 +58,7 @@ import {NgxDatatableModule} from '@swimlane/ngx-datatable';
import
{
EnvAlarmDetailPage
}
from
'./envCtrl/env-alarm-detail/env-alarm-detail.page'
;
import
{
EnvAlarmDetailPage
}
from
'./envCtrl/env-alarm-detail/env-alarm-detail.page'
;
import
{
EnvAddModelPage
}
from
'./envCtrl/env-add-model/env-add-model.page'
;
import
{
EnvAddModelPage
}
from
'./envCtrl/env-add-model/env-add-model.page'
;
import
{
EnvChangeModelPage
}
from
'./envCtrl/env-change-model/env-change-model.page'
;
import
{
EnvChangeModelPage
}
from
'./envCtrl/env-change-model/env-change-model.page'
;
import
{
DatePipe
}
from
'@angular/common'
;
@
NgModule
({
@
NgModule
({
declarations
:
[
declarations
:
[
...
@@ -121,7 +122,8 @@ import {EnvChangeModelPage} from './envCtrl/env-change-model/env-change-model.pa
...
@@ -121,7 +122,8 @@ import {EnvChangeModelPage} from './envCtrl/env-change-model/env-change-model.pa
Mqtt
,
Mqtt
,
Transfer
,
Transfer
,
Load
,
Load
,
Network
Network
,
DatePipe
],
],
bootstrap
:
[
AppComponent
]
bootstrap
:
[
AppComponent
]
})
})
...
...
src/app/envCtrl/env-change-model/env-change-model.page.ts
View file @
3021fe72
...
@@ -4,6 +4,7 @@ import {NavController} from '@ionic/angular';
...
@@ -4,6 +4,7 @@ import {NavController} from '@ionic/angular';
import
{
ActivatedRoute
,
Router
}
from
'@angular/router'
;
import
{
ActivatedRoute
,
Router
}
from
'@angular/router'
;
import
{
Load
}
from
'../../service/load'
;
import
{
Load
}
from
'../../service/load'
;
import
{
Transfer
}
from
'../../service/transfer'
;
import
{
Transfer
}
from
'../../service/transfer'
;
import
{
DatePipe
}
from
'@angular/common'
;
@
Component
({
@
Component
({
selector
:
'v-env-change-model'
,
selector
:
'v-env-change-model'
,
...
@@ -17,7 +18,8 @@ export class EnvChangeModelPage implements OnInit {
...
@@ -17,7 +18,8 @@ export class EnvChangeModelPage implements OnInit {
private
ac
:
ActivatedRoute
,
private
ac
:
ActivatedRoute
,
private
load
:
Load
,
private
load
:
Load
,
private
tf
:
Transfer
,
private
tf
:
Transfer
,
private
router
:
Router
)
{}
private
router
:
Router
,
private
datepipe
:
DatePipe
)
{}
controlConfig
=
[];
controlConfig
=
[];
ngOnInit
()
{
ngOnInit
()
{
...
@@ -40,6 +42,12 @@ export class EnvChangeModelPage implements OnInit {
...
@@ -40,6 +42,12 @@ export class EnvChangeModelPage implements OnInit {
}
}
saveModels
()
{
saveModels
()
{
this
.
controlConfig
.
forEach
((
item
)
=>
{
item
.
on
=
this
.
formartTime
(
item
.
on
);
item
.
off
=
this
.
formartTime
(
item
.
off
);
item
.
startDate
=
this
.
formartDate
(
item
.
startDate
);
item
.
stopDate
=
this
.
formartDate
(
item
.
stopDate
);
});
const
query
=
'?changeModelCfg='
+
JSON
.
stringify
(
this
.
controlConfig
);
const
query
=
'?changeModelCfg='
+
JSON
.
stringify
(
this
.
controlConfig
);
// this.nav.navigateForward('', );
// this.nav.navigateForward('', );
// this.nav.navigateBack()
// this.nav.navigateBack()
...
@@ -51,4 +59,12 @@ export class EnvChangeModelPage implements OnInit {
...
@@ -51,4 +59,12 @@ export class EnvChangeModelPage implements OnInit {
goBack
()
{
goBack
()
{
this
.
nav
.
back
();
this
.
nav
.
back
();
}
}
formartTime
(
time
)
{
return
this
.
datepipe
.
transform
(
time
,
'HH:mm'
);
}
formartDate
(
date
)
{
return
this
.
datepipe
.
transform
(
date
,
'MM-dd'
);
}
}
}
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