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

src/app/external-links-plan/external-links-plan.component.ts

@@ -58,7 +58,8 @@ export class ExternalLinksPlanComponent implements OnInit {
     await new Promise((resolve, reject) => {
       this.http.post('/api/Account/SignIn', {
         name: 'zhuzhouyuanchakan',
-        password: '12345678'}).subscribe((data:any)=>{
+        password: '12345678'
+      }).subscribe((data: any) => {
         sessionStorage.setItem("level", data.level);
         sessionStorage.setItem("token", data.token);
         sessionStorage.setItem("refreshToken", data.refreshToken);

src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html

@@ -140,7 +140,7 @@
             </ng-container>
             <ng-container matColumnDef="addtime">
               <th mat-header-cell *matHeaderCellDef>审核时间</th>
-              <td mat-cell *matCellDef="let element">{{element.creationTime | date:'yyyy-MM-dd'}}</td>
+              <td mat-cell *matCellDef="let element">{{element.audittedTime | date:'yyyy-MM-dd'}}</td>
             </ng-container>
             <ng-container matColumnDef="plantype">
               <th mat-header-cell *matHeaderCellDef>预案类型</th>

src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.ts

@@ -132,8 +132,8 @@ export class PlanAnalysisBySynthesisComponent implements OnInit {
       AuditStatus: '', //审核状态
       PlanLevel: this.preparelevel || '',
       HasChildrenPlanLevel: this.plcheck || '',
-      CreationTimeRangeStart:this.addtime||'',
-      CreationTimeRangeEnd:this.endtime||'',
+      AduitTimeRangeStart: this.addtime || '',
+      AduitTimeRangeEnd: this.endtime || '',
       PageNumber: this.PageNumber || '1',
       PageSize: this.pageSizeOptions[0],
       Sort: '',

src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts

@@ -4,11 +4,11 @@
  * @Author: sueRimn
  * @Date: 2021-05-08 09:42:43
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-05-13 14:04:20
+ * @LastEditTime: 2021-05-13 14:24:42
  */
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import {FormGroup, FormControl} from '@angular/forms';
+//import {Foimport { FormGroup, FormControl } from '@angular/forms';
 import { EchartsDataService } from '../echarts-data.service';
 import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core';
@@ -132,9 +132,9 @@ export class RealMonitoringComponent implements OnInit {
         this.leftzhutu.dispose()
         this.dateyue = []
         this.dateNum = []
-        this.zhiNameData = []
-        this.zhiNumData = []
-        this.addyuan=[]
+        //this.zhiNameData = []
+        //this.zhiNumData = []
+        //this.addyuan = []
         this.getechartsdata(false)
       }
     }
@@ -186,6 +186,8 @@ export class RealMonitoringComponent implements OnInit {
             }
             
           }
+
+        
       },
       yAxis: {
           type: 'value',
@@ -196,6 +198,8 @@ export class RealMonitoringComponent implements OnInit {
             }
             
           }
+
+        
       },
       /* tooltip: {
         trigger: 'item',
@@ -390,6 +394,8 @@ export class RealMonitoringComponent implements OnInit {
           }
         } //function
           }
+
+        
       },
       yAxis: {
           type: 'value',
@@ -405,7 +411,7 @@ export class RealMonitoringComponent implements OnInit {
         {
           type: 'slider',
           bottom:90,
-          backgroundColor:'rgba(47,69,84,-0.2)',
+          //backgroundColor:'rgba(47,69,84,-0.2)',
           dataBackground:{
             areaStyle:{
               opacity:0
@@ -421,9 +427,7 @@ export class RealMonitoringComponent implements OnInit {
           symbolSize: [65, 65],
           data: this.EchartsData.qipao(this.tiaoshiPao, this.zhiNumData, this.zhiNameData)
         },
-          backgroundStyle: {
-              color: 'rgba(220, 220, 220, 0.8)'
-          },
+         
           //barWidth :'38',
           //label: this.topTextlabel
         }]

src/app/statistic-analysis/statistic-analysis-routing.module.ts

@@ -49,7 +49,6 @@ const routes: Routes = [
   { path: 'delete_one/delete_two', component: DeleteTwoComponent },
   { path: 'delete_one/delete_there', component: DeleteThereComponent },
   { path: 'delete_one/delete_four', component: DeleteFourComponent },
-  { path: 'buildingType_one', component: BuildingTypeOneComponent},
   { path: 'delete_two', component: DeleteTwoComponent },
   { path: 'delete_two_newadd', component: DeleteTwoNewaddComponent },
   { path: 'delete_there', component: DeleteThereComponent },

src/app/ui/collection-tools/collection-tools.component.ts

@@ -1197,7 +1197,8 @@ export class CollectionToolsComponent implements OnInit {
         }
       } else {//如果是想定作业编辑模式
         const dialogRef = this.dialog.open(saveOneDialog, {
-          data: {allDisposalNode: this.canvasData.allDisposalNode,
+          data: {
+            allDisposalNode: this.canvasData.allDisposalNode,
             selectedBuildingData: this.beforeOneCheckedBuilding,
             selectedSiteData: this.selectingSitePlan,
             siteOrbuilding: this.checkedBuildingIndex,
@@ -1489,16 +1490,16 @@ export class CollectionToolsComponent implements OnInit {
 
 
     //子节点跟随父节点的islook变化
-    if(node.children && node.children.length != 0){
-      node.children.forEach(item=>{
-        item.isLook = !node.isLook 
-        if(item.children && item.children.length != 0){
-          item.children.forEach(i=>{
-            i.isLook =  !node.isLook 
-          })
-        }
-      })
-     }
+    if (node.children && node.children.length != 0) {
+      node.children.forEach(item => {
+        item.isLook = !node.isLook
+        if (item.children && item.children.length != 0) {
+          item.children.forEach(i => {
+            i.isLook = !node.isLook
+          })
+        }
+      })
+    }
 
 
     const nodes = this.treeControl.dataNodes;