修改配置页以及子页面传值

package.json

@@ -46,6 +46,7 @@
     "core-js": "^2.5.4",
     "echarts": "^4.2.1",
     "es6-promise-plugin": "^4.2.2",
+    "ionic-native": "^2.9.0",
     "loaders.css": "^0.1.2",
     "mqtt": "^2.18.8",
     "ng-zorro-antd-mobile": "^0.11.9",

src/app/envCtrl/env-add-model/env-add-model.page.html

@@ -64,7 +64,7 @@
         </ion-item>
     </div>
     <div style="text-align: center; width:100%; position: absolute; bottom: 10px;">
-        <ion-button onclick="backward()" class="btn" color="light" slot="start" style="margin-right: 20px;">取消</ion-button>
-        <ion-button onclick="saveModels()" class="btn" color="secondary" slot="end">确认</ion-button>
+        <ion-button (click)="goBack()" class="btn" color="light" slot="start" style="margin-right: 20px;">取消</ion-button>
+        <ion-button (click)="saveModels()" class="btn" color="secondary" slot="end">确认</ion-button>
     </div>
 </ion-content>

src/app/envCtrl/env-add-model/env-add-model.page.ts

@@ -25,12 +25,12 @@ export class EnvAddModelPage implements OnInit {
     }
 
     init() {
-        this.controlConfig = [{id: 1, name: '', startDate: '', stopDate: '', on: '', off: ''}];
+        this.controlConfig = [{id: 1, name: '', interval: '', T: '', A: '', B: ''}];
     }
 
     addModel() {
         const modelCount = this.controlConfig.length;
-        this.controlConfig.push({id: modelCount + 1, name: '', startDate: '', stopDate: '', on: '', off: ''});
+        this.controlConfig.push({id: modelCount + 1, name: '', interval: '', T: '', A: '', B: ''});
     }
 
     deleteModel(one) {
@@ -40,6 +40,16 @@ export class EnvAddModelPage implements OnInit {
     }
 
     saveModels() {
+        const query = '?addModelCfg=' + JSON.stringify(this.controlConfig);
+        // this.nav.navigateForward('', );
+        // this.nav.navigateBack()
+        // this.nav.navigateBack('', {changeModels: this.controlConfig});
+        // this.router.navigate(['/tabs/tab-cfg'], { queryParams: { changeModelCfg: this.controlConfig } });
+        this.nav.navigateBack('/tabs/tab-cfg' + query);
+    }
+
+    goBack() {
+        this.nav.back();
     }
 
     tempHaveTouch(event) {
@@ -98,5 +108,4 @@ export class EnvAddModelPage implements OnInit {
         }
         return options;
     }
-
 }

src/app/envCtrl/env-anal/env-anal.module.ts

@@ -6,6 +6,7 @@ import { Routes, RouterModule } from '@angular/router';
 import { IonicModule } from '@ionic/angular';
 
 import { EnvAnalPage } from './env-anal.page';
+import {NgxEchartsCoreModule} from 'ngx-echarts/core';
 
 const routes: Routes = [
   {
@@ -15,12 +16,13 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [
-    CommonModule,
-    FormsModule,
-    IonicModule,
-    RouterModule.forChild(routes)
-  ],
+    imports: [
+        CommonModule,
+        FormsModule,
+        IonicModule,
+        RouterModule.forChild(routes),
+        NgxEchartsCoreModule
+    ],
   declarations: [EnvAnalPage]
 })
 export class EnvAnalPageModule {}

src/app/envCtrl/env-cfg/env-cfg.page.ts

@@ -4,6 +4,7 @@ import {Api} from '../../service/api';
 import {Load} from '../../service/load';
 import {shrink, stretch, zoomIn, zoomOut, fadeIn, fadeOut, up, down} from '../../animations/animations';
 import {Transfer} from '../../service/transfer';
+import {ActivatedRoute} from '@angular/router';
 
 @Component({
     selector: 'v-env-cfg',
@@ -22,7 +23,7 @@ export class EnvCfgPage implements OnInit {
     };
 
     constructor(public alerCtrl: AlertController, private pickerController: PickerController,
-                private api: Api, private load: Load, public nav: NavController, private tf: Transfer) {
+                private api: Api, private load: Load, public nav: NavController, private tf: Transfer, private ac: ActivatedRoute) {
     }
 
     isError = false;
@@ -169,6 +170,25 @@ export class EnvCfgPage implements OnInit {
 
     init() {
         this.getData(0);
+        this.ac.queryParams.subscribe((data) => {
+            if (data) {
+                if (data.addModelCfg) {
+                    const cfg = JSON.parse(data.addModelCfg.toString());
+                    const count = this.shower.controlConfig.length;
+                    cfg.forEach((item, index) => {
+                        item.id = index + 1 + count;
+                    });
+                    this.shower.controlConfig = [...this.shower.controlConfig, ...cfg];
+                } else if (data.changeModelCfg) {
+                    const cfg = JSON.parse(data.changeModelCfg.toString());
+                    // const count = this.light.controlConfig.length;
+                    // cfg.forEach((item, index) => {
+                    //     item.id = index + 1 + count;
+                    // });
+                    this.light.controlConfig = cfg;
+                }
+            }
+        });
     }
 
     getData(time) {

src/app/envCtrl/env-change-model/env-change-model.page.ts

 import {Component, OnInit} from '@angular/core';
 import {Api} from '../../service/api';
 import {NavController} from '@ionic/angular';
-import {ActivatedRoute} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {Load} from '../../service/load';
 import {Transfer} from '../../service/transfer';
 
@@ -16,7 +16,8 @@ export class EnvChangeModelPage implements OnInit {
                 private api: Api,
                 private ac: ActivatedRoute,
                 private load: Load,
-                private tf: Transfer) {}
+                private tf: Transfer,
+                private router: Router) {}
 
     controlConfig = [];
     ngOnInit() {
@@ -39,10 +40,15 @@ export class EnvChangeModelPage implements OnInit {
     }
 
     saveModels() {
+        const query = '?changeModelCfg=' + JSON.stringify(this.controlConfig);
+        // this.nav.navigateForward('', );
+        // this.nav.navigateBack()
+        // this.nav.navigateBack('', {changeModels: this.controlConfig});
+        // this.router.navigate(['/tabs/tab-cfg'], { queryParams: { changeModelCfg: this.controlConfig } });
+        this.nav.navigateBack('/tabs/tab-cfg' + query);
     }
 
     goBack() {
-        debugger;
-        document.getElementById('back').click();
+        this.nav.back();
     }
 }

src/global.scss

@@ -137,6 +137,7 @@ img {
   height: 25px;
   margin-right: 5px;
   text-align: right;
+  padding-right: 5px !important;
 }
 
 .inputDateTime {