Browse Source

[完善]完善新增统计分析预案列表页面

zhuzhou
邵佳豪 4 years ago
parent
commit
1e7d959135
  1. 3
      src/app/external-links-plan/external-links-plan.component.ts
  2. 2
      src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.html
  3. 4
      src/app/statistic-analysis/plan-analysis-by-synthesis/plan-analysis-by-synthesis.component.ts
  4. 1
      src/app/statistic-analysis/statistic-analysis-routing.module.ts
  5. 23
      src/app/ui/collection-tools/collection-tools.component.ts

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

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

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

@ -140,7 +140,7 @@
</ng-container> </ng-container>
<ng-container matColumnDef="addtime"> <ng-container matColumnDef="addtime">
<th mat-header-cell *matHeaderCellDef>审核时间</th> <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>
<ng-container matColumnDef="plantype"> <ng-container matColumnDef="plantype">
<th mat-header-cell *matHeaderCellDef>预案类型</th> <th mat-header-cell *matHeaderCellDef>预案类型</th>

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

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

1
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_two', component: DeleteTwoComponent },
{ path: 'delete_one/delete_there', component: DeleteThereComponent }, { path: 'delete_one/delete_there', component: DeleteThereComponent },
{ path: 'delete_one/delete_four', component: DeleteFourComponent }, { path: 'delete_one/delete_four', component: DeleteFourComponent },
{ path: 'buildingType_one', component: BuildingTypeOneComponent},
{ path: 'delete_two', component: DeleteTwoComponent }, { path: 'delete_two', component: DeleteTwoComponent },
{ path: 'delete_two_newadd', component: DeleteTwoNewaddComponent }, { path: 'delete_two_newadd', component: DeleteTwoNewaddComponent },
{ path: 'delete_there', component: DeleteThereComponent }, { path: 'delete_there', component: DeleteThereComponent },

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

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

Loading…
Cancel
Save