Browse Source

[删除页面]总体完成

master
chenjingyu 4 years ago
parent
commit
7bd7c2bc2b
  1. 4
      src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html
  2. 29
      src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts
  3. 6
      src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html
  4. 4
      src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
  5. 53
      src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts
  6. 96
      src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
  7. 56
      src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss
  8. 152
      src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts
  9. 12
      src/app/statistic-analysis/statistic-analysis-routing.module.ts

4
src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.html

@ -4,6 +4,6 @@
* @Author: sueRimn
* @Date: 2020-09-02 16:15:53
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-02 16:27:59
* @LastEditTime: 2020-09-05 11:28:26
-->
<div id="indexBzt" style="width: 100%;height: 100%;"></div>
<div id="indexBzt" style="width: 100%;height: 780PX;"></div>

29
src/app/statistic-analysis/deleteUnit/delete-one/delete-one.component.ts

@ -10,6 +10,8 @@ declare var echarts: any;
export class DeleteOneComponent implements OnInit {
options:any;
indexBzt//echarts实例
constructor(private router: Router) { }
ngOnInit() {
@ -17,19 +19,24 @@ export class DeleteOneComponent implements OnInit {
this.initCharts()
},0)
}
ngOnDestroy():void{
this.indexBzt.clear()
this.indexBzt.dispose()
}
/* 首页饼状图 */
initCharts(){
//console.log(document.getElementById('indexBzt'))
var ec = echarts as any;
var indexBzt = ec.init(document.getElementById('indexBzt'));
this.indexBzt = ec.init(document.getElementById('indexBzt'));
var options={
title: {
text: '删除单位统计(8900家)',
//subtext: '纯属虚构',
padding:[120,100],
//padding:[120,100],
left: 'center',
top: "7%",
textStyle:{
fontSize:38
}
@ -52,9 +59,9 @@ export class DeleteOneComponent implements OnInit {
//padding:20,
itemWidth:60,
itemHeight:25,
textStyle:{
/* textStyle:{
fontSize:28
},
}, */
data: ['高层', '地下', '轨道交通', '化工生产', '储罐类', '厂房', '古建筑', '商市场', '医院', '学校', '宾馆', '娱乐场所', '餐饮业', '影剧院', '展览建筑', '隧道']
},
series: [
@ -64,12 +71,14 @@ export class DeleteOneComponent implements OnInit {
radius: '65%',
center: ['50%', '60%'],
label:{
normal:{
show:true,
position: 'inner',
fontSize:18,
formatter:'{c} ({d}%)'
fontSize:13,
formatter:'{b}{c}家\n{d|({d}%)}',
rich: {
d: {
align: 'center',
}
},
},
data: [
@ -100,10 +109,10 @@ export class DeleteOneComponent implements OnInit {
}
]
};
indexBzt.on('click', (params) => {
this.indexBzt.on('click', (params) => {
this.router.navigateByUrl('/statisticanalysis/delete_one/delete_two');
});
indexBzt.setOption(options);
this.indexBzt.setOption(options);
}
/**
* @name:

6
src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html

@ -4,10 +4,10 @@
* @Author: sueRimn
* @Date: 2020-09-02 16:22:35
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-04 16:19:53
* @LastEditTime: 2020-09-05 13:38:50
-->
<div class="head">
<select style="width: 80px;height: 50px; margin-left: 200px;">
<select style="width: 80px;height: 50px; margin-left: 400px;margin-top: 20px;">
<option value ="2020">2020</option>
</select>
<select style="width: 80px;height: 50px; margin-left: 50px;" >
@ -20,7 +20,7 @@
<option value ="1">7</option>
<option value ="1">8</option>
</select>
<button class="chaxun">查询</button>
<button type="submit" mat-raised-button color="primary" style="margin-left: 50px;">查询</button>
</div>
<div id="zhidui" class="zhu"></div>

4
src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss

@ -6,10 +6,6 @@
background-color:white ;
}
.chaxun{
background-color: #008CBA;
color: white;
border-radius:5px;
font-size: 16px;
margin-left: 50px;
padding: 15px 32px;
}

53
src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts

@ -4,11 +4,13 @@
* @Author: sueRimn
* @Date: 2020-09-02 16:22:35
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-05 08:58:18
* @LastEditTime: 2020-09-05 13:28:37
*/
import { Component, OnInit } from '@angular/core';
import { Router,ActivatedRoute } from '@angular/router';
import {EchartsDataService} from '../../echarts-data.service'
import {EchartsDataService} from '../../echarts-data.service';
import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar';
import { DateAdapter } from '@angular/material/core';
declare var echarts: any;
@Component({
@ -18,7 +20,12 @@ declare var echarts: any;
})
export class DeleteThereComponent implements OnInit {
constructor(private router: Router,private activatedRoute: ActivatedRoute,public echartsData:EchartsDataService) { }
constructor(private router: Router,private activatedRoute: ActivatedRoute,public echartsData:EchartsDataService,public snackBar: MatSnackBar,private adapter: DateAdapter<any>) { }
zhutu//echarts实例
ngOnDestroy():void{
this.zhutu.clear()
this.zhutu.dispose()
}
ngOnInit(): void {
let headtext:string;
@ -31,15 +38,41 @@ export class DeleteThereComponent implements OnInit {
//console.log(datayuex)
});
window.setTimeout(()=>{
this.zhuzhuangtu(headName)
this.zhuzhuangtu(this.echartsData.statefulInspectionName)
},0)
}
zhiNameData = ["浦东支队","黄埔支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70]
axisLabel = {
interval: 0,
formatter:function(value)
{
var ret = "";//拼接加\n返回的类目项
var maxLength = 2;//每项显示文字个数
var valLength = value.length;//X轴类目项的文字个数
var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
if (rowN > 1)//如果类目项的文字大于3,
{
for (var i = 0; i < rowN; i++) {
var temp = "";//每次截取的字符串
var start = i * maxLength;//开始截取的位置
var end = start + maxLength;//结束截取的位置
//这里也可以加一个是否是最后一行的判断,但是不加也没有影响,那就不加吧
temp = value.substring(start, end) + "\n";
ret += temp; //凭借最终的字符串
}
return ret;
}
else {
return value;
}
}
}//echarts两个字换行
/* 柱状图 */
zhuzhuangtu(headName:string){
var ec = echarts as any;
var zhutu = ec.init(document.getElementById('zhidui'));
this.zhutu = ec.init(document.getElementById('zhidui'));
var option = {
title: {
text: `${headName}`,
@ -49,14 +82,14 @@ export class DeleteThereComponent implements OnInit {
fontSize: 23
}
},
grid: {
/* grid: {
left: '5%',
bottom:'35%'
},
}, */
xAxis: {
type: 'category',
data: this.zhiNameData,
//axisLabel: this.axisLabel
axisLabel: this.axisLabel
},
yAxis: {
type: 'value'
@ -81,12 +114,12 @@ export class DeleteThereComponent implements OnInit {
//label: this.topTextlabel
}]
};
zhutu.on('click', (params) => {
this.zhutu.on('click', (params) => {
console.log(params)
this.echartsData.statefulInspectionName =params.name;
this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_four`);
});
zhutu.setOption(option);
this.zhutu.setOption(option);
}

96
src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html

@ -4,50 +4,74 @@
* @Author: sueRimn
* @Date: 2020-09-02 16:21:18
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-04 15:36:05
* @LastEditTime: 2020-09-05 09:57:47
-->
<body>
<div style="position: fixed; " class="daohang">
<label><input name="riqi" type="radio" value="" style="margin-left: 20px;" (click)='anyue()'/></label>
<label><input name="riqi" type="radio" value="" (click)='annian()'/></label>
<select style="width: 80px;height: 50px; margin-left: 100px;">
<option value ="2020">2020</option>
</select>
<div id="yue1">
<select style="width: 80px;height: 50px; margin-left: 50px;" >
<option value ="1">1</option>
<option value ="1">2</option>
<option value ="1">3</option>
<option value ="1">4</option>
<option value ="1">5</option>
<option value ="1">6</option>
<option value ="1">7</option>
<option value ="1">8</option>
</select>
<div class="header">
<div class="queryField" *ngIf=" echartsData.statefulInspectionToggle">
<mat-radio-group [(ngModel)]="selectType">
<mat-radio-button value="month"></mat-radio-button>
<mat-radio-button value="year" style="margin-left: 10px;"></mat-radio-button>
</mat-radio-group>
</div>
<select style="width: 80px;height: 50px; margin-left: 100px;">
<option value ="2020">2020</option>
</select>
<div id="yue2">
<select style="width: 80px;height: 50px; margin-left: 50px;" >
<option value ="1">1</option>
<option value ="1">2</option>
<option value ="1">3</option>
<option value ="1">4</option>
<option value ="1">5</option>
<option value ="1">6</option>
<option value ="1">7</option>
<option value ="1">8</option>
</select>
<div class="queryField" *ngIf="selectType=='month' && echartsData.statefulInspectionToggle">
<form #form="ngForm" (ngSubmit)="monthSubmit(form.value)">
<span>开始年份:</span>
<mat-form-field>
<mat-select [(ngModel)]="selectOneYear" name='selectOneYear'>
<mat-option *ngFor="let item of years" [value]="item">{{item}}</mat-option>
</mat-select>
</mat-form-field>
<span>开始月份:</span>
<mat-form-field>
<mat-select [(ngModel)]="selectStartMonth" name='selectStartMonth'>
<mat-option *ngFor="let item of selectMonth" [value]="item">{{item}}</mat-option>
</mat-select>
</mat-form-field>
<span>结束年份:</span>
<mat-form-field>
<mat-select [(ngModel)]="selectTwoYear" name='selectTwoYear'>
<mat-option *ngFor="let item of years" [value]="item">{{item}}</mat-option>
</mat-select>
</mat-form-field>
<span>结束月份:</span>
<mat-form-field>
<mat-select [(ngModel)]="selectEndMonth" name='selectEndMonth'>
<mat-option *ngFor="let item of selectMonth" [value]="item">{{item}}</mat-option>
</mat-select>
</mat-form-field>
<button type="submit" mat-raised-button color="primary">查询</button>
</form>
</div>
<button class="chaxun" >查询</button>
<!-- <button type="button" class="button" style="margin-left: 500px;">按区间查询</button>
<button type="button" class="button" style="margin-left: 10px;" >年查询</button> -->
<div class="queryField" *ngIf="selectType=='year' && echartsData.statefulInspectionToggle">
<form #form2="ngForm" (ngSubmit)="yearSubmit(form2.value)">
<span>开始年份:</span>
<mat-form-field>
<mat-select [(ngModel)]="selectStartYear" name='selectStartYear'>
<mat-option *ngFor="let item of years" [value]="item">{{item}}</mat-option>
</mat-select>
</mat-form-field>
<span>结束年份:</span>
<mat-form-field>
<mat-select [(ngModel)]="selectEndYear" name='selectEndYear'>
<mat-option *ngFor="let item of years" [value]="item">{{item}}</mat-option>
</mat-select>
</mat-form-field>
<button type="submit" mat-raised-button color="primary">查询</button>
</form>
</div>
<!-- <div class="fixedCss">
<button mat-raised-button (click)='goBack()' *ngIf="!echartsData.statefulInspectionToggle">返回</button>
</div> -->
</div>
<div class="head" id="head"></div>
<div class="heads" id="heads"></div>
<section class="mainbox">
<div class="column">
<div class="panel bar" id="leftOne">

56
src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss

@ -1,30 +1,46 @@
body{
overflow:auto;
}
.daohang{
//头部搜索栏
.header {
border-bottom: 1px solid #999;
height: 70px;
min-height: 70px;
box-sizing: border-box;
padding: 0 15px;
display: flex;
z-index: 5;
border-bottom:2px solid #d4dde4;
width: 100%;
height: 180px;
background-color:white ;
flex-direction: row;
flex-wrap: wrap;
align-items:center;
justify-content:center;
.queryField {
margin: 0 10px;
font-size: 14px;
.mat-form-field {
width: 130px;
max-height: 50px;;
margin: 0 15px 0 10px;
}
.chaxun{
background-color: #008CBA;
color: white;
border-radius:5px;
//font-size: 16px;
margin-left: 50px;
}
.head{
/* .fixedCss{
position: fixed;
top: 81px;
right: 32px;
} */
}
/* 最上面的折线图 */
.heads{
text-align:center;
margin:0 auto;
width: 900px;
height: 400px;
padding-top: 250px;
width: 800px;
height: 450px;
padding-top: 50px;
}
/* 其余折线图 */
.mainbox {
margin-top: 100px;
//padding-top: 50px;
padding-bottom: 50px;
min-width: 1024px;
max-width: 1920px;
@ -37,10 +53,12 @@ body{
}
.panel {
position: relative;
height: 400px;
border: 1px solid rgba(25, 186, 139, 0.17);
height: 330px;
width:780px;
//border: 1px solid rgba(25, 186, 139, 0.17);
padding: 0 0.1875rem 0.5rem;
margin-bottom: 0.1875rem;
margin-top: 80px;
&::before {
position: absolute;
top: 0;

152
src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts

@ -4,12 +4,14 @@
* @Author: sueRimn
* @Date: 2020-09-02 16:21:18
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-04 16:58:01
* @LastEditTime: 2020-09-05 13:43:02
*/
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { MatDatepickerInputEvent } from '@angular/material/datepicker';
import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar';
import { DateAdapter } from '@angular/material/core';
import {EchartsDataService} from '../../echarts-data.service'
declare var echarts: any;
@Component({
@ -21,14 +23,19 @@ export class DeleteTwoComponent implements OnInit {
options:any;
datayuex=['一月', '二月', '三月', '四月', '五月', '六月', '七月','八月'];
datayuey=[210, 160, 150, 140, 130, 120, 110,120];
datanianx=[2019,2020,2021];
datanianx=[2019,2020];
dataniany=[201,174]
constructor(private router: Router,public snackBar: MatSnackBar) { }
constructor(private router: Router,public snackBar: MatSnackBar,private adapter: DateAdapter<any>,public echartsData:EchartsDataService) { }
/* @ViewChild('appEcharts')appEcharts :echartsComponent; //
@ViewChild('pageTwoName')pageTwoName :PageTwoNameComponent; //父组件中获得子组件的引用 */
ngOnInit(): void {
this.dateInit()
window.setTimeout(()=>{
this.headZhexian('head','删除数量总统计',this.datayuex,this.datayuey)
console.log(this.selectType)
if(this.selectType=='month'){
this.headZhexian('heads','删除数量总统计',this.datayuex,this.datayuey)
this.headZhexian('leftOne','高层',this.datayuex,this.datayuey)
this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey)
this.headZhexian('leftThere','储罐类',this.datayuex,this.datayuey)
@ -37,15 +44,48 @@ export class DeleteTwoComponent implements OnInit {
this.headZhexian('rightTwo','化工生产',this.datayuex,this.datayuey)
this.headZhexian('rightThree','厂房',this.datayuex,this.datayuey)
this.headZhexian('rightFour','商市场',this.datayuex,this.datayuey)
}
/* else if(this.selectType=='year'){
this.headZhexian('heads','删除数量总统计',this.datanianx,this.dataniany)
this.headZhexian('leftOne','高层',this.datayuex,this.datayuey)
this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey)
this.headZhexian('leftThere','储罐类',this.datayuex,this.datayuey)
this.headZhexian('leftFour','古建筑',this.datayuex,this.datayuey)
this.headZhexian('rightOne','地下',this.datayuex,this.datayuey)
this.headZhexian('rightTwo','化工生产',this.datayuex,this.datayuey)
this.headZhexian('rightThree','厂房',this.datayuex,this.datayuey)
this.headZhexian('rightFour','商市场',this.datayuex,this.datayuey)
} */
},0)
}
/* 按月点击事件 */
anyue(){
var anyue1 = document.getElementById('yue1');
anyue1.style.display='block';
var anyue2 = document.getElementById('yue2');
anyue2.style.display='block';
this.headZhexian('head','删除数量总统计',this.datayuex,this.datayuey)
ngOnDestroy():void{
this.headZx.clear()
this.headZx.dispose()
}
selectType:string = 'month'; //选择当前的 查询类型 按月/年
headZx//echarts实例
//查询数据
years:any = []
selectMonth:any = [1,2,3,4,5,6,7,8,9,10,11,12]
//日期初始化
dateInit () {
let date = (new Date()).getFullYear()
for (let i=date; i>=date-10;i--) {
this.years.unshift(i)
}
}
selectOneYear:any = (new Date()).getFullYear() //开始年份
selectTwoYear:any = (new Date()).getFullYear() //结束年份
selectStartMonth:any = 1 //开始月份
selectEndMonth:any = (new Date()).getMonth()+1 //结束月份
//按月查询
monthSubmit (e) {
this.headZhexian('heads','删除数量总统计',this.datayuex,this.datayuey)
this.headZhexian('leftOne','高层',this.datayuex,this.datayuey)
this.headZhexian('leftTwo','轨道交通',this.datayuex,this.datayuey)
this.headZhexian('leftThere','储罐类',this.datayuex,this.datayuey)
@ -54,14 +94,39 @@ export class DeleteTwoComponent implements OnInit {
this.headZhexian('rightTwo','化工生产',this.datayuex,this.datayuey)
this.headZhexian('rightThree','厂房',this.datayuex,this.datayuey)
this.headZhexian('rightFour','商市场',this.datayuex,this.datayuey)
if (e.selectTwoYear > e.selectOneYear) {
let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime)
console.log(endTime)
} else if (e.selectTwoYear === e.selectOneYear) {
if(e.selectEndMonth >= e.selectStartMonth) {
let startTime = e.selectOneYear + '-' + e.selectStartMonth + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectTwoYear + '-' + e.selectEndMonth + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime)
console.log(endTime)
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('请选择正确时间区段','确定',config);
}
}else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('请选择正确时间区段','确定',config);
}
}
/* 按年点击事件 */
annian(){
var anyue1 = document.getElementById('yue1');
anyue1.style.display='none';
var anyue2 = document.getElementById('yue2');
anyue2.style.display='none';
this.headZhexian('head','删除数量总统计',this.datanianx,this.dataniany)
selectStartYear:any = (new Date()).getFullYear() //开始年份
selectEndYear:any = (new Date()).getFullYear() //结束年份
//按年查询
yearSubmit (e) {
console.log(this.selectType)
this.headZhexian('heads','删除数量总统计',this.datanianx,this.dataniany)
this.headZhexian('leftOne','高层',this.datanianx,this.dataniany)
this.headZhexian('leftTwo','轨道交通',this.datanianx,this.dataniany)
this.headZhexian('leftThere','储罐类',this.datanianx,this.dataniany)
@ -70,22 +135,49 @@ export class DeleteTwoComponent implements OnInit {
this.headZhexian('rightTwo','化工生产',this.datanianx,this.dataniany)
this.headZhexian('rightThree','厂房',this.datanianx,this.dataniany)
this.headZhexian('rightFour','商市场',this.datanianx,this.dataniany)
if (e.selectEndYear >= e.selectStartYear) {
let startTime = e.selectStartYear + '-' + 1 + '-' + 1 + ' ' + 0 + ':' + 0 +':'+ 0
let endTime = e.selectEndYear + '-' + 12 + '-' + 31 + ' ' + 23 + ':' + 59 +':'+ 59
console.log(startTime)
console.log(endTime)
} else {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('请选择正确时间区段','确定',config);
}
}
/* 折线图 */
headZhexian(divid:string,headtext:string,datayuex,datayuey){
var ec = echarts as any;
var headZx = ec.init(document.getElementById(`${divid}`));
this.headZx = ec.init(document.getElementById(`${divid}`),'skinUpp');
var options = {
grid: {
top: 50,
left:40,
right: 20,
bottom: 20,
},
// 标题
title: {
text: `${headtext}`,
left:350,
left:'center',
top: -4,
//副标题文本样式
 subtextStyle:{
color:'#999',
fontWeight:'bold',
},
textStyle:{
fontSize:28
//文字颜色
color:'#000',
fontSize: 22,
}
},
//提示框
tooltip: {
trigger: 'item',
trigger: 'axis',
formatter: (params)=>{
return this.biaogeTishi(`${headtext}`)
} ,
@ -95,7 +187,7 @@ export class DeleteTwoComponent implements OnInit {
},
xAxis: {
type: 'category',
boundaryGap:false,
boundaryGap:true,
data: datayuex,
axisLabel: {
color: "#000", //刻度线标签颜色
@ -128,9 +220,10 @@ export class DeleteTwoComponent implements OnInit {
series: [{
data: datayuey,
type: 'line',
lineStyle:{
/* lineStyle:{
color:'#1369bf'
},
}, */
/* markLine: {
symbol: ['none', 'none'],
label: {show: false},
@ -150,11 +243,12 @@ export class DeleteTwoComponent implements OnInit {
}, */
}]
};
headZx.on('click', (params) => {
this.headZx.on('click', (params) => {
console.log(params)
this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there/${headtext}/${params.name}`);
this.echartsData.statefulInspectionName =params.name+headtext;
this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`);
});
headZx.setOption(options);
this.headZx.setOption(options);
}
/**
* @name:

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

@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-09-02 16:57:00
* @LastEditors: sueRimn
* @LastEditTime: 2020-09-04 15:55:53
* @LastEditTime: 2020-09-05 11:37:39
*/
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
@ -17,9 +17,7 @@ import { DeleteTwoComponent } from './deleteUnit/delete-two/delete-two.component
import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.component';
import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component';
import { BuildingTypeOneComponent } from './buildingType/building-type-one/building-type-one.component';
<<<<<<< HEAD
import { from } from 'rxjs';
=======
import {ScheduledUpdatesComponent,publicEchartsComponent} from './scheduled-updates/scheduled-updates.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';
@ -28,19 +26,16 @@ import { AddUnitOneComponent } from './addUnit/add-unit-one/add-unit-one.compone
import { AddUnitTwoTypeStatisticsComponent } from './addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component';
import { AddUnitTwoTypeDetailsComponent } from './addUnit/add-unit-two-type-details/add-unit-two-type-details.component';
import { AddUnitTwoTimeComponent } from './addUnit/add-unit-two-time/add-unit-two-time.component';
>>>>>>> 2560a38cd9b2082ee37f8e753dd5c31d0d789085
const routes: Routes = [
{ path: 'statePageOne', component: PageOneComponent},
{ path: 'statePageTwo_time', component: PageTwoTimeComponent},
{ path: 'delete_one', component: DeleteOneComponent},
<<<<<<< HEAD
{ path: 'delete_one/delete_two', component: DeleteTwoComponent},
{ path: 'delete_one/delete_there/:headtext/:datayuex', component: DeleteThereComponent},
{ path: 'delete_one/delete_there', component: DeleteThereComponent},
{ 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_there', component: DeleteThereComponent},
{ path: 'delete_four', component: DeleteFourComponent},
@ -54,7 +49,6 @@ const routes: Routes = [
{ path: 'addUnit_one/addUnit_two_time', component: AddUnitTwoTimeComponent},
{ path: 'scheduledUpdates', component: ScheduledUpdatesComponent},
{ path: 'scheduledUpdates/PublicEcharts', component: publicEchartsComponent}
>>>>>>> 2560a38cd9b2082ee37f8e753dd5c31d0d789085
];
@NgModule({

Loading…
Cancel
Save