增加了timestep的风格

angular.json

@@ -33,7 +33,9 @@
             "styles": [
               "node_modules/ng-zorro-antd-mobile/src/ng-zorro-antd-mobile.min.css",
               "node_modules/loaders.css/loaders.css",
+              "node_modules/echarts/dist/echarts.js",
               "src/assets/icon/iconfont.css",
+              "src/theme/css/jazz-timeline.css",
               {
                 "input": "src/theme/variables.scss"
               },
@@ -43,7 +45,8 @@
             ],
             "scripts": [
               {
-                "input": "node_modules/mqtt/dist/mqtt.min.js"
+                "input": "node_modules/mqtt/dist/mqtt.min.js",
+
               }
             ],
             "es5BrowserSupport": true

config.xml

@@ -2,7 +2,7 @@
 <widget id="com.witium.muchang" version="2.9.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>牧场云</name>
     <description>牧场物业管理系统</description>
-    <author email="van_chen@foxmail.com" href="http://muchang.witium.com/">Van.chen</author>
+    <author email="frank.feng@witium.com" href="http://muchang.witium.com/">Van.chen&frank.feng</author>
     <content src="index.html" />
     <access origin="*" />
     <allow-intent href="http://*/*" />

package-lock.json

@@ -1076,6 +1076,11 @@
         }
       }
     },
+    "@swimlane/ngx-datatable": {
+      "version": "15.0.2",
+      "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-15.0.2.tgz",
+      "integrity": "sha512-IlUyCs/hLv12hzz2pGugbrdRpBbwE6JUM4Bm4CCqLptmZj+t8pw8Ywthde8yUDdpgGgTJeJ9G5o92QadyGbP3g=="
+    },
     "@types/cordova": {
       "version": "0.0.34",
       "resolved": "http://registry.npm.taobao.org/@types/cordova/download/@types/cordova-0.0.34.tgz",
@@ -3860,6 +3865,14 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "echarts": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/echarts/-/echarts-4.2.1.tgz",
+      "integrity": "sha512-pw4xScRPsLegD/cqEcoXRKeA2SD4+s+Kyo0Na166NamOWhzNl2yI5RZ2rE97tBlAopNmhyMeBVpAeD5qb+ee1A==",
+      "requires": {
+        "zrender": "4.0.7"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz",
@@ -7636,6 +7649,14 @@
         }
       }
     },
+    "ngx-echarts": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/ngx-echarts/-/ngx-echarts-4.2.1.tgz",
+      "integrity": "sha512-wdlIAkvnR9A1Wv4z8RMD2MX1Zinp9SmiCCu70nVYColV1c0LnFt0Ur85Uu/3yZlE/Yl1BblB5IAnHA3/iOG8cw==",
+      "requires": {
+        "tslib": "^1.9.0"
+      }
+    },
     "nice-try": {
       "version": "1.0.5",
       "resolved": "http://registry.npm.taobao.org/nice-try/download/nice-try-1.0.5.tgz",
@@ -11765,6 +11786,11 @@
       "version": "0.8.29",
       "resolved": "http://registry.npm.taobao.org/zone.js/download/zone.js-0.8.29.tgz",
       "integrity": "sha1-jc6Sqg3VU7ULxb+7kK+Zhq2EWhI="
+    },
+    "zrender": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/zrender/-/zrender-4.0.7.tgz",
+      "integrity": "sha512-TNloHe0ums6zxbHfnaCryM61J4IWDajZwNq6dHk9vfWhhysO/OeFvvR0drBs/nbXha2YxSzfQj2FiCd6RVBe+Q=="
     }
   }
 }

package.json

@@ -28,6 +28,7 @@
     "@ionic-native/splash-screen": "^5.0.0",
     "@ionic-native/status-bar": "^5.0.0",
     "@ionic/angular": "^4.6.2",
+    "@swimlane/ngx-datatable": "^15.0.2",
     "cordova-android": "7.1.4",
     "cordova-ios": "~4.5.5",
     "cordova-plugin-appminimize": "1.0.1",
@@ -41,10 +42,12 @@
     "cordova-plugin-statusbar": "^2.4.2",
     "cordova-plugin-whitelist": "^1.3.3",
     "core-js": "^2.5.4",
+    "echarts": "^4.2.1",
     "es6-promise-plugin": "^4.2.2",
     "loaders.css": "^0.1.2",
     "mqtt": "^2.18.8",
     "ng-zorro-antd-mobile": "^0.11.9",
+    "ngx-echarts": "^4.2.1",
     "rxjs": "~6.3.3",
     "zone.js": "~0.8.29"
   },
@@ -95,4 +98,4 @@
       "ios"
     ]
   }
-}
+}
\ No newline at end of file

src/app/app-routing.module.ts

@@ -16,6 +16,8 @@ import {EnvLightPageModule} from './envCtrl/env-light/env-light.module';
 import {EnvLightPage} from './envCtrl/env-light/env-light.page';
 import {EnvWaterchannelPage} from './envCtrl/env-waterchannel/env-waterchannel.page';
 import {EnvAnalPage} from './envCtrl/env-anal/env-anal.page';
+import {EnvAlarmPage} from './envCtrl/env-alarm/env-alarm.page';
+import {EnvAlarmDetailPage} from './envCtrl/env-alarm-detail/env-alarm-detail.page';
 
 const routes: Routes = [
     {
@@ -33,18 +35,20 @@ const routes: Routes = [
         ]
     },
     {path: 'login', component: LoginPage},
-    // {path: 'env-detail',
-    //     component: EnvDetailPage,
-    //     children: [
-    //         {path:'fan', component: EnvFanPage},
-    //         {path:'shower', component: EnvShowerPage},
-    //         {path:'light', component: EnvLightPage},
-    //         {path:'waterchannel', component: EnvWaterchannelPage},
-    //         {path: '', redirectTo: 'fan',pathMatch:'prefix'},
-    //     ]
-    // },
-    // {path: 'tabs', loadChildren: './envCtrl/tabs/tabs.module#TabsPageModule'},
-    // {path: 'd', component: EnvAnalPage},
+    {path: 'env-detail',
+        component: EnvDetailPage,
+        children: [
+            {path:'fan', component: EnvFanPage},
+            {path:'shower', component: EnvShowerPage},
+            {path:'light', component: EnvLightPage},
+            {path:'waterchannel', component: EnvWaterchannelPage},
+            {path: '', redirectTo: 'fan',pathMatch:'prefix'},
+        ]
+    },
+    {path: 'tabs', loadChildren: './envCtrl/tabs/tabs.module#TabsPageModule'},
+    //{path: 'd', component: EnvAlarmDetailPage},
+  { path: 'env-alarm-detail', loadChildren: './envCtrl/env-alarm-detail/env-alarm-detail.module#EnvAlarmDetailPageModule' },
+
 ];
 
 @NgModule({

src/app/app.module.ts

@@ -52,6 +52,9 @@ import {EnvAlarmPage} from './envCtrl/env-alarm/env-alarm.page';
 import {EnvFanPage} from './envCtrl/env-fan/env-fan.page';
 import {TabsPage} from './envCtrl/tabs/tabs.page';
 import {EnvLightPage} from './envCtrl/env-light/env-light.page';
+import {NgxEchartsModule} from 'ngx-echarts';
+import {NgxDatatableModule} from '@swimlane/ngx-datatable';
+import {EnvAlarmDetailPage} from './envCtrl/env-alarm-detail/env-alarm-detail.page';
 
 @NgModule({
     declarations: [
@@ -75,7 +78,9 @@ import {EnvLightPage} from './envCtrl/env-light/env-light.page';
         EnvShowerPage,
         EnvLightPage,
         EnvWaterchannelPage,
-        EnvAnalPage,
+        // EnvAnalPage,
+        // EnvAlarmPage,
+        // EnvAlarmDetailPage,
     ],
     entryComponents: [],
     imports: [
@@ -88,6 +93,8 @@ import {EnvLightPage} from './envCtrl/env-light/env-light.page';
         NgZorroAntdMobileModule,
         TabsModule,
         WtModule,
+        NgxEchartsModule,
+        NgxDatatableModule,
     ],
     providers: [
         StatusBar,

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

-<ion-header>
+<ion-header style="background-color: #F3F4F4">
   <ion-toolbar>
-    <ion-title>envAlarm</ion-title>
+    <ion-title>牛舍告警一览</ion-title>
   </ion-toolbar>
 </ion-header>
 
-<ion-content>
-
+<ion-content color="light">
+  <div class="alarmItem" *ngFor="let a of alarm">
+    <div class="title">
+      <span>{{a.farm}}</span>
+      <span style="float:right;">近一年</span>
+    </div>
+    <div>
+      <div class="alarmContent"><i class="vo v-guzhang2"></i> &nbsp;&nbsp;未解决故障数/总故障数  {{a.devErr}}/{{a.devErrTotal}}</div>
+      <div class="alarmContent"><i class="vo v-guzhang"></i> &nbsp;&nbsp;未解决预警数/总故障数   {{a.alarm}}/{{a.alarmTotal}}</div>
+    </div>
+  </div>
 </ion-content>

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

+.alarmItem{
+  // background: url("../../../assets/bg/alarm-banner.png");
+  background-color: white;
+  .title{
+    padding: 10px;
+  }
+  .alarmContent{
+    padding: 10px;
+  }
+  margin-bottom: 10px;
+}
+
+.v-guzhang2{
+  color: red;
+}
+
+.v-guzhang{
+  color: #ffd31a;
+}
\ No newline at end of file

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

@@ -7,6 +7,26 @@ import { Component, OnInit } from '@angular/core';
 })
 export class EnvAlarmPage implements OnInit {
 
+  alarm = [{
+      farm: '1号牛舍',
+      devErr: 36,
+      devErrTotal:136,
+      alarm:21,
+      alarmTotal:121
+  },{
+      farm: '2号牛舍',
+      devErr: 1,
+      devErrTotal:11,
+      alarm:0,
+      alarmTotal:10
+  },{
+      farm: '3号牛舍',
+      devErr: 2,
+      devErrTotal:12,
+      alarm:3,
+      alarmTotal:13
+  },];
+
   constructor() { }
 
   ngOnInit() {

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

@@ -25,11 +25,27 @@
             border-left: 5px solid #28c9bd;
             line-height: 25px;
             margin-bottom: 5px;">近8个小时环境参数曲线</h1>
-
+  <div echarts [options]="chartOption" class="demo-chart"></div>
   <h1 style="
             font-size: 16px;
             padding-left: 5px;
             border-left: 5px solid #28c9bd;
             line-height: 25px;
             margin-bottom: 5px;">近8个小时环境参数表</h1>
+  <div>
+    <ngx-datatable
+            class='material'
+            [rows]="rows"
+            [columnMode]="'force'"
+            >
+      <ngx-datatable-column name="时间" prop="time" width="100">
+      </ngx-datatable-column>
+      <ngx-datatable-column name="热应激" prop="thi" width="200">
+      </ngx-datatable-column>
+      <ngx-datatable-column name="温度" prop="temp" width="80">
+      </ngx-datatable-column>
+      <ngx-datatable-column name="湿度" prop="humi" width="80">
+      </ngx-datatable-column>
+    </ngx-datatable>
+  </div>
 </ion-content>

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

+@import '~@swimlane/ngx-datatable/release/index.css';
+@import '~@swimlane/ngx-datatable/release/themes/material.css';
+@import '~@swimlane/ngx-datatable/release/assets/icons.css';
+
 .perfect{
   width: 30px;
   height: 30px;
@@ -29,4 +33,9 @@
   -webkit-border-radius: 17%;
   font-size: 25px;
   color:white;
+}
+
+.demo-chart{
+  width: 100%;
+  height: 230px;
 }
\ No newline at end of file

src/app/envCtrl/env-anal/env-anal.page.spec.ts

@@ -2,6 +2,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { EnvAnalPage } from './env-anal.page';
+import {expect} from '@angular/core/testing/src/testing_internal';
 
 describe('EnvAnalPage', () => {
   let component: EnvAnalPage;
@@ -15,13 +16,13 @@ describe('EnvAnalPage', () => {
     .compileComponents();
   }));
 
-  beforeEach(() => {
+  beforeEach((void) => {
     fixture = TestBed.createComponent(EnvAnalPage);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
 
-  it('should create', () => {
+  it('should create', (void) => {
     expect(component).toBeTruthy();
   });
 });

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

@@ -18,10 +18,68 @@ export class EnvAnalPage implements OnInit {
 
   analResult = '优';
 
+  chartOption = {
+      backgroundColor: '#F0F8FF',
+      visualMap: [{
+          show: false,
+          type: 'continuous',
+          seriesIndex: 0,
+          min: 0,
+          max: 400
+      }, {
+          show: false,
+          type: 'continuous',
+          seriesIndex: 1,
+          dimension: 0,
+          min: 0,
+          max: 400
+      }],
+
+      xAxis: {
+          type: 'category',
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+      },
+      yAxis: [{
+          name:'温度(℃)',
+          type: 'value',
+          splitLine: {show: false}
+      },
+      {
+          name:'湿度(%)',
+          type: 'value',
+          max: 100,
+          splitLine: {show: false}
+      }],
+      series: [{
+          data: [820, 932, 901, 934, 1290, 1330, 1320],
+          type: 'line'
+      },{
+          data: [15, 13, 12, 11, 12, 11, 87],
+          yAxisIndex:1,
+          type: 'line'
+      },{
+          data: [76, 45, 43, 23, 34, 54, 23],
+          yAxisIndex:1,
+          type: 'line'
+    }]
+  };
+
+    rows = [
+        { time: '17:00', thi: '轻', temp: '23.8', humi: '56' },
+        { time: '17:30', thi: '中', temp: '27.2', humi: '43' },
+        { time: '18:00', thi: '轻', temp: '23.2', humi: '61' },
+        { time: '18:30', thi: '轻', temp: '23.1', humi: '47' },
+        { time: '19:00', thi: '轻', temp: '20.2', humi: '43' },
+        { time: '19:30', thi: '轻', temp: '21.6', humi: '34' },
+        { time: '20:00', thi: '轻', temp: '22.5', humi: '43' },
+
+    ];
 
   constructor() { }
 
   ngOnInit() {
+    for(let i = 0;i < 8; i ++)
+      this.chartOption.xAxis.data = ['8','7','6','5','4','3','2','1'];
   }
 
   selFarmEvent(){

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

@@ -18,6 +18,8 @@ import {EnvFanPage} from '../env-fan/env-fan.page';
 import {EnvShowerPage} from '../env-shower/env-shower.page';
 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';
 
 const routes: Routes = [
   {
@@ -110,6 +112,8 @@ const routes: Routes = [
     CommonModule,
     FormsModule,
     IonicModule,
+    NgxEchartsModule,
+    NgxDatatableModule,
     WtModule,
     RouterModule.forChild(routes),
   ],
@@ -118,6 +122,11 @@ const routes: Routes = [
       EnvAnalPage,
       EnvAlarmPage,
       EnvCfgPage,
+      //EnvDetailPage,
+      // EnvFanPage,
+      // EnvShowerPage,
+      // EnvLightPage,
+      // EnvWaterchannelPage,
       ]
 })
 export class TabsPageModule {}

src/app/index/index.page.html

@@ -12,8 +12,8 @@
     <div class="mainContent">
         <div class="contentPart">
             <div class="leftOnPart" (click)="goTo('home')"></div>
-            <div class="rightOnPart " (click)="goTo('row')"></div>
-            <!--<div class="rightOnPart " (click)="goTo('tabs/tab-home')"></div>-->
+            <!--<div class="rightOnPart " (click)="goTo('row')"></div>-->
+            <div class="rightOnPart " (click)="goTo('tabs/tab-home')"></div>
             <div class="leftUnderPart" (click)="goTo('alarm')"></div>
             <div class="rightUnderPart" (click)="goTo('mine')"></div>
         </div>

src/assets/icon/iconfont.svg

@@ -110,6 +110,9 @@ Created by iconfont
     <glyph glyph-name="wendu" unicode="&#58882;" d="M512.7-63.6c-59.7-0.1-118.8 11.9-173.8 35.3-53.3 22.6-101.2 55-142.4 96.2s-73.6 89.1-96.2 142.4C77 265.2 65 324.3 65 384c0 74.9 21.2 154.4 59.7 223.8 4.3 6.9 13.1 11.9 21 11.9 1.6 0 4.6-0.2 6.7-1.8 8.5-6.4 13.5-19.5 7-30.4l-0.2-0.4-0.2-0.4c-35-65.4-52.7-133.6-52.7-202.7 0-224.1 182.3-406.4 406.4-406.4 224.1 0 406.4 182.3 406.4 406.4 0 224.1-182.3 406.4-406.4 406.4-69 0-137.2-17.7-202.7-52.6l-0.4-0.2-0.4-0.2c-4.3-2.6-8.9-4-13.3-4-6.4 0-11.7 2.8-15.3 8.2-3.4 9.8-3.2 23.3 8.3 30.4 69.4 38.5 148.8 59.7 223.8 59.7 59.7 0.1 118.8-11.9 173.8-35.3 53.3-22.6 101.2-55 142.4-96.2C870 659 902.4 611.1 925 557.8c23.4-55.2 35.3-113.6 35.3-173.8 0-60.1-11.9-118.6-35.3-173.8-22.6-53.3-55-101.2-96.2-142.4s-89.1-73.6-142.4-96.2a442.8 442.8 0 0 0-173.7-35.2z m0 0M533.1 312.7l-6 2.7V543.2c0 9.5-12 17.6-26.2 17.6s-26.2-8-26.2-17.6v-227.8l-6.1-2.7c-28.8-12.9-47.5-42-47.5-73.9 0-44.5 35.8-80.8 79.8-80.8s79.8 36.3 79.8 80.8c-0.1 31.9-18.7 61-47.6 73.9z m81.7 48.5l-3.2 3.1v245c0 24-12.4 47.2-33.8 63.7-20.7 15.9-48.1 24.6-77 24.6s-56.3-8.7-76.9-24.6c-21.5-16.5-33.8-39.7-33.8-63.7v-245.1l-3.2-3.1c-33.1-31.6-52.1-76.2-52.1-122.4 0-44.9 17.3-87.2 48.7-119 31.4-31.8 73.1-49.3 117.5-49.3 44.4 0 86.1 17.5 117.5 49.3 31.4 31.8 48.7 74 48.7 119-0.3 46.2-19.2 90.9-52.4 122.5zM500.8 98c-76.7 0-139 63.2-139 140.8 0 42.1 18.4 81.6 50.4 108.5l4.9 4.1V609.3c0 16.5 9.6 32.6 26.3 44.1 15.7 10.8 36.2 16.8 57.4 16.8 21.3 0 41.7-6 57.4-16.8 16.7-11.5 26.3-27.6 26.3-44.1v-257.9l4.9-4.1c32-26.9 50.4-66.4 50.4-108.5 0.1-77.6-62.3-140.8-139-140.8z m142.8 493.6H680c5.9 0 10.6 3.9 10.6 8.7 0 4.8-4.8 8.7-10.6 8.7h-36.4c-5.9 0-10.6-3.9-10.6-8.7 0-4.9 4.8-8.7 10.6-8.7z m36.5-20.6h-36.4c-5.9 0-10.6-3.9-10.6-8.7 0-4.8 4.8-8.7 10.6-8.7h36.4c5.9 0 10.6 3.9 10.6 8.7 0 4.8-4.8 8.7-10.6 8.7z m0-38h-36.4c-5.9 0-10.6-3.9-10.6-8.7 0-4.8 4.8-8.7 10.6-8.7h36.4c5.9 0 10.6 3.9 10.6 8.7 0 4.8-4.8 8.7-10.6 8.7z m0-38h-36.4c-5.9 0-10.6-3.9-10.6-8.7 0-4.8 4.8-8.7 10.6-8.7h36.4c5.9 0 10.6 3.9 10.6 8.7 0 4.9-4.8 8.7-10.6 8.7z m0-37.9h-36.4c-5.9 0-10.6-3.9-10.6-8.7s4.8-8.7 10.6-8.7h36.4c5.9 0 10.6 3.9 10.6 8.7 0 4.8-4.8 8.7-10.6 8.7z m0-38h-36.4c-5.9 0-10.6-3.9-10.6-8.7 0-4.8 4.8-8.7 10.6-8.7h36.4c5.9 0 10.6 3.9 10.6 8.7 0 4.8-4.8 8.7-10.6 8.7z m0 0"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="guzhang2" unicode="&#58934;" d="M972.8 76.8a128 128 0 0 0-101.3248-125.1328L870.4-51.2H204.8l-2.3296 2.3296a126.9504 126.9504 0 0 0-148.9152 148.9152L51.2 102.4l6.7072 13.3888a126.9504 126.9504 0 0 0 17.92 36.0192L384 768h7.424a139.0336 139.0336 0 0 0 215.552 0H614.4l332.8-614.4-0.1792-0.4864A126.8736 126.8736 0 0 0 972.8 76.8zM512 588.8a51.2 51.2 0 1 1 51.2-51.2 51.2 51.2 0 0 1-51.2 51.2z m51.2-204.8a51.2 51.2 0 0 1-102.4 0v-256a51.2 51.2 0 1 1 102.4 0V384z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="zhaoming2" unicode="&#58987;" d="M519.8 389.2m-220.6 0a220.6 220.6 0 1 1 441.2 0 220.6 220.6 0 1 1-441.2 0ZM426.2 200.6h188.8v-65.8h-188.8zM569.8 32.6h-93.6c-6.6-0.2-13 2.4-17.8 7-4.8 4.6-7.4 11-7.6 17.6 0 14 11.4 25.4 25.4 25.4h93.6c14 0 25.4-11.4 25.4-25.4 0-6.6-2.8-13-7.6-17.6-4.8-4.8-11.2-7.2-17.8-7m208 581l-17-17c-4.4-4.6-10.6-7-17-7s-12.4 2.6-17 7-7 10.6-7 17 2.6 12.6 7 17l17 17c9.4 8.8 24.2 8.4 33.4-0.6 9.2-9.2 9.4-24 0.6-33.4m81.4-244.8h-24c-8.6 0-16.6 4.6-20.8 12-4.2 7.4-4.2 16.6 0 24 4.2 7.4 12.2 12 20.8 12h24c8.6 0 16.6-4.6 20.8-12 4.2-7.4 4.2-16.6 0-24-4.2-7.4-12.2-12-20.8-12m-648.6 0.2h-24c-13.2 0-24 10.8-24 24s10.8 24 24 24h24c13.2 0 24-10.8 24-24s-10.6-24-24-24m108.6 227.8c-9.4-9.4-24.6-9.4-34 0l-17 17c-6 6-8.4 15-6.2 23.2s8.8 14.8 17 17c8.2 2.2 17.2-0.2 23.2-6.2l17-17c9.4-9.4 9.4-24.6 0-34m203.8 84.4c-13.2 0-24 10.8-24 24v24c0.6 12.8 11.2 23 24 23s23.4-10 24-23v-24c0-13.4-10.6-24-24-24m0-96.2c-104.2 0-192.2-92.2-192.2-201.4 0-75.4 43.6-144.6 111.2-176.4l13.8-6.6 0.4-50.2 2 2.2h129.6c0.4 0 0.8 0 1.2 0.2h0.4v47.6l13.8 6.4c68.4 32.2 112 101.2 112 176.8 0.2 109.2-88 201.4-192.2 201.4m114.6-414.6v-20c-0.2-18.8-12-35.4-29.8-42-6.4-2.6-13.2-4-20-4h-132.2c-26.4 0-47.8 20.6-47.8 46v20.2c-77.2 43-125 124.4-125.2 212.8 0 135.2 110 249.4 240.4 249.4s240.4-114.2 240.4-249.4c0-88.4-48.2-170-125.8-213"  horiz-adv-x="1024" />
 
     
@@ -119,6 +122,9 @@ Created by iconfont
     <glyph glyph-name="control" unicode="&#58937;" d="M230.60768 258.112a15.552 15.552 0 0 0-15.488 15.36l-9.6 494.272a102.912 102.912 0 0 0 205.76 0.448v-337.664a15.552 15.552 0 1 0-31.04 0V768.192a71.808 71.808 0 1 1-143.616 0l9.728-494.08a15.616 15.616 0 0 0-15.36-16h-0.384zM570.44768 396.992a15.616 15.616 0 0 0-15.488 15.744V513.536c0 39.616-32.32 71.872-71.872 71.872s-71.808-32.256-71.808-71.872V412.8a15.552 15.552 0 1 0-31.04 0V513.536c0 56.768 46.08 103.04 102.848 103.04s103.04-46.272 103.04-103.04V412.8a15.616 15.616 0 0 0-15.68-15.744zM745.10368 396.992a15.68 15.68 0 0 0-15.616 15.744V487.68a71.68 71.68 0 0 1-143.36 0V412.8a15.616 15.616 0 0 0-31.168 0V487.68c0 56.64 46.08 102.912 102.848 102.912a103.04 103.04 0 0 0 102.848-102.912V412.8a15.552 15.552 0 0 0-15.552-15.744zM919.82368 197.056a15.488 15.488 0 0 0-15.488 15.552V464.256a71.872 71.872 0 0 1-143.68 0v-51.52c0-8.704-7.04-15.744-15.552-15.744a15.68 15.68 0 0 0-15.616 15.744v51.52a102.912 102.912 0 1 0 205.888 0v-251.648a15.552 15.552 0 0 0-15.552-15.552zM795.21568-77.888H289.67968c-8.512 0-16.128 7.04-16.128 15.488 0 8.704 6.4 15.68 15.104 15.68h506.56c60.096 0 109.12 48.832 109.12 109.12v168.128c0 8.576 6.848 15.552 15.488 15.552 8.576 0 15.552-7.04 15.552-15.552v-168.128c0-77.44-62.848-140.288-140.16-140.288zM288.65568-77.888a15.936 15.936 0 0 0-11.136 4.48l-172.16 172.032a140.032 140.032 0 0 0-3.456 195.2l92.096 98.944a15.744 15.744 0 0 0 22.016 0.704 15.744 15.744 0 0 0 0.768-22.016L124.81568 272.512a108.992 108.992 0 0 1 2.752-151.872l172.096-171.968a15.616 15.616 0 0 0-10.944-26.56z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="shaixuan" unicode="&#58955;" d="M990.067 248.843H706.783c-17.698 0-32.045-14.327-32.045-32s14.347-32 32.045-32h283.285c17.698 0 32.045 14.327 32.045 32s-14.348 32-32.046 32zM675.203 397.159c0-17.673 14.347-32 32.045-32h282.819c17.698 0 32.045 14.327 32.045 32s-14.347 32-32.045 32H707.248c-17.697 0-32.045-14.327-32.045-32zM881.024 801.961c-10.831 23.432-34.674 38.573-60.742 38.573H66.711c-25.565 0-48.673-14.436-60.308-37.672-0.217-0.434-0.424-0.872-0.621-1.315C-4.9 777.544-0.541 749.605 16.9 730.354l260.234-286.891v-297.174c0-19.333 9.235-38.47 24.704-51.191 0.145-0.119 0.29-0.237 0.437-0.354l67.947-53.909c13.855-10.993 34.015-8.688 45.024 5.148s8.701 33.967-5.156 44.961l-67.624 53.653c-0.793 0.693-1.173 1.474-1.243 1.777V455.802a31.971 31.971 0 0 1-8.295 21.483L64.412 773.305c-0.188 0.208-0.435 0.827-0.264 1.639 0.698 0.985 1.649 1.589 2.563 1.589h753.571c1.181 0 2.282-0.812 2.55-1.394 0.133-0.288 0.015-1.03-0.687-1.8L553.153 477.305a31.974 31.974 0 0 1-8.313-21.503v-496.335c0-17.673 14.347-32 32.045-32s32.045 14.327 32.045 32V443.448l260.659 286.863c17.951 19.718 22.439 47.842 11.435 71.65zM992.852 68.979a65.245 65.245 0 0 1-3.16 0.013H706.783c-17.698 0-32.045-14.327-32.045-32s14.347-32 32.045-32h283.285c0.299 0 0.598 0.004 0.897 0.013h0.094c0.305-0.009 0.61-0.013 0.913-0.013 17.282 0 31.53 13.743 32.016 31.104 0.495 17.666-13.446 32.389-31.136 32.883z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="xuanze" unicode="&#59109;" d="M844.8 609.28h-307.2l-25.6 35.84c-25.6 46.08-35.84 71.68-76.8 71.68h-256c-40.96 0-76.8-30.72-76.8-71.68v-527.36c0-40.96 35.84-71.68 76.8-71.68h670.72c40.96 0 76.8 30.72 76.8 71.68V542.72c-5.12 35.84-40.96 66.56-81.92 66.56zM768 409.6H256c-30.72 0-51.2 20.48-51.2 51.2s20.48 51.2 51.2 51.2h512c30.72 0 51.2-20.48 51.2-51.2s-20.48-51.2-51.2-51.2z"  horiz-adv-x="1024" />
 
     

src/environments/environment.ts

@@ -4,7 +4,7 @@
 
 export const environment = {
   // production: false,
-  // url: 'http://pasture.witium.com.cn/api', // 对外访问测试网地址
+  url: 'http://pasture.witium.com.cn/api', // 对外访问测试网地址
   // url: 'http://cloud-test.witium.com:8096', // 测试
   // url: 'http://172.16.1.53:8097', // cy
   // url: 'http://172.16.1.52:8096', // zz
@@ -12,10 +12,10 @@ export const environment = {
   // mqttUrl: '172.16.1.24',
   // mqttUrl: '120.27.235.39'
   production: true,
-  url: 'http://pasture.witium.com/api', // 对外访问测试网地址
+  // url: 'http://pasture.witium.com/api', // 对外访问测试网地址
   // url: 'http://172.16.1.13:8096', // 测试
-  mqttUrl: '120.27.235.39'
-  // mqttUrl: '120.27.235.31'
+  // mqttUrl: '120.27.235.39'
+  mqttUrl: '120.27.235.31'
 };
 
 /*