修改app启动加载: 全加载 ⇒ 部分懒加载

src/app/app-routing.module.ts

 import {NgModule} from '@angular/core';
-import {PreloadAllModules, RouterModule, Routes} from '@angular/router';
+import {NoPreloading, PreloadAllModules, RouterModule, Routes} from '@angular/router';
 import {HomePage} from './home/home.page';
 import {EastPage} from './east/east.page';
 import {LoginPage} from './login/login.page';
@@ -42,17 +42,6 @@ const routes: Routes = [
         ]
     },
     {path: 'login', component: LoginPage},
-    // {path: 'env-detail',
-    //     component: EnvDetailPage,
-    //     children: [
-    //         {path: 'fan', component: EnvFanPage},
-    //         {path: 'shower/:fieldRegionNo', component: EnvShowerPage},
-    //         {path: 'light/:fieldRegionNo', component: EnvLightPage},
-    //         {path: 'waterchannel/:fieldRegionNo', component: EnvWaterchannelPage},
-    //         {path: '', redirectTo: 'fan', pathMatch : 'prefix'},
-    //     ]
-    // },
-
     {path: 'env-detail',
         component: EnvDetailPage,
         children: [
@@ -62,38 +51,35 @@ const routes: Routes = [
             {path: 'waterchannel/:fieldRegionNo/:operationModel/:online', component: EnvWaterchannelPage},
             {path: '', redirectTo: 'fan', pathMatch : 'prefix'},
         ]
+    },
 
-        // children: [
-        //     {path: 'fan', component: EnvFanPage},
-        //     {path: 'shower', component: EnvShowerPage},
-        //     {path: 'light', component: EnvLightPage},
-        //     {path: 'waterchannel', component: EnvWaterchannelPage},
-        //     {path: '', redirectTo: 'fan', pathMatch : 'prefix'},
-        // ]
 
+    // {path: 'env-detail',
+    //     component: EnvDetailPage,
+    //     // loadChildren: './envCtrl/env-detail/env-detail.module#EnvDetailPageModule',
     //     children: [
     //         {path: 'fan', loadChildren: './envCtrl/env-fan/env-fan.module#EnvFanPageModule'},
-        //     {path: 'shower', loadChildren: './envCtrl/env-shower/env-shower.module#EnvShowerPageModule'},
-        //     {path: 'light', loadChildren: './envCtrl/env-light/env-light.module#EnvLightPageModule'},
-        //     {path: 'waterchannel', loadChildren: './envCtrl/env-waterchannel/env-waterchannel.module#EnvWaterchannelPageModule'},
+    //         {path: 'shower/:fieldRegionNo/:operationModel/:online', loadChildren: './envCtrl/env-shower/env-shower.module#EnvShowerPageModule'},
+    //         {path: 'light/:fieldRegionNo/:operationModel/:online', loadChildren: './envCtrl/env-light/env-light.module#EnvLightPageModule'},
+    //         {path: 'waterchannel/:fieldRegionNo/:operationModel/:online', loadChildren: './envCtrl/env-waterchannel/env-waterchannel.module#EnvWaterchannelPageModule'},
     //         {path: '', redirectTo: 'fan', pathMatch : 'prefix'},
     //     ]
-    },
+    // },
 
     // { path: 'env-detail', loadChildren: './envCtrl/env-detail/env-detail.module#EnvDetailPageModule' },
     // {path: 'env-history', component: EnvHistoryPage},
     { path: 'env-history', loadChildren: './envCtrl/env-history/env-history.module#EnvHistoryPageModule' },
-    {path: 'env-alarmDetail', component: EnvAlarmDetailPage},
+    // {path: 'env-alarm-detail', component: EnvAlarmDetailPage},
     { path: 'env-alarm-detail', loadChildren: './envCtrl/env-alarm-detail/env-alarm-detail.module#EnvAlarmDetailPageModule' },
     {path: 'tabs', loadChildren: './envCtrl/tabs/tabs.module#TabsPageModule'},
-    {path: 'env-add-model', component: EnvAddModelPage},
-    {path: 'env-change-model', component: EnvChangeModelPage},
-    {path: 'env-anal-detail', component: EnvAnalDetailPage},
+    {path: 'env-add-model', loadChildren: './envCtrl/env-add-model/env-add-model.module#EnvAddModelPageModule'},
+    {path: 'env-change-model', loadChildren: './envCtrl/env-change-model/env-change-model.module#EnvChangeModelPageModule'},
+    {path: 'env-anal-detail', loadChildren: './envCtrl/env-anal-detail/env-anal-detail.module#EnvAnalDetailPageModule'},
 ];
 
 @NgModule({
     imports: [
-        RouterModule.forRoot(routes, {preloadingStrategy: PreloadAllModules, enableTracing: false})
+        RouterModule.forRoot(routes, {preloadingStrategy: NoPreloading, enableTracing: false})
     ],
     exports: [RouterModule]
 })

src/app/app.component.ts

@@ -154,7 +154,7 @@ export class AppComponent implements AfterViewInit, OnDestroy {
             this.statusBar.overlaysWebView(false);
             this.splashScreen.hide();
         }
-        this.mqtt.getUserInfo();
+        // this.mqtt.getUserInfo();
     }
 
     ngOnDestroy(): void {

src/app/app.module.ts

@@ -86,12 +86,12 @@ import {DatePipe} from '@angular/common';
 
         // EnvAnalPage,
         // EnvAlarmPage,
-        EnvAlarmDetailPage,
+        // EnvAlarmDetailPage,
         // EnvCfgPage,
         // EnvHomePage,
-        EnvAddModelPage,
-        EnvChangeModelPage,
-        EnvAnalDetailPage
+        // EnvAddModelPage,
+        // EnvChangeModelPage,
+        // EnvAnalDetailPage
     ],
     entryComponents: [],
     imports: [

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

-<ion-header>
+<ion-header no-border>
     <ion-toolbar color="dark">
         <ion-buttons slot="start">
           <ion-back-button mode="ios" text=""></ion-back-button>

src/app/envCtrl/env-alarm-detail/env-alarm-detail.page.html

-
-<ion-header translucent="false">
+<ion-header translucent="false" no-border>
   <ion-toolbar color="dark">
     <ion-buttons slot="start">
       <ion-back-button mode="ios" text="" ></ion-back-button>

src/app/envCtrl/env-alarm/env-alarm.page.html

-<ion-header>
+<ion-header no-border>
   <ion-toolbar color="dark">
     <ion-title class="title">牛舍告警一览</ion-title>
   </ion-toolbar>

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

@@ -66,7 +66,7 @@ export class EnvAlarmPage implements OnInit {
     }
 
     toControl(one, displayArea) {
-        const query = '/env-alarmDetail?no=' + one.fieldRegionNo + '&fieldRegionName=' + one.fieldRegionName
+        const query = '/env-alarm-detail?no=' + one.fieldRegionNo + '&fieldRegionName=' + one.fieldRegionName
             + '&displayArea=' + displayArea + '&interval=' + one.interval;
         this.nav.navigateForward(query);
     }

src/app/envCtrl/env-anal-detail/env-anal-detail.page.html

-<ion-header>
+<ion-header no-border>
   <ion-toolbar color="dark">
     <ion-buttons slot="start">
       <ion-back-button mode="ios" text="" id="back"></ion-back-button>

src/app/envCtrl/env-anal/env-anal.page.html

-<ion-header>
+<ion-header no-border>
   <ion-toolbar color="dark">
     <ion-title class="title">牛舍环境质量分析</ion-title>
   </ion-toolbar>

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

-<ion-header>
+<ion-header no-border>
   <ion-toolbar color="dark">
     <ion-title class="title">配置</ion-title>
   </ion-toolbar>

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

-<ion-header>
+<ion-header no-border>
     <ion-toolbar color="dark">
         <ion-buttons slot="start">
             <ion-back-button mode="ios" text="" id="back"></ion-back-button>

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

@@ -73,6 +73,31 @@ export class EnvDetailPage implements OnInit {
     waterchannelLink = '';
 
     ngOnInit() {
+        this.item = {
+            factoryNo: '',
+            factoryName: '',
+            fieldRegionNo: '',
+            fieldRegionName: '',
+            temp: 0,
+            humi: 0,
+            // tempColor: '#62C7CC',
+            // humiColor: '#62C7CC',
+            heatStressLevel: 0,
+            // heatStressColor: '#62C7CC',
+            heatStressLevelName: '无',
+            online: 0,
+            operationModel: 1,
+            isWisdomModel:  1,
+            alarm: 1,
+            inHouse: {
+                inHouse: 0,
+                inHouseState: false,
+                inHouseName: '离舍',
+                fieldDeviceNo: '',
+                fieldDeviceType: '',
+            },
+            ts: 0
+        };
         this.init();
     }
 
@@ -98,9 +123,10 @@ export class EnvDetailPage implements OnInit {
         if (time) {
             this.load.toLoad('加载中...', false);
         }
+        if (this.fieldRegionNo !== undefined && this.fieldRegionNo !== null) {
             this.api.cowshedApp.getRealDataByFieldRegionNo([{fieldRegionNo: this.fieldRegionNo}, (data) => {
-            if (data) {
-                const environmentConfigJson = JSON.parse(data.environmentConfigJson.toString());
+                if (data && data.fieldRegionNo) {
+                    const environmentConfigJson = this.parseConfigJson(data.environmentConfigJson); // JSON.parse(data.environmentConfigJson.toString());
                     this.item = data;
                     this.item.heatStressLevelName = this.getHeatStressLevelName(data.heatStressLevel);
 
@@ -110,6 +136,16 @@ export class EnvDetailPage implements OnInit {
                 }
             }]);
         }
+    }
+
+    parseConfigJson(environmentConfigJson) {
+        if (environmentConfigJson === undefined || environmentConfigJson === null) {
+            const config = {TU: 100, TL: 0, HU: 500, HL: 0};
+            return config;
+        } else {
+            return JSON.parse(environmentConfigJson.toString());
+        }
+    }
 
     setInHouseInfo(inHouse) {
         if (inHouse === undefined || inHouse === null ||

src/app/envCtrl/env-history/env-history.page.html

-<ion-header>
+<ion-header no-border>
   <ion-toolbar color="dark">
     <ion-buttons slot="start">
       <ion-back-button mode="ios" text="" ></ion-back-button>
@@ -20,7 +20,7 @@
     <div class="div-table">
       <!--[scrollbarH]="true"-->
       <ngx-datatable class="material"
-                     [messages]="{emptyMessage: '<br>暂无数据'}"
+                     [messages]="{emptyMessage: '<br>暂无数据<br>&nbsp;'}"
                      [rows]="tableRows"
                      [columnMode]="ColumnMode.force"
                      [scrollbarV]="false"

src/app/envCtrl/env-home/env-home.page.html

-<ion-header mode="ios">
+<ion-header mode="ios" no-border>
   <ion-toolbar color="dark">
     <ion-buttons slot="start" >
       <ion-back-button  mode="ios" defaultHref="/index" text=""></ion-back-button>
     </ion-buttons>
-    <ion-searchbar mode="ios" color="light" autocomplete="on" (ionInput)="getItems($event)" debounce="1000" style="height: 40px;" placeholder="输入名称进行搜索"></ion-searchbar>
+    <ion-searchbar mode="ios" color="light" autocomplete="on" (ionInput)="getItems($event)" debounce="1000" placeholder="输入名称进行搜索"></ion-searchbar>
   </ion-toolbar>
   <!--<ion-slides style="width: 100%; height: 125px;" mode="ios"-->
               <!--[options]="lunbo" #slide (ionSlideTouchEnd)="slideDidChange()">-->

src/app/envCtrl/env-home/env-home.page.scss

@@ -134,3 +134,18 @@
   margin-left: 2%;
   padding-bottom: 0px;
 }
+
+//.searchbar-input-container {
+//  height: 25px;
+//  contain: strict;
+//}
+
+ion-searchbar {
+  //transform: scale(1.2); // Can also scale individually with scaleX() and scaleY()
+  //margin: 0 auto;
+  height: 90%; // To avoid pixelate effect that occurs with scaling
+}
+
+searchbar-input {
+  font-size: 12px;
+}

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

@@ -112,7 +112,7 @@ export class EnvLightPage implements OnInit {
         }
         this.loading.presentLoading(Constants.LOADING_SHORTER, false);
         this.api.cowshedApp.getZhaoMingData([{'fieldRegionNo': this.fieldRegionNo}, (data) => {
-            if (data) {
+            if (data && data.fieldRegionNo) {
                 this.fieldRegionNo = data.fieldRegionNo;
                 this.fieldDeviceType = data.fieldDeviceType;
                 this.controlModel = data.controlModel;

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

@@ -132,7 +132,7 @@ export class EnvShowerPage implements OnInit {
         }
         this.loading.presentLoading(Constants.LOADING_SHORTER, false);
         this.api.cowshedApp.getPenLinData([{fieldRegionNo: this.fieldRegionNo}, (data) => {
-            if (data) {
+            if (data && data.fieldRegionNo) {
                 this.fieldRegionNo = data.fieldRegionNo;
                 this.fieldDeviceType = data.fieldDeviceType;
                 this.controlModel = data.controlModel;

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

@@ -51,7 +51,7 @@ export class EnvWaterchannelPage implements OnInit {
         }
         this.loading.presentLoading(Constants.LOADING_SHORTER, false);
         this.api.cowshedApp.getShuiCaoData([{fieldRegionNo: this.fieldRegionNo}, (data) => {
-            if (data) {
+            if (data && data.fieldRegionNo) {
                 this.devices = data.param;
             }
             this.load.offLoad();

src/app/envCtrl/tabs/tabs.module.ts

@@ -20,6 +20,7 @@ import {EnvLightPage} from '../env-light/env-light.page';
 import {EnvWaterchannelPage} from '../env-waterchannel/env-waterchannel.page';
 import {NgxEchartsModule} from 'ngx-echarts';
 import {NgxDatatableModule} from '@swimlane/ngx-datatable';
+import {EnvAnalPageModule} from '../env-anal/env-anal.module';
 
 const routes: Routes = [
   {
@@ -32,15 +33,18 @@ const routes: Routes = [
           },
           {
               path: 'tab-anal',
-              component: EnvAnalPage,
+              loadChildren: '../../envCtrl/env-anal/env-anal.module#EnvAnalPageModule',
+              // component: EnvAnalPage,
           },
           {
               path: 'tab-alarm',
-              component: EnvAlarmPage,
+              loadChildren: '../../envCtrl/env-alarm/env-alarm.module#EnvAlarmPageModule',
+              // component: EnvAlarmPage,
           },
           {
               path: 'tab-cfg',
-              component: EnvCfgPage,
+              loadChildren: '../../envCtrl/env-cfg/env-cfg.module#EnvCfgPageModule',
+              // component: EnvCfgPage,
           },
           {
               path: '',
@@ -62,9 +66,9 @@ const routes: Routes = [
   ],
   declarations: [TabsPage,
       EnvHomePage,
-      EnvAnalPage,
-      EnvAlarmPage,
-      EnvCfgPage,
+      // EnvAnalPage,
+      // EnvAlarmPage,
+      // EnvCfgPage,
       // EnvDetailPage,
       // EnvFanPage,
       // EnvShowerPage,

src/app/index/index.page.ts

 import { Component, OnInit } from '@angular/core';
 import {Transfer} from '../service/transfer';
 import {NavController} from '@ionic/angular';
+import {Api} from '../service/api';
 
 @Component({
   selector: 'v-index',
@@ -9,7 +10,7 @@ import {NavController} from '@ionic/angular';
 })
 export class IndexPage implements OnInit {
 
-  constructor(private tf: Transfer, public nav: NavController) { }
+  constructor(private tf: Transfer, public nav: NavController, private api: Api) { }
 
   ngOnInit() { }
 
@@ -19,7 +20,12 @@ export class IndexPage implements OnInit {
     //   this.nav.navigateRoot('/' + e);
     // }, 300);
 
+    this.api.user.getSelfInfo(['', (data) => {
+      if (data.userName) {
         this.nav.navigateRoot('/' + e);
+      } else {
+        this.api.presentMsgToast('用户未登录,请先登录');
+      }
+    }]);
   }
-
 }

src/app/service/api.ts

@@ -122,7 +122,7 @@ export class Api {
                     next(data);
                 } else {
                     if (!this.tokenLoseflag) {
-                        this.presentMsgToast('登录失效,请重新登陆');
+                        this.presentMsgToast('登录失效,请重新登录');
                         this.http.toLoginPage(2000);
                         this.tokenLoseflag = 1;
                         setTimeout(() => {

src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   url: 'http://pasture.witium.com.cn/api/v2',
-  // url: 'http://172.16.1.52:8096', // zz
+  // url: 'http://172.16.1.52:8096', // zz 52
 
   mqttUrl: '211.161.200.169:48083',
   // mqttUrl: '172.16.1.24',