message update

src/main/webapp/app/alarm/alarm-list/alarm-list.component.html

@@ -39,7 +39,7 @@
     </nz-select>
   </div>
   <div nz-col nzSpan="7">
-    <nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType()" [nzButtonStyle]="'solid'">
+    <nz-radio-group style="width: 100%;" [(ngModel)]="timeType" (ngModelChange)="changeType($event)">
       <label nz-radio-button nzValue="1">今天</label>
       <label nz-radio-button nzValue="2">昨天</label>
       <label nz-radio-button nzValue="3">三天</label>
@@ -68,4 +68,4 @@
   </div>
 </div>
 
-<smart-warn-list #warnList></smart-warn-list>
\ No newline at end of file
+<smart-warn-list #warnList></smart-warn-list>

src/main/webapp/app/alarm/alarm-list/alarm-list.component.ts

@@ -56,7 +56,7 @@ export class AlarmListComponent implements OnInit {
 
     constructor(public alarmSer: AlarmService, public overAllSer: OverAllService, public message: NzMessageService,
                 public datePipe: DatePipe,private commonSer:CommonService,private workSer:WorkService) {
-        this.changeType();
+        this.changeType('1');
     }
 
     ngOnInit() {
@@ -90,39 +90,11 @@ export class AlarmListComponent implements OnInit {
     }
 
     //时间改变
-    changeType() {
-        const nowDate = new Date().getTime();
-        let day1, day2;
-        switch (this.timeType) {
-            case'1': {
-                this.obj.startTime = this.datePipe.transform(nowDate, 'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.endTime = this.datePipe.transform(nowDate, 'yyyy-MM-dd') + ' 23:59:59';
-                break;
-            }
-            case'2': {
-                day1 = nowDate - 1 * 24 * 60 * 60 * 1000;
-                this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.endTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 23:59:59';
-                break;
-            }
-            case'3': {
-                day1 = nowDate - 3 * 24 * 60 * 60 * 1000;
-                day2 = nowDate;
-                this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
-                break;
-            }
-            case'4': {
-                day1 = nowDate - 7 * 24 * 60 * 60 * 1000;
-                day2 = nowDate;
-                this.obj.startTime = this.datePipe.transform(day1, 'yyyy-MM-dd') + ' 00:00:00';
-                this.obj.endTime = this.datePipe.transform(day2, 'yyyy-MM-dd') + ' 23:59:59';
-                break;
-            }
-            case'5': {
-                break;
-            }
-        }
+    changeType(e) {
+        if(e == '5') return false;
+        const obj = this.commonSer.getTimeByType(e);
+        this.obj.startTime = obj.startTime;
+        this.obj.endTime = obj.endTime;
     }
 
     //查询

src/main/webapp/app/blocks/interceptor/auth-expired.interceptor.ts

@@ -6,11 +6,13 @@ import {
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/do';
 import { LoginService } from '../../shared/login/login.service';
+import {NzMessageService} from 'ng-zorro-antd';
 
 export class AuthExpiredInterceptor implements HttpInterceptor {
 
     constructor(
-        private injector: Injector
+        private injector: Injector,
+        private message: NzMessageService,
     ) {}
 
     intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {

src/main/webapp/app/home/home.component.html

@@ -132,6 +132,11 @@
                         </nz-col>
                     </nz-row>
                 </ng-container>
+                <ng-container *ngIf="countOrderList?.length == 0">
+                    <div class="img-noData" style="min-height: 400px">
+                        <div class="noData" title="暂无数据"></div>
+                    </div>
+                </ng-container>
             </div>
         </nz-col>
         <nz-col class="padding-10" nzSpan="12">
@@ -158,6 +163,11 @@
                         <nz-col nzSpan="8">{{flow.receive}}</nz-col>
                     </nz-row>
                 </ng-container>
+                <ng-container *ngIf="flowListNum?.length == 0">
+                    <div class="img-noData" style="min-height: 400px">
+                        <div class="noData" title="暂无数据"></div>
+                    </div>
+                </ng-container>
             </div>
         </nz-col>
         <nz-col class="padding-10" nzSpan="12">
@@ -202,6 +212,11 @@
                     <nz-col nzSpan="12">系统名称</nz-col>
                     <nz-col nzSpan="12">运行天数</nz-col>
                 </nz-row>
+                <ng-container *ngIf="safeRunDayList?.length == 0">
+                    <div class="img-noData" style="min-height: 400px">
+                        <div class="noData" title="暂无数据"></div>
+                    </div>
+                </ng-container>
                 <ng-container *ngFor="let day of safeRunDayList;">
                     <nz-row class="table-content">
                         <nz-col nzSpan="12">{{day.name}}</nz-col>

src/main/webapp/app/home/home.component.ts

@@ -126,10 +126,12 @@ export class HomeComponent implements OnInit, AfterViewInit {
     getGroup() {
         this.overAllSer.findGroup().subscribe(
             (res) => {
-                if (res.data) {
+                if (res.errCode == 10000 && res.data) {
                     this.groupList = res.data;
                     this.obj.leftGroupId = this.groupList[0].groupid;
                     this.countGroupItem();
+                }else{
+                    this.message.error(res.errMsg);
                 }
             }
         );
@@ -141,8 +143,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
             (res) => {
                 if (res.errCode == 10000) {
                     this.dataSet = res.data;
-                } else {
-                    this.message.create('error', res.errMsg);
                 }
             }
         );
@@ -439,7 +439,6 @@ export class HomeComponent implements OnInit, AfterViewInit {
                     }
                 } else {
                     this.noData = true;
-                    this.message.error(res.errMsg);
                 }
                 this.isTrendLoading = false;
             }

src/main/webapp/app/layouts/sidebar/sidebar.component.html

 <div class="logo">
-    <div class="text-center">
-        <img class="margin-bottom-10" style="height: 35px;" src="../../../content/images/logo_gaocun.png" alt="高淳监狱智能运维管理系统">
-    </div>
+<!--    <div class="text-center">-->
+<!--        <img class="margin-bottom-10" style="height: 35px;" src="../../../content/images/logo_gaocun.png" alt="高淳监狱智能运维管理系统">-->
+<!--    </div>-->
     {{systemName}}
 </div>
 <ul nz-menu [nzMode]="'inline'">

src/main/webapp/app/polyfills.ts

@@ -67,4 +67,3 @@ import 'zone.js/dist/zone';  // Included with Angular CLI.
  */
 // import 'intl/locale-data/jsonp/en';
 
-require('../manifest.webapp');

src/main/webapp/app/shared/login/login.component.ts

@@ -72,7 +72,6 @@ export class JhiLoginModalComponent implements OnInit {
         });
         this.overAll.getSystem().subscribe(
             (res)=>{
-                console.log(res);
                 this.systemName = res.main.name;
             }
         )

src/main/webapp/index.html

@@ -4,11 +4,10 @@
     <base href="./"/>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <title>高淳监狱智能运维管理系统</title>
+    <title>雁南监狱智能运维管理系统</title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#000000">
-    <link rel="manifest" href="manifest.webapp"/>
     <link rel="stylesheet"  href="javascript/jtopo/css/jtopo-editor.css"/>
     <script src="javascript/jquery-3.3.1/jquery-3.3.1.min.js" type="text/javascript"></script>
     <script src="javascript/jtopo/js/util.js" type="text/javascript"></script>

src/main/webapp/manifest.webapp

-{
-  "name": "Bootapp",
-  "short_name": "Bootapp",
-  "icons": [
-      {
-          "src": "./content/images/logo.png",
-          "sizes": "192x192",
-          "type": "image/png"
-      },
-      {
-          "src": "./content/images/logo.png",
-          "sizes": "256x256",
-          "type": "image/png"
-      },
-      {
-          "src": "./content/images/logo.png",
-          "sizes": "384x384",
-          "type": "image/png"
-      },
-      {
-          "src": "./content/images/logo.png",
-          "sizes": "512x512",
-          "type": "image/png"
-      }
-  ],
-  "theme_color": "#000000",
-  "background_color": "#e0e0e0",
-  "start_url": "/index.html",
-  "display": "standalone",
-  "orientation": "portrait"
-}

tslint.json

@@ -8,7 +8,7 @@
             false,
             "check-space"
         ],
-        "curly": true,
+        "curly": false,
         "eofline": true,
         "forin": false,
         "indent": [

webpack/webpack.common.js

@@ -33,10 +33,6 @@ module.exports = (options) => ({
                 test: /\.(jpe?g|png|gif|svg|woff2?|ttf|eot)$/i,
                 loaders: ['file-loader?hash=sha512&digest=hex&name=content/[hash].[ext]']
             },
-            {
-                test: /manifest.webapp$/,
-                loader: 'file-loader?name=manifest.webapp!web-app-manifest-loader'
-            }
         ]
     },
     plugins: [
@@ -65,10 +61,10 @@ module.exports = (options) => ({
         new webpack.optimize.CommonsChunkPlugin({
             name: ['polyfills', 'vendor'].reverse()
         }),
-        new webpack.optimize.CommonsChunkPlugin({
-            name: ['manifest'],
-            minChunks: Infinity,
-        }),
+        // new webpack.optimize.CommonsChunkPlugin({
+        //    name: ['manifest'],
+        //    minChunks: Infinity,
+        // }),
         /**
          * See: https://github.com/angular/angular/issues/11580
          */
@@ -78,7 +74,7 @@ module.exports = (options) => ({
         ),
         new CopyWebpackPlugin([
             // { from: './src/main/webapp/favicon.ico', to: 'favicon.ico' },
-            { from: './src/main/webapp/manifest.webapp', to: 'manifest.webapp' },
+            // { from: './src/main/webapp/manifest.webapp', to: 'manifest.webapp' },
             // jhipster-needle-add-assets-to-webpack - JHipster will add/remove third-party resources in this array
             { from: './src/main/webapp/robots.txt', to: 'robots.txt' },
             { from: './src/main/webapp/content/json', to: 'json' },