[修改]统计分析时间查询跳转报错以及系统管理放开电话姓名等权限

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

@@ -1599,6 +1599,7 @@ export class ChangeUrl{
     this.dialogRef.close();
   }
   onSubmit(value) {
+    console.log(value)
     let headers = new HttpHeaders({
       'Content-Type': 'text/json'
     });
@@ -1606,7 +1607,7 @@ export class ChangeUrl{
       headers
     };
     let body = {
-      url: value.url,
+      url: value.name,
       auditStatus:8
     }
       this.http.put(`/api/PlanComponents/${this.data.element.id}`, body, options).subscribe(data => {

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

@@ -205,7 +205,7 @@ export class AddUnitOneComponent implements OnInit {
         countall+=this.tishiData[i].count
       }
       this.res= '<div class="tishi" style=" backgroundColor:rgba(255,255,255,1);width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span style="color:#FFFFFF;font-size:27px;text-align: center;display:block;">'+datas.name+'</span></div>'
-      this.res+='</br><div style="width:300px;height:100%;padding:0 20px 15px 20px"><table style="width:300px;font-size:16px;  color:#FFFFFF;border-collapse:collapse;"cellspacing="0"; >';
+      this.res+='</br><div style="width:300px;height:100%;padding:0 20px 15px 20px"><table style="width:300px;font-size:14px;  color:#FFFFFF;border-collapse:collapse;"cellspacing="0"; >';
       this.res+='<thead style="font-size:18px;"><tr>';
       this.res+='<td style="text-align:center;width:30%;">名称</td>';
       this.res+='<td style="text-align:center;width:30%;">数量</td>'

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

@@ -138,7 +138,7 @@ export class AddUnitTwoTimeComponent implements OnInit {
       let endTime = e.selectEndYear + '-' + 12  + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
       for(var i=0;i<this.tabledata[0].length;i++){
         if(this.tabledata[0][i].year>=e.selectStartYear&&this.tabledata[0][i].year<=e.selectEndYear){
-          this.date2.push(this.tabledata[0][i].month)
+          this.date2.push(this.tabledata[0][i].year)
           this.dateNum2.push(this.tabledata[0][i].count)
           this.zongcount=this.zongcount+this.tabledata[0][i].count
         }

src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts

@@ -442,10 +442,11 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit {
       item.echart.setOption(option);
       item.echart.getZr().on('click',  (params) => {
         const pointInPixel= [params.offsetX, params.offsetY];
+        console.log(this.data.level)
         if (item.echart.containPixel('grid',pointInPixel)){
           let xIndex=item.echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
           if(this.zhiorbuild=='zhi'){
-            if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].buildingTypes[xIndex].organizations.length>1){
+            if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].buildingTypes[xIndex].organizations.length>=1){
               //总队，支队跳转
               this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_typeDetails'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'id':this.lastId,'zhuId':option.xAxis.id[xIndex],'type':this.zhiorbuild=='zhi'?'zhi':'build'}})
             }

src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts

@@ -517,7 +517,7 @@ export class verifiedComponent implements OnInit {
   tishiData
   res
   tableTooltip(datas){
-    this.tishiData=this.tabledata[0].items[0].organizations
+    this.tishiData=this.echartsData.zhiorBuinding=='zhi'? this.tabledata[0].items[0].organizations:this.tabledata[0].items[0].buildingTypes
     var countall=0//总计
     var countbi=0//站比
     var allCountbi=0//总站比
@@ -655,11 +655,11 @@ export class verifiedComponent implements OnInit {
           this.echartsData.findShow=false
           //this.echartsData.scheduledUpdatesToggle = -2
           
-          if(this.echartsData.level=='0'&&this.tabledata[0].items[xIndex].organizations.length>=1){
+          if(this.echartsData.level=='0'&&this.tabledata[0].items[xIndex].buildingTypes.length>=1){
             this.echartsData.scheduledUpdatesToggle = 2
             //this.echartsData.time=xIndex
             //this.router.navigateByUrl(`/statisticanalysis/scheduledUpdates/PublicEcharts?type=${this.route.snapshot.queryParams.type}&TimeType=${this.TimeType}`);
-          }else if(this.echartsData.level=='1' &&this.tabledata[0].items[xIndex].organizations.length>=1){
+          }else if(this.echartsData.level=='1' &&this.tabledata[0].items[xIndex].buildingTypes.length>=1){
             this.echartsData.scheduledUpdatesToggle = 2//原来是3
           }
         }else{
@@ -865,12 +865,22 @@ export class yueDateComponent implements OnInit {
         this.zhiNameData=[]
         this.ynum=[]
         this.organizationId=[]
-        this.tabledata[0].items[0].organizations.forEach(element => {
-          this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName)
-          this.ynum.push(element.count)
-          this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId)
-          //this.ydatayue.push(element.count)
-        });
+        if(this.echartsData.zhiorBuinding=='zhi'){
+          this.tabledata[0].items[0].organizations.forEach(element => {
+            this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName)
+            this.ynum.push(element.count)
+            this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId)
+            //this.ydatayue.push(element.count)
+          });
+        }else{
+          this.tabledata[0].items[0].buildingTypes.forEach(element => {
+            this.zhiNameData.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationName:element.buildingTypeName)
+            this.ynum.push(element.count)
+            this.organizationId.push(this.echartsData.zhiorBuinding=='zhi'? element.organizationId:element.buildingTypeId)
+            //this.ydatayue.push(element.count)
+          });
+        }
+        
       this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.ynum,this.zhiNameData)
       this.twoInit()
     }else{
@@ -932,7 +942,7 @@ export class yueDateComponent implements OnInit {
       this.oneEcharts = echarts.init(document.getElementById("center"), 'skinUpp');
       var option = {
         title: {
-          text:this.router.snapshot.queryParams.pieid=='pieTwo'?'': this.echartsData.scheduledUpdatesXName+`已核查总数:(${this.tabledata[0].totalCount})`,
+          text:this.router.snapshot.queryParams.pieid=='pieTwo'?`已核查总数:(${this.tabledata[0].totalCount})`: this.echartsData.scheduledUpdatesXName+`已核查总数:(${this.tabledata[0].totalCount})`,
           top: -4,
           left: '35%',
           textStyle:{

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

@@ -109,13 +109,13 @@ export class PageOneComponent implements OnInit {
         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})
+          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})
+          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})
+          this.planStatusesData.push({name:'预案编制',value:array[index].count,type:2,planStatusName:array[index].planStatusName})
         }
       });
     }

src/app/ui/usermanagement/editUser.html

@@ -11,13 +11,13 @@
 
     <div mat-dialog-content>
       <mat-form-field>
-        <input type="text" pattern="^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$" matInput required [(ngModel)]="identityCard" name="identityCard" placeholder="身份证号码">
+        <input type="text"  matInput  [(ngModel)]="identityCard" name="identityCard" placeholder="身份证号码">
       </mat-form-field>
     </div>
 
     <div mat-dialog-content>
       <mat-form-field>
-        <input type="text" matInput required [(ngModel)]="realName" name="user"  placeholder="真实姓名">
+        <input type="text" matInput  [(ngModel)]="realName" name="user"  placeholder="真实姓名">
       </mat-form-field>
     </div>
 
@@ -29,7 +29,7 @@
 
     <div mat-dialog-content>
       <mat-form-field>
-        <input type="tel" matInput pattern="^(?:\+?86)?1(?:3\d{3}|5[^4\D]\d{2}|8\d{3}|7(?:[0-35-9]\d{2}|4(?:0\d|1[0-2]|9\d))|9[0-35-9]\d{2}|6[2567]\d{2}|4(?:[14]0\d{3}|[68]\d{4}|[579]\d{2}))\d{6}$"
+        <input type="tel" matInput 
         [(ngModel)]="phone" name="phone" placeholder="联系电话">
       </mat-form-field>
     </div>