shaojiahao
/
ShangHai-YuAn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[完善] 首页,部分页面 布局优化

master
陈鹏飞 4 years ago
parent
742863bc65
commit
e0ce7cdd8d
7 changed files with 13 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.html
  2. 2
      src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html
  3. 2
      src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html
  4. 14
      src/app/statistic-analysis/home/home.component.html
  5. 2
      src/app/statistic-analysis/state/page-one/page-one.component.html
  6. 2
      src/app/statistic-analysis/state/page-one/page-one.component.ts
  7. 4
      src/app/statistic-analysis/statistic-analysis-routing.module.ts

2
src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.html
Unescape View File

@ -1,4 +1,4 @@
<body> <body>
<!--饼状图 --> <!--饼状图 -->
<div id="indexBzt" style="width: 100%;height: 100%;"></div> <div id="indexBzt" style="width: 100%;height: 93%;"></div>
</body> </body>

2
src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.html
Unescape View File

@ -1,4 +1,4 @@
<body> <body>
<!--饼状图 --> <!--饼状图 -->
<div id="indexBzt" style="width: 100%;height: 100%;"></div> <div id="indexBzt" style="width: 100%;height: 93%;"></div>
</body> </body>

2
src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html
Unescape View File

@ -6,4 +6,4 @@
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2020-09-05 11:28:26 * @LastEditTime: 2020-09-05 11:28:26
--> -->
<div id="indexBzt" style="width: 100%;height: 780PX;"></div> <div id="indexBzt" style="width: 100%;height: 93%;"></div>

14
src/app/statistic-analysis/home/home.component.html
Unescape View File

@ -2,7 +2,7 @@
<div class="main-top"> <div class="main-top">
<!-- 左侧 --> <!-- 左侧 -->
<div class="main-left"> <div class="main-left">
<div class="panel panel04" style="flex: auto;"> <div class="panel panel04" style="flex: 100%; max-height: 400px;">
<div class="panel-hd"> <div class="panel-hd">
<a href="javascript:;" class="panel-more"><svg width="18" height="12" xmlns="http://www.w3.org/2000/svg"><g fill="#93FCFF" fill-rule="evenodd" opacity=".6"><path d="M0 0h18v2H0zM0 5h18v2H0zM0 10h18v2H0z"/></g></svg></a> <a href="javascript:;" class="panel-more"><svg width="18" height="12" xmlns="http://www.w3.org/2000/svg"><g fill="#93FCFF" fill-rule="evenodd" opacity=".6"><path d="M0 0h18v2H0zM0 5h18v2H0zM0 10h18v2H0z"/></g></svg></a>
</div> </div>
@ -10,11 +10,11 @@
<div id="chartHynyxf" class="chart-item"></div> <div id="chartHynyxf" class="chart-item"></div>
</div> </div>
</div> </div>
<div class="box-wrap mt"> <div class="box-wrap mt" style="flex: 0; height: 150px;">
<div class="panel-hd"> <div class="panel-hd" style="padding-top: 0px;">
<div class="panel-tit" style="color: white;">计划完成情况</div> <div class="panel-tit" style="color: white;">计划完成情况</div>
</div> </div>
<div class="panel-bd"> <div class="panel-bd" style="padding-top: 3px;">
<div class="progress-list"> <div class="progress-list">
<div class="progress-item"> <div class="progress-item">
<div class="progress-name">本年时间进度</div> <div class="progress-name">本年时间进度</div>
@ -80,8 +80,8 @@
</div> </div>
<!-- 右侧 --> <!-- 右侧 -->
<div class="main-right"> <div class="main-right">
<div class="box-wrap" style="height: 100px;flex: 0.7;"> <div class="box-wrap" style="flex: 0; height: 150px;">
<div class="panel-bd" style="padding-top: 5px;"> <div class="panel-bd" style="padding-top: 13px;">
<div class="total-box"> <div class="total-box">
<div class="total-item" (click)="threePlan()"> <div class="total-item" (click)="threePlan()">
<div class="total-name">三维预案总数</div> <div class="total-name">三维预案总数</div>
@ -102,7 +102,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="box-wrap mt" style="flex: auto;max-height: 340px;margin-top: 0;"> <div class="box-wrap mt" style="flex: 100%; max-height: 400px;">
<div class="panel-bd"> <div class="panel-bd">
<div id="chartZdgzqy" class="chart-item" style="height: 100%;"></div> <div id="chartZdgzqy" class="chart-item" style="height: 100%;"></div>
</div> </div>

2
src/app/statistic-analysis/state/page-one/page-one.component.html
Unescape View File

@ -9,7 +9,7 @@
<body> <body>
<!--饼状图 --> <!--饼状图 -->
<div id="indexBzt" style="width: 100%;height: 100%;"></div> <div id="indexBzt" style="width: 100%;height: 93%;"></div>
</body> </body>

2
src/app/statistic-analysis/state/page-one/page-one.component.ts
Unescape View File

@ -102,7 +102,7 @@ export class PageOneComponent implements OnInit {
] ]
}; };
this.indexBzt.on('click', (params) => { this.indexBzt.on('click', (params) => {
this.router.navigateByUrl('/statisticanalysis/statePageTwo_time'); this.router.navigateByUrl('/statisticanalysis/statePageOne/time');
}); });
this.indexBzt.setOption(options); this.indexBzt.setOption(options);
} }

4
src/app/statistic-analysis/statistic-analysis-routing.module.ts
Unescape View File

@ -17,7 +17,6 @@ import { DeleteTwoComponent } from './deleteUnit/delete-two/delete-two.component
import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.component'; import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.component';
import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component'; import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component';
import { BuildingTypeOneComponent } from './buildingType/building-type-one/building-type-one.component'; import { BuildingTypeOneComponent } from './buildingType/building-type-one/building-type-one.component';
import { from } from 'rxjs';
import {ScheduledUpdatesComponent,publicEchartsComponent} from './scheduled-updates/scheduled-updates.component' import {ScheduledUpdatesComponent,publicEchartsComponent} from './scheduled-updates/scheduled-updates.component'
import { BuildingTypeTwoForwardComponent } from './buildingType/building-type-two-forward/building-type-two-forward.component'; import { BuildingTypeTwoForwardComponent } from './buildingType/building-type-two-forward/building-type-two-forward.component';
import { BuildingTypeTwoReverseComponent } from './buildingType/building-type-two-reverse/building-type-two-reverse.component'; import { BuildingTypeTwoReverseComponent } from './buildingType/building-type-two-reverse/building-type-two-reverse.component';
@ -33,13 +32,12 @@ import { HomeComponent } from './home/home.component';
const routes: Routes = [ const routes: Routes = [
{ path: 'statePageOne', component: PageOneComponent}, { path: 'statePageOne', component: PageOneComponent},
{ path: 'statePageTwo_time', component: PageTwoTimeComponent}, { path: 'statePageOne/time', component: PageTwoTimeComponent},
{ path: 'delete_one', component: DeleteOneComponent}, { path: 'delete_one', component: DeleteOneComponent},
{ 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: 'buildingType_one', component: BuildingTypeOneComponent},
//{ path: 'delete_one/deleteUnit_two_type', component: DeleteTwoComponent}
{ path: 'delete_two', component: DeleteTwoComponent}, { path: 'delete_two', component: DeleteTwoComponent},
{ path: 'delete_there', component: DeleteThereComponent}, { path: 'delete_there', component: DeleteThereComponent},
{ path: 'delete_four', component: DeleteFourComponent}, { path: 'delete_four', component: DeleteFourComponent},

Write Preview
Loading…
Cancel
Save