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

src/app/key-unit/function-division-look/function-division.component.ts

@@ -153,19 +153,7 @@ export class FunctionDivisionLookComponent implements OnInit {
 
   // 没有 创建 建筑功能分区时   自动创建
   addVoluntarilyPartition () {
-    let isFalse = []
+
-    this.noDataList.forEach(item=> { item===false? isFalse.push(1) : null })
-    if (isFalse.length === this.allBuilding.length) { //没有 建筑功能分区时
-      let data = {
-        buildingId: this.allBuilding[0].id,
-        region: "",
-        area: 0,
-        details: ""
-      }
-      this.http.post('/api/BuildingFunctionalDivisions',data,{params:{companyId : this.route.snapshot.queryParams.id}}).subscribe(data=>{
-        this.getAllBuilding()
-      })
-    } //if
   }
 
   //封装函数刷新当前建筑功能分区

src/app/key-unit/function-division/function-division.component.ts

@@ -155,19 +155,30 @@ export class FunctionDivisionComponent implements OnInit {
 
   // 没有 创建 建筑功能分区时   自动创建
   addVoluntarilyPartition () {
-    let isFalse = []
+    let isNotHave:boolean = false
-    this.noDataList.forEach(item=> { item===false? isFalse.push(1) : null })
+    this.noDataList.forEach(item=> {
-    if (isFalse.length === this.allBuilding.length) { //没有 建筑功能分区时
+      if (item === true) {
-      let data = {
+        isNotHave = true
+        return
+      }
+    })
+    if (!isNotHave) { //所有建筑都没有 功能分区时
+      let bodyData = [{
           buildingId: this.allBuilding[0].id,
           region: "",
           area: 0,
           details: ""
-      }
+      }]
-      this.http.post('/api/BuildingFunctionalDivisions',data,{params:{companyId : this.route.snapshot.queryParams.id}}).subscribe(data=>{
+      let params = {buildingId:this.allBuilding[0].id, companyId:this.companyId}
-        this.getAllBuilding()
+      this.http.post('/api/BuildingFunctionalDivisions/Batch',bodyData,{params:params}).subscribe(datas=>{
+        let newParams = {buildingId: this.allBuilding[0].id}
+        this.http.get(`/api/BuildingFunctionalDivisions`,{params:newParams}).subscribe((data:any)=>{
+          this.allBuilding[0].functionalZoning = data
+          this.selectBuildingFunctionalZoning.push([]) //拥有建筑功能分区的提前push空数组
+          this.allBuildingFunctionalZoning.push(this.allBuilding[0])
         })
-    } //if
+      })
+    }
   }
 
   //封装函数刷新当前建筑功能分区

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html

@@ -708,8 +708,10 @@
                                             <div class="building" *ngIf="element.surveyName=='单位基本信息'">
                                                 <div *ngFor="let info of element.attinf">
                                                     <div *ngIf="info.completed" class="onetext">
-                                                        <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly *ngIf="pattern == 'edit'">
+                                                        <input type="text" placeholder="请输入内容" style="width: 30%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly *ngIf="pattern == 'edit'">
-                                                        <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'">
+                                                        <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #FFFFFF;" [(ngModel)]="info.value" *ngIf="pattern == 'edit'">
+                                                       <!--  <input type="text"  style="width: 30%;background-color: #FFFFFF;color: #999;" [(ngModel)]="info.olddata" *ngIf="pattern == 'edit'&&oldData" readonly> -->
+                                                       <span style="width: 30%;background-color: #FFFFFF;color: #999;" *ngIf="pattern == 'edit'&&oldData">{{info.olddata||'无原数据'}}</span>
                                                         <table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
                                                             <tr>
                                                                 <th style="border: 1px solid #999;
@@ -730,8 +732,10 @@
                                             <div class="building" *ngIf="element.surveyName=='建筑信息'">
                                                 <div *ngFor="let info of element.attinf">
                                                     <div *ngIf="info.completed" class="onetext">
-                                                        <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly *ngIf="pattern == 'edit'">
+                                                        <input type="text" placeholder="请输入内容" style="width: 30%;background-color: #e8e9e9;text-align: center;" [(ngModel)]="info.propertyName" readonly *ngIf="pattern == 'edit'">
-                                                        <input type="text" placeholder="请输入内容" style="width: 60%;background-color: #FFFFFF;" [(ngModel)]="info.propertyValue" *ngIf="pattern == 'edit'">
+                                                        <input type="text" placeholder="请输入内容" style="width: 40%;background-color: #FFFFFF;" [(ngModel)]="info.propertyValue" *ngIf="pattern == 'edit'">
+                                                        <!-- <input type="text"  style="width: 30%;background-color: #FFFFFF;color: #999;" [(ngModel)]="info.olddata" *ngIf="pattern == 'edit'&&oldData" readonly> -->
+                                                        <span style="width: 30%;background-color: #FFFFFF;color: #999;" *ngIf="pattern == 'edit'&&oldData">{{info.olddata||'无原数据'}}</span>
                                                         <table *ngIf="pattern == 'look'" style="width: 100%;border-collapse: collapse;">
                                                             <tr>
                                                                 <th style="border: 1px solid #999;
@@ -955,11 +959,15 @@
                                 </div>
                             </div>
                         </div>
-
+                        <div class="oldData" *ngIf="pattern == 'edit'" (click)='clickoldData()'>
+                            <img src="../../../assets/images/olddata.png">
+                            <span>原数据</span>
                         </div>
                     </div>
                 </div>
             </div>
+        </div>
+
         
         <div class="toolDiv" *ngIf="pattern == 'look'">
             <button title="下载文档" mat-mini-fab color="primary" (click)="generatingDoc()">

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss

@@ -641,7 +641,7 @@
                                 height: 40px;
                                 width: 40%;
                                 font-size: 16px;
-                                background-color: #e8e9e9;
+                                background-color: #F2F4F5;
                             }
                             input{
                                 height: 40px;
@@ -649,7 +649,7 @@
                                 font-size: 16px;
                                 border: none;
                                 outline: none;
-                                
+                                border-bottom: 1px solid #F2F4F5;
                             }
                             img{
                                 height: 20px;
@@ -853,6 +853,30 @@
                 margin: 5px 0;
             }
         }
+        .oldData{
+            width: 100px;
+            height: 36px;
+            background-color: #FFFFFF;
+            border-radius: 0px 60px 60px 0px;
+            position: fixed;
+            right: 25.3%;
+            top: 120px;
+            display: flex;
+            cursor: pointer;
+            span{
+                color: #2196f3;
+                font-size: 16px;
+                line-height: 36px;
+                margin-left: 5px;
+            }
+            img{
+                width: 18px;
+                height: 15px;
+                position: relative;
+                top: 10px;
+                left: 5px;
+            }
+        }
     }
     .noPadding{
         padding-top: 10px;

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-06-16 13:56:54
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-07-02 14:28:59
+ * @LastEditTime: 2021-07-05 15:36:30
  */
 import { HttpClient } from '@angular/common/http';
 import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core';
@@ -78,13 +78,14 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
       this.getRealPicture()
     } else if (this.selectedItem == '单位概况') {
       this.getAllBuildings()
+      
+      this.planTemplateData[1].attribute[0].attinf[0].value=this.planTemplateData[1].attribute[0].attinf[0].olddata = this.unitData.usci
+      this.planTemplateData[1].attribute[0].attinf[1].value=this.planTemplateData[1].attribute[0].attinf[1].olddata = this.unitData.buildingTypes[0].name
+      this.planTemplateData[1].attribute[0].attinf[2].value=this.planTemplateData[1].attribute[0].attinf[2].olddata = this.unitData.contacts
+      this.planTemplateData[1].attribute[0].attinf[3].value=this.planTemplateData[1].attribute[0].attinf[3].olddata = this.unitData.phone
+      this.planTemplateData[1].attribute[0].attinf[4].value=this.planTemplateData[1].attribute[0].attinf[4].olddata = this.unitData.organizationName
+      this.planTemplateData[1].attribute[0].attinf[5].value=this.planTemplateData[1].attribute[0].attinf[5].olddata = this.unitData.address
       console.log(this.planTemplateData)
-      this.planTemplateData[1].attribute[0].attinf[0].value = this.unitData.usci
-      this.planTemplateData[1].attribute[0].attinf[1].value = this.unitData.buildingTypes[0].name
-      this.planTemplateData[1].attribute[0].attinf[2].value = this.unitData.contacts
-      this.planTemplateData[1].attribute[0].attinf[3].value = this.unitData.phone
-      this.planTemplateData[1].attribute[0].attinf[4].value = this.unitData.organizationName
-      this.planTemplateData[1].attribute[0].attinf[5].value = this.unitData.address
     } /* else if (this.selectedItem == '单位概况') {
       //this.getAllBuildings()
     } */ else if (this.selectedItem == '预案附件') {
@@ -587,6 +588,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
 
     $(".mainbox").wordExport('word文档');
   }
+  //原数据点击
+  oldData=false
+  clickoldData(){
+    this.oldData=!this.oldData
+  }
 }
 
 

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-06-21 14:28:53
+ * @LastEditTime: 2021-07-02 16:22:22
 -->
 <form (ngSubmit)="onSubmit(form.value)" #form="ngForm" class="example-container">
     <div class="topbox" style="text-align: center;">
@@ -62,7 +62,7 @@
                             <span *ngIf="uploadover" style="font-size: 13px;">(已上传)</span>
                         </div>
                         <div *ngIf="inputword">
-                          <!-- <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button> -->
+                          <mat-radio-button value="2" style="margin-right: 10px;">在线编制</mat-radio-button>
                           <!-- <button mat-raised-button *ngIf="isinput" (click)='createWord()'>在线编制预案</button> -->
                         </div>
                         <!-- <div *ngIf="inputword">

src/app/statistic-analysis/state/page-one/page-one.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-01 15:24:39
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-04-29 09:11:46
+ * @LastEditTime: 2021-07-07 14:07:26
  */
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
@@ -61,9 +61,41 @@ export class PageOneComponent implements OnInit {
   tabledata
   count
   indexData
+  planCategoriesData=[]
+  planStatusesData=[]
   initCharts(tid){
     this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate))
-    //console.log(this.tabledata)
+    if(tid=='pieone')
+    {
+      this.tabledata[0].planCategoryStatistics.planCategories.forEach((value,index,array) => {
+        if(array[index].planCategoryName=='LevelOne'){
+          this.planCategoriesData.push({name:'Ⅰ级预案',value:array[index].count,planStatusName:array[index].planCategoryName,type:1})
+        }else if(array[index].planCategoryName=='LevelTwo'){
+          this.planCategoriesData.push({name:'Ⅱ级预案',value:array[index].count,planStatusName:array[index].planCategoryName,type:2})
+        }else if(array[index].planCategoryName=='LevelThree'){
+          this.planCategoriesData.push({name:'Ⅲ级预案',value:array[index].count,planStatusName:array[index].planCategoryName,type:3})
+        }else if(array[index].planCategoryName=='LevelFour'){
+          this.planCategoriesData.push({name:'Ⅳ级预案',value:array[index].count,planStatusName:array[index].planCategoryName,type:4})
+        }else if(array[index].planCategoryName=='LevelFive'){
+          this.planCategoriesData.push({name:'Ⅴ级预案',value:array[index].count,planStatusName:array[index].planCategoryName,type:5})
+        }
+      });
+    }else{
+      this.tabledata[0].planStatusStatistics.planStatuses.forEach((value,index,array) => {
+        if(array[index].planStatusName=='New'){
+          this.planStatusesData.push({name:'预案新增',value:array[index].count,type:1,planStatusName:array[index].planStatusName})
+        }else if(array[index].planStatusName=='Auditing'){
+          this.planStatusesData.push({name:'预案审核通过',value:array[index].count,type:3,planStatusName:array[index].planStatusName})
+        }else if(array[index].planStatusName=='Approved'){
+          this.planStatusesData.push({name:'预案编制',value:array[index].count,type:5,planStatusName:array[index].planStatusName})
+        }else if(array[index].planStatusName=='Rejected'){
+          this.planStatusesData.push({name:'预案审核退回',value:array[index].count,type:4,planStatusName:array[index].planStatusName})
+        }else if(array[index].planStatusName=='Editing'){
+          this.planStatusesData.push({name:'预案审核中',value:array[index].count,type:2,planStatusName:array[index].planStatusName})
+        }
+      });
+    }
+    
     
     var ec = echarts as any;
     this.indexBzt = ec.init(document.getElementById(tid),'walden');
@@ -115,19 +147,7 @@ export class PageOneComponent implements OnInit {
                 },
                 
               },
-              data:tid=='pieone'?[
+              data:tid=='pieone'?this.planCategoriesData:this.planStatusesData,
-                {value:this.tabledata[0].planCategoryStatistics.planCategories[0]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[0].count:0, name: 'Ⅰ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[0]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[0].planCategoryName:'',type:1},
-                {value:this.tabledata[0].planCategoryStatistics.planCategories[1]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[1].count:0, name: 'Ⅱ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[1]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[1].planCategoryName:'',type:2},
-                {value:this.tabledata[0].planCategoryStatistics.planCategories[2]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[2].count:0, name: 'Ⅲ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[2]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[2].planCategoryName:'',type:3},
-                {value:this.tabledata[0].planCategoryStatistics.planCategories[3]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[3].count:0, name: 'Ⅳ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[3]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[3].planCategoryName:'',type:4},
-                {value:this.tabledata[0].planCategoryStatistics.planCategories[4]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[4].count:0, name: 'Ⅴ级预案', planStatusName:this.tabledata[0].planCategoryStatistics.planCategories[4]!=undefined? this.tabledata[0].planCategoryStatistics.planCategories[4].planCategoryName:'',type:5},
-              ]: [
-                  {value:this.tabledata[0].planStatusStatistics.planStatuses[0]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[0].count:0, name: '预案新增',type:1,planStatusName:this.tabledata[0].planStatusStatistics.planStatuses[0]!=undefined?this.tabledata[0].planStatusStatistics.planStatuses[0].planStatusName:''},
-                  {value:this.tabledata[0].planStatusStatistics.planStatuses[2]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[2].count:0, name: '预案审核通过',type:3,planStatusName:this.tabledata[0].planStatusStatistics.planStatuses[2]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[2].planStatusName:''},
-                  {value:this.tabledata[0].planStatusStatistics.planStatuses[4]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[4].count:0, name: '预案编制',type:5,planStatusName:this.tabledata[0].planStatusStatistics.planStatuses[4]!=undefined?this.tabledata[0].planStatusStatistics.planStatuses[4].planStatusName:''},
-                  {value:this.tabledata[0].planStatusStatistics.planStatuses[3]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[3].count:0, name: '预案审核退回',type:4,planStatusName:this.tabledata[0].planStatusStatistics.planStatuses[3]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[3].planStatusName:''},
-                  {value:this.tabledata[0].planStatusStatistics.planStatuses[1]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[1].count:0, name: '预案审核中',type:2,planStatusName:this.tabledata[0].planStatusStatistics.planStatuses[1]!=undefined? this.tabledata[0].planStatusStatistics.planStatuses[1].planStatusName:''}
-              ],
               emphasis: {
                   itemStyle: {
                       shadowBlur: 10,

src/app/ui/plan-template/plan-template.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-05-31 10:40:01
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-07-02 14:21:31
+ * @LastEditTime: 2021-07-05 15:15:36
  */
 
 import { Component, Inject, OnInit,ViewEncapsulation } from '@angular/core';
@@ -372,7 +372,7 @@ export class PlanTemplateComponent implements OnInit {
               //array[index].attribute[i].completed=false
               attarr[i].attinf.forEach((attinfValue,attinfi,attinfarr) => {
                 if(attinfValue.propertyName==propertyName){
-                  attinfarr[attinfi].splice(attinfi,i)
+                  attinfarr[attinfi].completed=false
                 }
               });
             } 
@@ -774,12 +774,12 @@ defineClick(){
 export class addattinf{
   constructor(private http: HttpClient,public dialogRef: MatDialogRef<addattinf>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {}
   addAttinf=[
-  {propertyName:'统一社会信用代码',completed:false,propertyType:0,value:''},
+  {propertyName:'统一社会信用代码',completed:false,propertyType:0,value:'',olddata:''},
-  {propertyName:'单位类型',completed:false,propertyType:0,value:''},
+  {propertyName:'单位类型',completed:false,propertyType:0,value:'',olddata:''},
-  {propertyName:'联系人',completed:false,propertyType:0,value:''},
+  {propertyName:'联系人',completed:false,propertyType:0,value:'',olddata:''},
-  {propertyName:'联系电话',completed:false,propertyType:0,value:''},
+  {propertyName:'联系电话',completed:false,propertyType:0,value:'',olddata:''},
-  {propertyName:'辖区中队',completed:false,propertyType:0,value:''},
+  {propertyName:'辖区中队',completed:false,propertyType:0,value:'',olddata:''},
-  {propertyName:'单位地址',completed:false,propertyType:0,value:''},
+  {propertyName:'单位地址',completed:false,propertyType:0,value:'',olddata:''},
   /* {propertyName:'单位照片',completed:false,propertyType:0,value:''} *///,default:'-',must:'是',danwei:'-'
 ]
 addAttinfBuild
@@ -802,11 +802,17 @@ getattinf(){
                 if(dataarr[index].propertyName==arr[i].propertyName){
                   if(dataarr[index].completed==true&&arr[i].completed==false){
                    arr[i].completed= dataarr[index].completed
+                   arr[i].olddata=dataarr[index].value
                   }
                 }
               })
             });
-          }else if(value.surveyName=='建筑信息'&&value.attinf==undefined){
+          }/* else if(value.surveyName=='单位基本信息'&&value.attinf==undefined){
+            this.addAttinf.forEach((data)=>{
+              data.olddata=data.value
+            })
+          } */
+          else if(value.surveyName=='建筑信息'&&value.attinf==undefined){
             let paramsdata:any ={
               categoryId:this.data.newleftTabledata[this.data.leftclicki].basicCategoryId
             }
@@ -814,6 +820,7 @@ getattinf(){
               this.addAttinfBuild=data[0].propertyInfos
               this.addAttinfBuild.forEach(element => {
                 element.completed=false
+                element.olddata=element.propertyValue
               });
               console.log(this.addAttinfBuild)
             })