+
+
+
+
公告:
@@ -18,7 +22,7 @@
-
+
diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html
index db41099..d1c0b0b 100644
--- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html
+++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html
@@ -4,13 +4,13 @@
* @Author: sueRimn
* @Date: 2020-11-03 10:19:24
* @LastEditors: sueRimn
- * @LastEditTime: 2020-11-11 09:01:21
+ * @LastEditTime: 2020-11-14 15:54:22
-->
-
+
+
';
+ res+='
'
+ return res
+ }
oneInit () {
this.oneEcharts = echarts.init(document.getElementById('center'),'walden');
@@ -273,7 +316,7 @@ export class verifiedComponent implements OnInit {
borderWidth:'1',
borderRadius :'0', */
formatter: (params)=>{
- return this.echartsData.tableTooltip(this.echartsData.tableDataZhi,params[0].name)
+ return this.echartsData.zhiorBuinding=="zhi"?this.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.tableTooltip(this.echartsData.buildingType,params[0].name)
},
position:this.echartsData.tableTooltipNoShow2
},
@@ -343,8 +386,10 @@ export class verifiedComponent implements OnInit {
/*事件处理代码书写位置*/
this.echartsData.scheduledUpdatesType = 0
//this.echartsData.scheduledUpdatesName = "ff"
- this.echartsData.scheduledUpdatesToggle = 2
+ this.echartsData.zhiorBuinding=="zhi"?this.echartsData.scheduledUpdatesToggle = 2:this.echartsData.scheduledUpdatesToggle = -2
+ //this.echartsData.scheduledUpdatesToggle = 2
this.echartsData.scheduledUpdatesXName=option.xAxis.data[xIndex]
+ this.echartsData.findShow=false
}
});
@@ -607,7 +652,7 @@ export class notVerifiedComponent implements OnInit {
}
-//核查具体月份组件
+//支队核查具体月份组件
@Component({
selector: 'app-yueDate',
templateUrl: './yueDate.html',
@@ -632,6 +677,8 @@ export class yueDateComponent implements OnInit {
this.oneEcharts.dispose()
this.oneEcharts.clear()
}
+ zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
+ buildingData=["高层","地下","轨道交通","化工生产","储罐类","厂房","古建筑","商市场","医院","学校","宾馆","娱乐场所","餐饮业","影剧院","展览建筑","隧道"]
oneEcharts:any;
twoInit () {
@@ -664,13 +711,14 @@ export class yueDateComponent implements OnInit {
color:'#000000'
},
color: "#000", //刻度线标签颜色
+ interval: 0
},
//设置坐标轴字体颜色和宽度
axisLine: {
lineStyle: {color: "#000",}
},
type: 'category',
- data: ['浦东支队','黄浦支队','徐汇支队','长宁支队','静安支队','普陀支队','虹口支队','杨浦支队','闵行支队','宝山支队','嘉定支队','崇明支队','金山支队'],
+ data:this.zhiNameData,
axisPointer: {type: 'shadow'}
}],
yAxis: [
@@ -709,30 +757,66 @@ export class yueDateComponent implements OnInit {
name: this.echartsData.zhuXname[1],
type: 'bar',
stack: '总数',
- data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45],
+ data: this.echartsData.zhiorBuinding=="zhi"?[68, 56, 69, 57, 23, 79, 78, 66, 49, 34, 49, 78, 45,78]:[68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45, 49, 78, 45],
barWidth :'38',
},
{
name: this.echartsData.zhuXname[2],
type: 'bar',
stack: '总数',
- data: [39, 3, 4, 7, 3, 2, 3, 4, 29, 40, 40, 2, 4],
+ data: this.echartsData.zhiorBuinding=="zhi"?[39, 3, 4, 7, 3, 2, 3, 4, 29, 40, 40, 2, 4,2]:[39, 3, 4, 7, 3, 2, 3, 4, 29, 40, 40, 2, 4,40,2,4],
itemStyle:{color: '#626c91'}
},
{
name: this.echartsData.zhuXname[3],
type: 'bar',
stack: '总数',
- data: [48, 2, 3, 3, 4, 3, 2, 26, 4, 3, 3, 24, 14],
+ data: this.echartsData.zhiorBuinding=="zhi"?[48, 2, 3, 3, 4, 3, 2, 26, 4, 3, 3, 24, 14,24]:[48, 2, 3, 3, 4, 3, 2, 26, 4, 3, 3, 24, 14,3,22,4],
itemStyle:{color:'#c4ebad'}
},
{
name: this.echartsData.zhuXname[0],
type: 'line',
// yAxisIndex: 1,
- data: [49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37],
+ data: this.echartsData.zhiorBuinding=="zhi"?[49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37,43]:[49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37,41,43,7],
itemStyle:{color: '#FFDC35'}
},
+ {
+ //name: '与上个月环比',
+ type: 'line',
+ // yAxisIndex: 1,
+ data: [45, 39, 50, 40, 40, 38, 41, 36, 30,32, 36, 38, 30,36],
+ //itemStyle:{color: '#6be6c1'},
+
+ },
+ {
+ //name: '警报',
+ type: 'effectScatter',
+ //coordinateSystem: 'cartesian2d',
+ data: [[4,40]],
+ symbolSize:30,
+ itemStyle: {
+ normal: {
+ color: 'red',
+ shadowBlur: 10,
+ shadowColor: '#333'
+ }
+ },
+ /* showEffectOn: 'render',
+ rippleEffect: {
+ brushType: 'stroke'
+ },
+ hoverAnimation: true,
+ itemStyle: {
+ normal: {
+ color: 'red',
+ shadowBlur: 10,
+ shadowColor: '#333'
+ }
+ },
+ zlevel: 1 */
+ },
+
/* {
name: '平均值2倍',
type: 'line',
@@ -780,6 +864,181 @@ export class yueDateComponent implements OnInit {
}
+//建筑类型核查具体月份组件
+@Component({
+ selector: 'app-yuebuildingDate',
+ templateUrl: './yuebuildingDate.html',
+ styleUrls: ['../state/page-two-time/page-two-time.component.scss']
+})
+export class yuebuildingDateComponent implements OnInit {
+
+ constructor(public router: ActivatedRoute,public echartsData:EchartsDataService,public route:Router) { }
+
+ level:string;
+ ngOnInit(): void {
+ this.router.queryParams.subscribe(param=>{
+ this.level=param.level
+ });
+
+ window.setTimeout(()=>{
+ this.twoInit()
+ },0)
+ }
+
+ ngOnDestroy () {
+ this.oneEcharts.dispose()
+ this.oneEcharts.clear()
+ }
+ zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
+ buildingData=["高层","地下","轨道交通","化工生产","储罐类","厂房","古建筑","商市场","医院","学校","宾馆","娱乐场所","餐饮业","影剧院","展览建筑","隧道"]
+
+ oneEcharts:any;
+ twoInit () {
+ this.oneEcharts = echarts.init(document.getElementById("center"), 'skinUpp');
+ var option = {
+ title: {
+ text: this.echartsData.scheduledUpdatesXName+'已核查总数:(500)',
+ top: -4,
+ left: '35%',
+ textStyle:{
+ color:'#000',
+ fontSize: 30,
+ }
+ },
+ //提示框
+ tooltip: {
+ trigger: 'axis',
+ textStyle:{
+ fontSize :18
+ }
+ },
+ legend: {
+ data: this.echartsData.zhuXname,
+ textStyle: { fontSize :16,color: '#000' }
+ },
+ xAxis: [{
+ axisLabel: {
+ textStyle:{
+ fontSize :18,
+ color:'#000000'
+ },
+ color: "#000", //刻度线标签颜色
+ interval: 0
+ },
+ //设置坐标轴字体颜色和宽度
+ axisLine: {
+ lineStyle: {color: "#000",}
+ },
+ type: 'category',
+ data:this.buildingData,
+ axisPointer: {type: 'shadow'}
+ }],
+ yAxis: [
+ {
+ //设置坐标轴字体颜色和宽度
+ axisLine: {
+ lineStyle:{
+ color:'#000000'
+ }
+ },
+ type: 'value',
+ axisLabel: {
+ textStyle:{
+ fontSize :18,
+ color:'#000000'
+ },
+ color: "#000", //刻度线标签颜色
+ formatter: '{value}'
+ }
+ },
+ // {
+ // //设置坐标轴字体颜色和宽度
+ // axisLine: {
+ // lineStyle: {color: "#000"},
+ // },
+ // type: 'value',
+ // name: '个',
+ // axisLabel: {
+ // color: "#000", //刻度线标签颜色
+ // formatter: '{value}'
+ // }
+ // }
+ ],
+ series: [
+ {
+ name: this.echartsData.zhuXname[1],
+ type: 'bar',
+ stack: '总数',
+ data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45, 49, 78, 45],
+ barWidth :'38',
+ },
+ {
+ name: this.echartsData.zhuXname[2],
+ type: 'bar',
+ stack: '总数',
+ data: [39, 3, 4, 7, 3, 2, 3, 4, 29, 40, 40, 2, 4,40,2,4],
+ itemStyle:{color: '#626c91'}
+ },
+ {
+ name: this.echartsData.zhuXname[3],
+ type: 'bar',
+ stack: '总数',
+ data:[48, 2, 3, 3, 4, 3, 2, 26, 4, 3, 3, 24, 14,3,22,4],
+ itemStyle:{color:'#c4ebad'}
+ },
+ {
+ name: this.echartsData.zhuXname[0],
+ type: 'line',
+ // yAxisIndex: 1,
+ data: [49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37,41,43,7],
+ itemStyle:{color: '#FFDC35'}
+ },
+ /* {
+ name: '平均值2倍',
+ type: 'line',
+ // yAxisIndex: 1,
+ data: [98, 90, 106, 94, 98, 86, 96, 82, 76, 78, 82, 86, 74],
+ itemStyle:{color: '#6be6c1'}
+ },
+ {
+ name: '平均值3倍',
+ type: 'line',
+ // yAxisIndex: 1,
+ data: [143, 135, 159, 143, 127, 144, 144, 123, 114, 117, 124, 129, 111],
+ itemStyle:{color: '#999'}
+ }, */
+ ]
+ };
+ this.oneEcharts.setOption(option);
+ /* this.items[index].echart.on('click', (params) => {
+ let xIndex=this.items[index].echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+ this.echartsData.scheduledUpdatesType = 0
+ this.echartsData.scheduledUpdatesName = this.months[index]
+ this.echartsData.scheduledUpdatesToggle = false
+ this.echartsData.scheduledUpdatesXName=params.name
+ console.log(this.echartsData.scheduledUpdatesXName)
+ }); */
+ this.oneEcharts.getZr().on('click', (params) => {
+
+ const pointInPixel= [params.offsetX, params.offsetY];
+ if (this.oneEcharts.containPixel('grid',pointInPixel)) {
+ let xIndex=this.oneEcharts.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
+ /*事件处理代码书写位置*/
+ this.echartsData.scheduledUpdatesType = 0
+ //console.log(option.xAxis[0].data[xIndex])
+ this.echartsData.scheduledUpdatesXName+= option.xAxis[0].data[xIndex]
+ this.echartsData.scheduledUpdatesToggle = 2
+ //this.echartsData.scheduledUpdatesXName=option.xAxis.data[xIndex]
+ }
+
+ });
+
+
+ }
+
+
+
+}
//echarts详情组件
@Component({
@@ -801,6 +1060,8 @@ export class detailedInformationComponent implements OnInit {
this.example.dispose()
this.example.clear()
}
+ zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"]
+ buildingData=["高层","地下","轨道交通","化工生产","储罐类","厂房","古建筑","商市场","医院","学校","宾馆","娱乐场所","餐饮业","影剧院","展览建筑","隧道"]
example:any;
oneInit () {
@@ -890,6 +1151,41 @@ export class detailedInformationComponent implements OnInit {
data: [49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37],
itemStyle:{color: '#FFDC35'}
},
+ {
+ name: '与上个月环比',
+ type: 'line',
+ // yAxisIndex: 1,
+ data: [40, 30, 40, 30, 40, 20, 15, 5, 10,15, 6, 15, 12],
+ //itemStyle:{color: '#6be6c1'},
+
+ },
+ {
+ name: '警报',
+ type: 'effectScatter',
+ //coordinateSystem: 'cartesian2d',
+ data: [40, 30, 40, 30, 40, 20, 15, 5, 10,15, 6, 15, 12], //2d坐标系
+ symbolSize:30,
+ itemStyle: {
+ normal: {
+ color: 'red',
+ shadowBlur: 10,
+ shadowColor: '#333'
+ }
+ },
+ /* showEffectOn: 'render',
+ rippleEffect: {
+ brushType: 'stroke'
+ },
+ hoverAnimation: true,
+ itemStyle: {
+ normal: {
+ color: 'red',
+ shadowBlur: 10,
+ shadowColor: '#333'
+ }
+ },
+ zlevel: 1 */
+ },
/* {
name: '平均值2倍',
type: 'line',
diff --git a/src/app/statistic-analysis/scheduled-updates/verified.html b/src/app/statistic-analysis/scheduled-updates/verified.html
index 57e6bb7..e03ee90 100644
--- a/src/app/statistic-analysis/scheduled-updates/verified.html
+++ b/src/app/statistic-analysis/scheduled-updates/verified.html
@@ -4,11 +4,12 @@
* @Author: sueRimn
* @Date: 2020-09-05 08:59:24
* @LastEditors: sueRimn
- * @LastEditTime: 2020-11-09 14:54:39
+ * @LastEditTime: 2020-11-14 15:06:08
-->
-
\ No newline at end of file
diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
index 065d6d9..a700a8f 100644
--- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
+++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss
@@ -9,6 +9,19 @@
height: 100%;
}
} */
+/* .header{
+ display: flex;
+ flex-direction: row;
+} */
+.findCss{
+ padding-right: 100px;
+ button{
+ padding-right: 100px;
+ margin-right: 15px;
+ width: 88px;
+ height: 36px;
+ }
+}
#center{
overflow: hidden;
}
@@ -48,7 +61,7 @@
align-items: center;
height: 100%;
button{
- width: 88px;
+ width: 132px;
height: 36px;
}
margin-right:15%;
@@ -60,6 +73,7 @@
overflow: hidden;
display: flex;
flex-direction: row;
+ margin-top: 80px;
//justify-content:center;
}
#pie{
diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts
index df7aa2d..bb1af75 100644
--- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts
+++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts
@@ -58,7 +58,7 @@ export class ScheduledUpdatesComponent implements OnInit {
this.example= echarts.init(document.getElementById(pieid),'walden');
var options={
title: {
- text: '计划更新统计（7100家）',
+ text: pieid=="pie"?'已维护统计（7100家）':'计划维护统计（7100家）',
top: "3%",
left: 'center',
textStyle:{
@@ -68,7 +68,7 @@ export class ScheduledUpdatesComponent implements OnInit {
tooltip: {
trigger: 'item',
formatter: (params)=>{
- return this.echartsData.biaogeTishiZhi(params.name)
+ return this.echartsData.tableTooltip(this.selectedBtn=="tu"?this.echartsData.tableDataZhi:this.echartsData.buildingType,params.name)
},
position:this.echartsData.tableTooltipNoShow2
},
@@ -123,6 +123,7 @@ export class ScheduledUpdatesComponent implements OnInit {
};
this.example.setOption(options);
this.example.on('click', (params) => {
+ this.echartsData.findShow=true
if(params.name=="维护删除"){this.router.navigateByUrl('/statisticanalysis/delete_one/delete_two');}
else{
if(pieid=="pie"){
@@ -199,8 +200,15 @@ export class publicEchartsComponent implements OnInit {
//返回
goBack () {
- this.echartsData.scheduledUpdatesToggle--
- //console.log(this.echartsData.scheduledUpdatesToggle)
+ if(this.echartsData.scheduledUpdatesToggle==1||this.echartsData.scheduledUpdatesToggle==-3){
+ this.router.navigateByUrl('/statisticanalysis/scheduledUpdates');
+ }else{
+ this.echartsData.scheduledUpdatesToggle--
+ if(this.echartsData.scheduledUpdatesToggle==1||this.echartsData.scheduledUpdatesToggle==-3){
+ this.echartsData.findShow=true
+ //this.router.navigateByUrl('/statisticanalysis/scheduledUpdates');
+ }
+ }
}
//更多 窗口
@@ -208,6 +216,15 @@ export class publicEchartsComponent implements OnInit {
let dialogRef = this.dialog.open(moreTableComponent);
}
+ //支队查询
+ zhiFind(){
+ this.echartsData.zhiorBuinding="zhi"
+ }
+ //建筑类型查询
+ buildingFind(){
+ this.echartsData.zhiorBuinding="building"
+ }
+
}
@@ -245,6 +262,32 @@ export class verifiedComponent implements OnInit {
qipaotishi
xdata=['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月','10月','11月','12月']
ydata=[1170, 953, 1144, 799, 789, 773, 660, 998, 790, 1004, 1345, 1245]
+ //提示框表格
+ tableTooltip(dataArr,title:string){
+ let data = dataArr
+ //console.log(data)
+ var res = '
+
-
+
'+title+'
'
+ res+='| 名称 | '; + res+='数量 | ' + res+='环比 | ' + res+='总占比 | ' + res+=''+data[i].number+' | ' + res+=''+data[i].zhanbi+' | ' + res+=''+data[i].zhanbi+' | ' + } + + res+='总计 | 1356 | 19% | 19% | ' + res+='
+
+
\ No newline at end of file
diff --git a/src/app/statistic-analysis/statistic-analysis.module.ts b/src/app/statistic-analysis/statistic-analysis.module.ts
index 661662a..c80a769 100644
--- a/src/app/statistic-analysis/statistic-analysis.module.ts
+++ b/src/app/statistic-analysis/statistic-analysis.module.ts
@@ -53,7 +53,7 @@ import { DeleteThereComponent } from './deleteUnit/delete-there/delete-there.com
//import { DeleteThereLineDetailsComponent } from './deleteUnit/delete-there-line-details/delete-there-line-details.component';
import { DeleteFourComponent } from './deleteUnit/delete-four/delete-four.component';
import { BuildingTypeOneComponent } from './buildingType/building-type-one/building-type-one.component';
-import { ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,indexConditionComponent } from './scheduled-updates/scheduled-updates.component';
+import { ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,indexConditionComponent,yuebuildingDateComponent } 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';
import { BuildingTypeThreeDetailsComponent } from './buildingType/building-type-three-details/building-type-three-details.component';
@@ -72,7 +72,7 @@ import { DeleteTwoNewaddComponent } from './deleteUnit/delete-two-newadd/delete-
@NgModule({
- declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,indexConditionComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent, HomeComponent, DeleteThereLineDetailsComponent, PageThereComponent, PageThereYearComponent, DeleteTwoNewaddComponent],
+ declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,yuebuildingDateComponent,indexConditionComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent, HomeComponent, DeleteThereLineDetailsComponent, PageThereComponent, PageThereYearComponent, DeleteTwoNewaddComponent],
imports: [
CommonModule,
StatisticAnalysisRoutingModule,