Commit 3021fe72 authored by yating.lin's avatar yating.lin

修改:替换配置页时间和日期的formart

parent 29a2d8f3
......@@ -6066,6 +6066,24 @@
"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
"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": {
"version": "4.6.2",
"resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.6.2.tgz",
......@@ -10365,8 +10383,7 @@
"symbol-observable": {
"version": "1.2.0",
"resolved": "http://registry.npm.taobao.org/symbol-observable/download/symbol-observable-1.2.0.tgz",
"integrity": "sha1-wiaIrtTqs83C3+rLtWFmBWCgCAQ=",
"dev": true
"integrity": "sha1-wiaIrtTqs83C3+rLtWFmBWCgCAQ="
},
"tapable": {
"version": "1.1.3",
......
......@@ -58,6 +58,7 @@ import {NgxDatatableModule} from '@swimlane/ngx-datatable';
import {EnvAlarmDetailPage} from './envCtrl/env-alarm-detail/env-alarm-detail.page';
import {EnvAddModelPage} from './envCtrl/env-add-model/env-add-model.page';
import {EnvChangeModelPage} from './envCtrl/env-change-model/env-change-model.page';
import {DatePipe} from '@angular/common';
@NgModule({
declarations: [
......@@ -121,7 +122,8 @@ import {EnvChangeModelPage} from './envCtrl/env-change-model/env-change-model.pa
Mqtt,
Transfer,
Load,
Network
Network,
DatePipe
],
bootstrap: [AppComponent]
})
......
......@@ -4,6 +4,7 @@ import {NavController} from '@ionic/angular';
import {ActivatedRoute, Router} from '@angular/router';
import {Load} from '../../service/load';
import {Transfer} from '../../service/transfer';
import {DatePipe} from '@angular/common';
@Component({
selector: 'v-env-change-model',
......@@ -17,7 +18,8 @@ export class EnvChangeModelPage implements OnInit {
private ac: ActivatedRoute,
private load: Load,
private tf: Transfer,
private router: Router) {}
private router: Router,
private datepipe: DatePipe) {}
controlConfig = [];
ngOnInit() {
......@@ -40,6 +42,12 @@ export class EnvChangeModelPage implements OnInit {
}
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);
// this.nav.navigateForward('', );
// this.nav.navigateBack()
......@@ -51,4 +59,12 @@ export class EnvChangeModelPage implements OnInit {
goBack() {
this.nav.back();
}
formartTime(time) {
return this.datepipe.transform(time, 'HH:mm');
}
formartDate(date) {
return this.datepipe.transform(date, 'MM-dd');
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment