[修改]统计分析建筑信息模块增加首页跳转

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

@@ -95,7 +95,7 @@
         <div class="buttonbox">
             <button type="button" mat-raised-button color="primary" (click)="createunit()">新增</button>
             <button type="button" mat-raised-button color="primary" (click)="editunit()">修改</button>
-            <button type="button" mat-raised-button color="warn" (click)="deleteunit()">删除审核</button>
+            <button type="button" mat-raised-button color="warn" (click)="deleteunit()">删除</button>
         </div>
         <div class="tablebox">
     

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

@@ -555,7 +555,7 @@ export class KeyUnitManagementComponent implements OnInit {
       this.snackBar.open('只能选择一个单位删除','确定',config);
     } */
     if(this.deleteAll.length == 1){  //带着id跳到删除页面
-      let isTrue = confirm('您确定要提交删除审核吗')
+      let isTrue = confirm('重点单位删除需审核员审核，审核通过方可删除')
       if(isTrue){
         let body:any = {
           title:this.deleteAll[0].name,

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-06 16:56:07
+ * @LastEditTime: 2021-03-20 15:12:57
 -->
 <div class="box">
     <div class="boxleft">
@@ -38,6 +38,10 @@
                     <mat-option value="6">应急预案(国家级)</mat-option>
                     <mat-option value="7">应急预案(市级)</mat-option>
                     <mat-option value="8">类型预案</mat-option>
+                    <mat-option value="11">重点单位</mat-option>
+                    <mat-option value="12">消防水源</mat-option>
+                    <mat-option value="13">消防力量</mat-option>
+                    <mat-option value="14">联动力量</mat-option>
                   </mat-select>
               </mat-form-field>
                 <span style="margin-left: 30px;">编制级别：</span>
@@ -58,7 +62,7 @@
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="endtime">
                   </mat-form-field>
                   <button mat-raised-button color="primary" style="margin-left: 40px;" type="submit" >查询</button>
-                <button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png"  > 刷新</button>
+                <button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png"  > 重置</button>
             </div>
           </form>
             
@@ -163,7 +167,8 @@
         </mat-tab>
       </mat-tab-group>
         <div class="word" *ngIf="showtype==0">
-            <iframe [src]='iframeSrc'></iframe>
+          <button mat-raised-button color="primary" style="float: right;margin-top: 10px;margin-right: 15px;" (click)='lookNew()'>查看详情</button>
+          <iframe [src]='iframeSrc'></iframe>
         </div>
         <div id="viewer"  *ngIf="showtype==1"></div>
         <div class="twoD" *ngIf="showtype==2">

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

@@ -80,7 +80,7 @@
             iframe{
                 height: 94%;
                 width: 97%;
-                margin: 30px 10px 10px 10px;
+                margin: 10px 10px 10px 10px;
                 overflow-y: auto;
                 border: medium none;
             }

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-03 14:01:47
+ * @LastEditTime: 2021-03-20 15:12:24
  */
 import { Component, OnInit,Inject } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -28,10 +28,10 @@ export class PlanRecordComponent implements OnInit {
     let level = sessionStorage.getItem("level");
     if(level == "0"){//如果是总队
       this.preparelevels = [
-        {name:"总队",value:"1"},
+        {name:"总队",value:"0"},
-        {name:"支队",value:"2"},
+        {name:"支队",value:"1"},
-        {name:"大队",value:"4"},
+        {name:"大队",value:"2"},
-        {name:"中队",value:"8"}
+        {name:"中队",value:"3"}
       ]
       
     }
@@ -45,14 +45,14 @@ export class PlanRecordComponent implements OnInit {
     }
     if(level == "2"){//如果是大队
       this.preparelevels = [
-        {name:"大队",value:"4"},
+        {name:"大队",value:"2"},
-        {name:"中队",value:"8"}
+        {name:"中队",value:"3"}
       ]
       
     }
     if(level == "3"){//如果是中队
       this.preparelevels = [
-        {name:"中队",value:"8"}
+        {name:"中队",value:"3"}
       ]
       
     }
@@ -77,7 +77,7 @@ export class PlanRecordComponent implements OnInit {
   shenheTable=[]//选中要审核的对象
   chuorzhong//判断初审还是终审
   radioid//选中的id
-  showtype=0//0:word,1:全景图，2:二维三维，3:重点单位
+  showtype=-1//0:word,1:全景图，2:二维三维，3:重点单位
   compantData={name:'',buildingTypes:[],address:''}
   organizationName
   planData
@@ -268,7 +268,10 @@ export class PlanRecordComponent implements OnInit {
            //window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
            })
   }
-  
+  //查看按钮跳转
+  lookNew(){
+    window.open(this.src)
+  }
 
   //查看二维三维预案
   thirdPartyURL

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

@@ -28,6 +28,10 @@
                     <mat-option value="6">应急预案(国家级)</mat-option>
                     <mat-option value="7">应急预案(市级)</mat-option>
                     <mat-option value="8">类型预案</mat-option>
+                    <mat-option value="11">重点单位</mat-option>
+                    <mat-option value="12">消防水源</mat-option>
+                    <mat-option value="13">消防力量</mat-option>
+                    <mat-option value="14">联动力量</mat-option>
                   </mat-select>
               </mat-form-field>
               <span style="margin-left: 30px;">编制级别：</span>
@@ -37,7 +41,7 @@
                 </mat-select>
               </mat-form-field>
                 <button mat-raised-button color="primary" style="margin-left: 40px;" type="submit" >查询</button>
-                <button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png"  > 刷新</button>
+                <button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png"  > 重置</button>
           </div>
           </form>
             
@@ -57,7 +61,7 @@
                       <table cellspacing="0" cellpadding="0" id="table" >
                         <tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index" (click)='radioClick($event,item)'>
                           <td style="width: 15%;">
-                            <mat-checkbox color="primary" (change)='radioClick($event,item)'></mat-checkbox>
+                            <mat-checkbox color="primary" (change)='radioClick($event,item)'style="float: left;margin-top:'2px'"></mat-checkbox>
                             {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
                             'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}</td>
                             <td style="width: 15%;">{{item.title}}</td>
@@ -80,6 +84,7 @@
       <div class="righthead">
         
         <div class="rightheadtwo">
+          <button mat-raised-button color="primary" style="float: right;" (click)='lookNew()' *ngIf="showtype == 0">查看详情</button>
           <button mat-raised-button style="color: #FFFFFF;background-color: #FF7161;float: right;" (click)='refuse()'>拒绝</button>
           <button mat-raised-button style="color: #FFFFFF;background-color: #38D984;float: right;" (click)='agree()'>同意</button>
         </div>

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-17 15:52:08
+ * @LastEditTime: 2021-03-20 15:35:16
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';
@@ -32,10 +32,10 @@ export class WaitExamineerComponent implements OnInit {
     let level = sessionStorage.getItem("level");
     if(level == "0"){//如果是总队
       this.preparelevels = [
-        {name:"总队",value:"1"},
+        {name:"总队",value:"0"},
-        {name:"支队",value:"2"},
+        {name:"支队",value:"1"},
-        {name:"大队",value:"4"},
+        {name:"大队",value:"2"},
-        {name:"中队",value:"8"}
+        {name:"中队",value:"3"}
       ]
       this.PlanLevel=0
     }
@@ -49,14 +49,14 @@ export class WaitExamineerComponent implements OnInit {
     }
     if(level == "2"){//如果是大队
       this.preparelevels = [
-        {name:"大队",value:"4"},
+        {name:"大队",value:"2"},
-        {name:"中队",value:"8"}
+        {name:"中队",value:"3"}
       ]
       this.PlanLevel=2
     }
     if(level == "3"){//如果是中队
       this.preparelevels = [
-        {name:"中队",value:"8"}
+        {name:"中队",value:"3"}
       ]
       this.PlanLevel=3
     }
@@ -118,7 +118,7 @@ export class WaitExamineerComponent implements OnInit {
     let paramsdata:any = {
       Operation:this.level||[],
       ContentType:Number(this.projectlevel)||[],
-      //Level:this.PlanLevel||[],
+      Level:this.PlanLevel||[],
       verifyState:[0,3]
     }
     this.http.get("/api/ContentVerifies",{params:paramsdata}).subscribe((data:any)=>{
@@ -292,7 +292,10 @@ export class WaitExamineerComponent implements OnInit {
            //window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`)
            })
   }
-  
+  //查看按钮跳转
+  lookNew(){
+    window.open(this.src)
+  }
 
   //查看二维三维预案
   thirdPartyURL

src/app/plan-management/entry-plan-look/AddPlanone.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-16 10:16:30
+ * @LastEditTime: 2021-03-20 16:13:09
 -->
 <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
     <div class="topbox" style="text-align: center;">
@@ -61,10 +61,10 @@
                             <input style="width: 175px;" type="file" name="" id="uploadFile" *ngIf="isup" (change)="filechange($event)">
                             <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                         </div>
-                        <div *ngIf="inputword">
+                        <!-- <div *ngIf="inputword">
                           <mat-radio-button value="1" style="margin-right: 10px;">导入word文档</mat-radio-button>
                           <input type="file" name="" id="" *ngIf="isinput" (change)="fileInput($event)">
-                        </div>
+                        </div> -->
                         <div *ngIf="pswShow">
                           <!-- <mat-radio-group >
                             <mat-radio-button   value='psw' >是否为全景图</mat-radio-button>

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

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-01-21 15:10:08
+ * @LastEditTime: 2021-03-20 16:29:51
 -->
 <!-- <p>录入预案</p> -->
 <div class="header" style="position: relative;">
@@ -74,7 +74,7 @@
             <ng-container *ngIf="isoperation == 'true'" matColumnDef="operation">
                 <th mat-header-cell *matHeaderCellDef>操作</th>
                 <td  mat-cell *matCellDef="let element">
-                    <span (click)="changeName(element)">改名</span>
+                    <span (click)="changeName(element)" *ngIf="element.auditStatus == !0||element.auditStatus == !3">改名</span>
                     <span (click)="editPlan(element)" [ngClass]="{'grey': element.planMode == '0' || element.planMode == '3' || element.auditStatus == '1' || element.auditStatus == '2'}">编辑</span>
                     <span (click)="lookPlan(element)">查看</span>
                     <span (click)="readFile(element)" [ngClass]="{'grey': element.planMode == '1' || element.planMode == '2' || element.planMode == '3'}">下载</span>

src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts

@@ -58,7 +58,11 @@ export class AddUnitOneComponent implements OnInit {
     }
     for(var i=0;i<this.tabledata[0].organizationStatistics.organizations.length;i++){
       this.orData.push(this.tabledata[0].organizationStatistics.organizations[i])
-      this.lengthOrData.push(this.tabledata[0].organizationStatistics.organizations[i].organizationName)
+        this.lengthOrData.push(this.tabledata[0].organizationStatistics.organizations[i].organizationName)
+       /* if(this.tabledata[0].organizationStatistics.organizations[i].count>0){
+        
+      }  */
+      
     }
     this.buildData=this.buildData.map(v=>{return {name: v.buildingTypeName,value:v.count,id:v.buildingTypeId}})
     this.orData=this.orData.map(v=>{return {name: v.organizationName,value:v.count,id:v.organizationId}})
@@ -67,9 +71,10 @@ export class AddUnitOneComponent implements OnInit {
       title: {
         text:tid=="pieone"? `组织机构统计（${this.tabledata[0].organizationStatistics.totalCount}家）`:`建筑类型统计（${this.tabledata[0].buildingTypeStatistics.totalCount}家）`,
         left: 'center',
-        top: "5%",
+        //top: "5%",
+        //bottom:800,
         textStyle: {
-          fontSize:31
+          fontSize:28
         }
       },
       tooltip: {
@@ -82,11 +87,14 @@ export class AddUnitOneComponent implements OnInit {
         position:this.echartsData.tableTooltipNoShow2
       },
       legend: {
+        //type: tid=="pieone"?'scroll':'',
         orient: 'vertical',
-        right: 0,
+        left: tid=="pieone"?0:650,
-        top:80,
+        //right:30,
+        //top:100,
+        bottom:tid=="pieone"?600:500,
         textStyle:{
-          fontSize:14,
+          fontSize:12,
           color:"#000000"
            },
         data: tid=="pieone"?this.lengthOrData:this.lengthBuildData
@@ -95,12 +103,14 @@ export class AddUnitOneComponent implements OnInit {
         {
           name: '访问来源',
           type: 'pie',
-          radius: '60%',
+          radius: '70%',
           center: ['45%', '53%'],
+          top:300,
+          left:30,
           label:{
             show:true,
             fontSize:14,
-            formatter:'{b}{c}家\n{d|({d}%)}',
+            formatter:'{b}\n{c}家{d|({d}%)}',
             rich: {
               d: {
                 align: 'center',

src/app/statistic-analysis/all-plan/all-plan.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-03-15 11:32:30
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-17 16:18:52
+ * @LastEditTime: 2021-03-20 15:56:38
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -70,8 +70,9 @@ export class AllPlanComponent implements OnInit {
       PageSize: this.pageSizeOptions[0]
     }
     this.http.get(`/api/Plans/Organizations`,{params:paramtedate}).subscribe((data:any)=>{
+      this.length = data.totalCount
       this.tabledataSource=data.items
-      console.log(this.tabledataSource)
+      //console.log(this.tabledataSource)
     })
   }
 

src/styles.scss

@@ -212,3 +212,6 @@ table td.mat-footer-cell:last-of-type{
 		color: black;
 	}
 }
+td{
+	word-break:break-all;
+}