Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/app-routing.module.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-11 14:48:03
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-02-02 15:22:22
+ * @LastEditTime: 2021-03-26 15:18:46
  */
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
@@ -16,7 +16,7 @@ import { PlanPassComponent } from '../app/plan-audit/plan-pass/plan-pass.compone
 //路由守卫
 import {AuthGuard} from './auth.guard'
 import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥
-
+import {ViewUnitDetailsPlanComponent} from './key-unit/view-unit-details-plan/view-unit-details-plan.component'
 
 
 const routes: Routes = [
@@ -37,8 +37,10 @@ const routes: Routes = [
   },
 
   {path:'login',component:LoginComponent},
+  { path:'keyUnit/viewunitinfoplans', component:ViewUnitDetailsPlanComponent,canActivate: [AuthGuard],},
   {path:'getNoMToken',component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面
   { path: 'planAudit/planpass', component: PlanPassComponent },
+
 ];
 
 @NgModule({

src/app/key-unit/key-unit-management/key-unit-management.component.html

@@ -81,8 +81,8 @@
                     <mat-form-field class="example-full-width">
                         <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin" autocomplete="off">
                     </mat-form-field>
-                    🠚
+                    <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
-                    <!-- <mat-icon aria-hidden="false" style="width: 5px;padding: 0;margin:0">arrow forward</mat-icon> -->
+                     <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
                     <mat-form-field class="example-full-width" style="margin-left: 5px;">
                         <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax" autocomplete="off">
                     </mat-form-field>

src/app/key-unit/key-unit-management/key-unit-management.component.scss

@@ -2,7 +2,7 @@
     
 }
 //margin: 3px 40px;
-@media screen and (max-device-width:1290px){
+@media screen and (max-device-width:1290px) and (max-device-height:690px){
     
 }
 

src/app/key-unit/key-unit-management/key-unit-management.component.ts

@@ -21,6 +21,7 @@ export class KeyUnitManagementComponent implements OnInit {
 
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
   
+  padjt=false
   padMore=true//pad收缩控制
   padput=false//pad收起按钮
   open="更多筛选条件"
@@ -28,6 +29,7 @@ export class KeyUnitManagementComponent implements OnInit {
   imgsrcopen="../../../assets/images/routdown2.png"
   imgsrcdown="../../../assets/images/routup2.png"
   padInfo(){
+    this.padjt=!this.padjt
     this.padMore=!this.padMore
     this.padput=!this.padput
   }

src/app/plan-audit/plan-record/plan-record.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-24 16:06:43
+ * @LastEditTime: 2021-03-26 14:49:40
 -->
 <div class="box">
     <div class="boxleft">
@@ -59,7 +59,8 @@
                   <mat-form-field class="example-full-width" style="margin-bottom: 0;">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="addtime">
                   </mat-form-field>
-                  <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
+                  <mat-icon *ngIf="!pcshow" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+                  <span style="margin-left: 15px;" id="pcshow" *ngIf="pcshow">🠊</span>
                   <mat-form-field class="example-full-width" style="margin-left: 10px;margin-bottom: 0;">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="endtime">
                   </mat-form-field>

src/app/plan-audit/plan-record/plan-record.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-20 15:12:24
+ * @LastEditTime: 2021-03-26 15:21:16
  */
 import { Component, OnInit,Inject } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -24,7 +24,13 @@ export class PlanRecordComponent implements OnInit {
 
   constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer,public dialog: MatDialog) { }
 
+  pcshow
   ngOnInit(): void {
+    if(window.matchMedia("(max-width: 1300px)").matches){
+      this.pcshow=false
+    }else{
+      this.pcshow=true
+    }
     let level = sessionStorage.getItem("level");
     if(level == "0"){//如果是总队
       this.preparelevels = [
@@ -82,6 +88,7 @@ export class PlanRecordComponent implements OnInit {
   organizationName
   planData
   id
+  itemid
   companyId
   fetchUrl
   companyName
@@ -139,8 +146,9 @@ export class PlanRecordComponent implements OnInit {
   tableClick(e,item){
     this.showtype = -1
     //e.target.parentElement.bgColor='#2196F3'
-    //console.log(e,item)
+    console.log(item)
     this.organizationName=''
+    this.itemid=item.itemId
     this.id=item.id
     this.fetchUrl=''
     this.viewer={}
@@ -298,11 +306,11 @@ export class PlanRecordComponent implements OnInit {
       })
       sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
       sessionStorage.setItem("companyId",this.companyId);
-      sessionStorage.setItem("planId",this.id);
+      sessionStorage.setItem("planId",this.itemid);
       sessionStorage.setItem("editable",'0');
       sessionStorage.setItem("planName",data.name)
       let companyId = sessionStorage.getItem("companyId")
-      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`);
+      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${companyId}`);
       //window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
     } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
       this.showtype=2

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 16:13:50
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 08:45:05
+ * @LastEditTime: 2021-03-26 15:09:38
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -109,6 +109,7 @@ export class WaitExamineerComponent implements OnInit {
   organizationName
   planData
   id
+  itemid
   companyId
   fetchUrl
   companyName
@@ -147,6 +148,7 @@ export class WaitExamineerComponent implements OnInit {
   radioClick(e,item){
     this.showtype = -1
     this.organizationName=''
+    this.itemid=item.itemId
     this.id=item.id
     this.fetchUrl=''
     this.viewer={}
@@ -310,11 +312,11 @@ export class WaitExamineerComponent implements OnInit {
       })
       sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
       sessionStorage.setItem("companyId",this.companyId);
-      sessionStorage.setItem("planId",this.id);
+      sessionStorage.setItem("planId",this.itemid);
       sessionStorage.setItem("editable",'0');
       sessionStorage.setItem("planName",data.name)
       let companyId = sessionStorage.getItem("companyId")
-      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`);
+      this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${companyId}`);
       //window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
     } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
       this.showtype=2

src/app/plan-management/maintain-up/maintain-up.component.html

@@ -15,6 +15,8 @@
                       <input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
                   </mat-form-field>
                   <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
+                  <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+                  <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
                   <div class="organizationbox" *ngIf="isorganizationbox">
                       <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
                       <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
@@ -38,13 +40,13 @@
                   </div>
               </div>
   
-              <div class="queryField">
+              <div class="queryField" *ngIf="!padMore">
                   <label style="margin-right: 10px;">统一社会信用代码:</label>
                   <mat-form-field class="example-full-width">
                       <input matInput placeholder="请输入统一社会信用代码" name="shehui" [(ngModel)]="shehui" autocomplete="off">
                   </mat-form-field>
               </div>
-              <div class="queryField">
+              <div class="queryField" *ngIf="!padMore">
                   <label style="margin-right: 10px;">单位类型:</label>
                   <mat-form-field>
                       <mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
@@ -54,7 +56,7 @@
                       </mat-select>
                   </mat-form-field>
               </div>
-              <div class="queryField">
+              <div class="queryField" *ngIf="!padMore">
                   <label style="margin-right: 10px;">关注单位:</label>
                   <mat-form-field>
                       <mat-select placeholder='请选择单位是否关注' [(ngModel)]="follow" name="follow">
@@ -63,7 +65,7 @@
                       </mat-select>
                   </mat-form-field>
               </div>
-              <div class="queryField">
+              <div class="queryField" *ngIf="!padMore">
                   <label style="margin-right: 10px;">信息完整度排序:</label>
                   <mat-form-field>
                       <mat-select placeholder='请选择排序方式' [(ngModel)]="integritySort" name="integritySort">
@@ -72,12 +74,13 @@
                       </mat-select>
                   </mat-form-field>
               </div>
-              <div class="queryField" style="margin-left: 100px;">
+              <div class="queryField"  *ngIf="!padMore">
                   <label style="margin-right: 10px;">完整度查询:</label>
                   <mat-form-field class="example-full-width">
                       <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin" autocomplete="off">
                   </mat-form-field>
-                  🠊
+                  <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+                  <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
                   <mat-form-field class="example-full-width" style="margin-left: 5px;">
                       <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax" autocomplete="off">
                   </mat-form-field>

src/app/plan-management/maintain-up/maintain-up.component.ts

@@ -203,7 +203,24 @@ export class MaintainUpComponent implements OnInit {
     this.PageNumber = e.pageIndex+1
     this.getAllKeyUnit();
   }
+  padMore//pad收缩控制
+  padput=false//pad收起按钮
+  padjt=false
+  open="更多筛选条件"
+  down="收起"
+  imgsrcopen="../../../assets/images/routdown2.png"
+  imgsrcdown="../../../assets/images/routup2.png"
+  padInfo(){
+    this.padMore=!this.padMore
+    this.padput=!this.padput
+    this.padjt=!this.padjt
+  }
   ngOnInit(): void {
+    if(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches){
+      this.padMore=true
+    }else{
+      this.padMore=false
+    }
     this.getunitdata();
     this.getOrganizations();
     this.getUnittype();

src/app/plan-management/meet-plan/meet-plan.component.html

@@ -34,7 +34,8 @@
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
             <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
-            <span style="margin-left: 15px;">🠊</span>
+            <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+            <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
             </mat-form-field>

src/app/plan-management/meet-plan/meet-plan.component.ts

@@ -20,8 +20,10 @@ export class MeetPlanComponent implements OnInit {
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
-    if(window.matchMedia("(max-width: 1300px)").matches){
+    //console.log(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches)
+    if(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches){
       this.padMore=true
+      //this.padjt=
     }else{
       this.padMore=false
     }
@@ -79,8 +81,9 @@ export class MeetPlanComponent implements OnInit {
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
   
-  padMore=true//pad收缩控制
+  padMore//pad收缩控制
   padput=false//pad收起按钮
+  padjt=false
   open="更多筛选条件"
   down="收起"
   imgsrcopen="../../../assets/images/routdown2.png"
@@ -88,6 +91,7 @@ export class MeetPlanComponent implements OnInit {
   padInfo(){
     this.padMore=!this.padMore
     this.padput=!this.padput
+    this.padjt=!this.padjt
   }
 
   //获取表格数据

src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 16:33:38
+ * @LastEditTime: 2021-03-29 09:51:14
 -->
 <div style="height: 100%;overflow-y: auto;">
     <div class="header" >
@@ -31,7 +31,8 @@
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
             <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
-            <span style="margin-left: 15px;">🠊</span>
+            <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+            <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput name="endtime"  autocomplete="off"  [(ngModel)]="endtime">
             </mat-form-field>

src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 15:16:17
+ * @LastEditTime: 2021-03-29 09:51:04
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -70,11 +70,13 @@ export class OnetwoEntryPlanComponent implements OnInit {
   }
   padMore=true//pad收缩控制
   padput=false//pad收起按钮
+  padjt=false
   imgsrcopen="../../../assets/images/routdown2.png"
   imgsrcdown="../../../assets/images/routup2.png"
   padInfo(){
     this.padMore=!this.padMore
     this.padput=!this.padput
+    this.padjt=!this.padjt
   }
 
   levels

src/app/plan-management/type-plan/type-plan.component.html

@@ -24,7 +24,8 @@
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
             <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
-            <span style="margin-left: 15px;">🠊</span>
+            <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+            <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput  autocomplete="off" name="endtime" [(ngModel)]="endtime">
             </mat-form-field>

src/app/plan-management/type-plan/type-plan.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-06 09:47:43
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 15:16:56
+ * @LastEditTime: 2021-03-29 09:49:11
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -29,7 +29,7 @@ export class TypePlanComponent implements OnInit {
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
-    if(window.matchMedia("(max-width: 1290px)").matches){
+    if(window.matchMedia("(max-width: 1290px)").matches&&window.matchMedia("(max-height: 700px)").matches){
       this.padMore=true
     }else{
       this.padMore=false
@@ -65,9 +65,11 @@ export class TypePlanComponent implements OnInit {
   }
   padMore=true//pad收缩控制
   padput=false//pad收起按钮
+  padjt=false
   imgsrcopen="../../../assets/images/routdown2.png"
   imgsrcdown="../../../assets/images/routup2.png"
   padInfo(){
+    this.padjt=!this.padjt
     this.padMore=!this.padMore
     this.padput=!this.padput
   }

src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts

@@ -14,7 +14,12 @@ export class BuildingTypeOneComponent implements OnInit {
   constructor(private http:HttpClient,private router: Router,public echartsData:EchartsDataService) { }
 
   ngOnInit(): void {
-    
+    if(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches){
+      this.padHw=true
+      //this.padjt=
+    }else{
+      this.padHw=false
+    }
     this.echartsData.getData(null,`/api/StatisticsAnalysis/BuildingTypes`)
     window.setTimeout(()=>{
       this.initCharts()
@@ -26,6 +31,7 @@ export class BuildingTypeOneComponent implements OnInit {
   }
   /* 首页饼状图 */
   indexBzt
+  padHw
   lengthdata=[]//提示数据
   count=0//总数
   indexData=[]//所有数据
@@ -65,8 +71,8 @@ export class BuildingTypeOneComponent implements OnInit {
       },
       legend: {
         orient: 'vertical',
-        right: 150,
+        right: this.padHw?150:250,
-        top:80,
+        top:60,
         textStyle:{
           fontSize:18,
           color:"#000000"
@@ -75,7 +81,7 @@ export class BuildingTypeOneComponent implements OnInit {
       },
       series: [
         {
-          //top:'15%',
+          top:this.padHw?'15%':'0',
           name: '访问来源',
           type: 'pie',
           radius: '60%',

src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts

@@ -20,7 +20,14 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
   }
   headname//标题
   buildId//建筑id
+  padHw//是否是华为pad
   ngOnInit(): void {
+    if(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches){
+      this.padHw=true
+      //this.padjt=
+    }else{
+      this.padHw=false
+    }
     if(sessionStorage.getItem('refresh') === 'true') {
       sessionStorage.removeItem('refresh');
       location.reload();
@@ -263,15 +270,15 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
           title: {
             text: this.headname+this.tabledata[0].totalCount,
             left: "center",
-            //top: "12",
+            top:this.padHw?"18":"0",
-            bottom: '510',
+            bottom:this.padHw?"0":'510',
             textStyle: {
               fontSize: 30
             }
           },
           grid: {
             top: 90,
-            bottom: 30
+            bottom: 30,
         },
           xAxis: {
               id:this.organizationId,