From 2bdae3e40ab1a95e7fee7f8f3f9b8b757c8925ab Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Fri, 30 Apr 2021 16:07:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=BB=B4=E6=8A=A4=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/login/login.component.html | 2 +- .../delete-four/delete-four.component.ts | 6 +- .../delete-there-line-details.component.ts | 14 ++- .../delete-there/delete-there.component.ts | 8 +- .../delete-two-newadd.component.ts | 6 +- .../delete-two/delete-two.component.ts | 12 +- .../echarts-data.service.ts | 15 ++- .../scheduled-updates.component.ts | 106 +++++++----------- .../images/{消防徽.png => xiaofang.png} | Bin 9 files changed, 80 insertions(+), 89 deletions(-) rename src/assets/images/{消防徽.png => xiaofang.png} (100%) diff --git a/src/app/pages/login/login.component.html b/src/app/pages/login/login.component.html index f60da23..bdffc16 100644 --- a/src/app/pages/login/login.component.html +++ b/src/app/pages/login/login.component.html @@ -3,7 +3,7 @@
数字化预案编制管理平台 diff --git a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts index 4efb98b..84e4a67 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:58 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-10 14:33:29 + * @LastEditTime: 2021-04-30 15:53:07 */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; @@ -22,7 +22,7 @@ export class DeleteFourComponent implements OnInit { constructor(public route: ActivatedRoute,public data: EchartsDataService,public snackBar: MatSnackBar,private adapter: DateAdapter) { } zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] - zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] + zhongNumData = [0,0,0,0,0,0,0,0,0,0,0] tiaoshiPao:any//气泡传入数据 level:string; ngOnInit(): void { @@ -45,7 +45,7 @@ export class DeleteFourComponent implements OnInit { var detailPlanEchart = echarts.init(document.getElementById('detailBox'),'walden'); var option = { title: { - text: level+'：总数(666)', + text: level+'：总数(0)', left: "center", top:"0", textStyle: { diff --git a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts b/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts index e4996cb..efd4101 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-there-line-details/delete-there-line-details.component.ts @@ -1,3 +1,11 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-24 10:59:48 + * @LastEditors: sueRimn + * @LastEditTime: 2021-04-30 15:56:47 + */ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; @@ -68,10 +76,10 @@ export class DeleteThereLineDetailsComponent implements OnInit { } }//柱状图数值顶部显示 zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] - zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] + zhongNumData = [0,0,0,0,0,0,0,0,0,0,0] zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] - zhiNumData = [300,290,280,270,260,250,240,230,220,210,200] + zhiNumData = [0,0,0,0,0,0,0,0,0,0,0] tiaoshiPao:any //气泡提示数据获取 bianli(){ @@ -93,7 +101,7 @@ export class DeleteThereLineDetailsComponent implements OnInit { detailPlanEchart option date = ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月'] - dateNum = [270, 253, 244, 199, 189, 173, 160, 198,200] + dateNum = [0, 0, 0, 0, 0, 0, 0, 0,0] detailEcharts(){ this.detailPlanEchart = echarts.init(document.getElementById('barEchart'), 'skinUpp'); diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts index 946a328..f3d67a9 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts @@ -87,7 +87,7 @@ export class DeleteThereComponent implements OnInit { } }//柱状图数值顶部显示 zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] - zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] + zhiNumData = [0,0,0,0,0,0,0,0,0,0,0,0,0,0] zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队","松江中队","金山中队","崇明中队"] tiaoshiPao:any //气泡提示数据获取 @@ -102,7 +102,7 @@ export class DeleteThereComponent implements OnInit { //return tishiPao } date = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月','九月'] - dateNum = [270, 253, 244, 199, 189, 173, 160, 198,200] + dateNum = [0, 0, 0, 0, 0, 0, 0, 0,0] //返回 goBack () { history.go(-1) @@ -140,7 +140,7 @@ export class DeleteThereComponent implements OnInit { this.zhutu = ec.init(document.getElementById('zhidui'),'walden'); this.option = { title: { - text: headName+'：总数(666)', + text: headName+'：总数(0)', left: "center", top: "0", textStyle: { @@ -177,7 +177,7 @@ export class DeleteThereComponent implements OnInit { tooltip: { trigger: 'item', formatter: (params)=>{ - return this.echartsData.biaogeTishi(params.name) + return this.echartsData.tableTooltip('',headName) }, position: this.echartsData.tableTooltipNoShowq /* backgroundColor:'rgba(255,255,255,1)', diff --git a/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts index e2b420a..ad73a40 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-two-newadd/delete-two-newadd.component.ts @@ -66,10 +66,10 @@ export class DeleteTwoNewaddComponent implements OnInit { } }//柱状图数值顶部显示 zhongNameData = ["浦东中队","黄浦中队","徐汇中队","长宁中队","静安中队","普陀中队","虹口中队","杨浦中队","闵行中队","宝山中队","嘉定中队"] - zhongNumData = [200,190,180,170,160,150,140,130,120,110,100] + zhongNumData = [0,0,0,0,0,0,0,0,0,0,0] zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] - zhiNumData = [300,290,280,270,260,250,240,230,220,210,200] + zhiNumData = [0,0,0,0,0,0,0,0,0,0,0] tiaoshiPao:any //气泡提示数据获取 bianli(){ @@ -91,7 +91,7 @@ export class DeleteTwoNewaddComponent implements OnInit { detailPlanEchart option date = ['高层', '轨道交通', '储罐类', '古建筑', '地下', '化工生产', '厂房', '商市场'] - dateNum = [270, 253, 244, 199, 189, 173, 160, 198] + dateNum = [0, 0, 0, 0, 0, 0, 0, 0] detailEcharts(){ this.detailPlanEchart = echarts.init(document.getElementById('barEchart'), 'skinUpp'); diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts index e409939..1573ef6 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts +++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:21:18 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-17 14:13:12 + * @LastEditTime: 2021-04-30 15:51:42 */ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; @@ -22,9 +22,9 @@ declare var echarts: any; export class DeleteTwoComponent implements OnInit { options:any; datayuex=['一月', '二月', '三月', '四月', '五月', '六月', '七月','八月','九月']; - datayuey=[210, 160, 150, 140, 130, 120, 110,120,150]; - datanianx=[2019,2020]; - dataniany=[201,174] + datayuey=[0, 0, 0, 0, 0, 0, 0,0,0]; + datanianx=[2020,2021]; + dataniany=[0,0] tiaoshiPao:any//气泡 constructor(private router: Router,public snackBar: MatSnackBar,private adapter: DateAdapter,public echartsData:EchartsDataService) { } @@ -71,7 +71,7 @@ export class DeleteTwoComponent implements OnInit { headZx//echarts实例 zhiNameData = ["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队","松江支队","金山支队","崇明支队"] - zhiNumData = [200,190,180,170,160,150,140,130,120,110,100,90,80,70] + zhiNumData = [0,0,0,0,0,0,0,0,0,0,0,0,0,0] //查询数据 @@ -223,7 +223,7 @@ export class DeleteTwoComponent implements OnInit { }, // 标题 title: { - text: `${headtext}`+':总数（1024）', + text: `${headtext}`+':总数（0）', left:'center', top: -4, //副标题文本样式 diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index 5d61f28..d8d4f60 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -122,9 +122,9 @@ export class EchartsDataService { //提示框表格 tableTooltip(dataArr,title:string){ - let data = dataArr + //let data = dataArr //console.log(data) - var res = '
'+title+'
' + /* var res = '
'+title+'
' res+='
'; res+=''; res+=''; @@ -139,8 +139,15 @@ export class EchartsDataService { res+='' } - res+='' - res+='' + res+='' */ + var res = '
'+title+'
' + res+='
名称'+data[i].zhanbi+'
总计135619%
'; + res+=''; + res+=''; + res+='' + res+='' + res+='' + res+='' res+='
名称数量总占比
总计00%
' return res } 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 197c311..6a27965 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: pieid=="pie"?'已维护统计（7100家）':'计划维护统计（7100家）', + text: pieid=="pie"?'已维护统计（0家）':'计划维护统计（0家）', top: "3%", left: 'center', textStyle:{ @@ -103,13 +103,13 @@ export class ScheduledUpdatesComponent implements OnInit { }, }}, data:pieid=="pie"? [ - {value: 2000, name: '维护无需修改'}, - {value: 2500, name: '维护修改',itemStyle:{color:'#02A7F0'}}, - {value: 1900, name: '维护删除',itemStyle:{color:'#87cebb'}}, + {value: 0, name: '维护无需修改'}, + {value: 0, name: '维护修改',itemStyle:{color:'#02A7F0'}}, + {value: 0, name: '维护删除',itemStyle:{color:'#87cebb'}}, ]:[ - {value: 2000, name: '未维护'}, - {value: 2500, name: '维护通过审核',itemStyle:{color:'#02A7F0'}}, - {value: 1900, name: '维护中',itemStyle:{color:'#87cebb'}}, + {value: 0, name: '未维护'}, + {value: 0, name: '维护通过审核',itemStyle:{color:'#02A7F0'}}, + {value: 0, name: '维护中',itemStyle:{color:'#87cebb'}}, ], emphasis: { itemStyle: { @@ -345,9 +345,9 @@ export class verifiedComponent implements OnInit { oneEcharts:any; qipaotishi xdatayue=['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月','10月','11月','12月'] - ydatayue=[1170, 953, 1144, 799, 789, 773, 660, 998, 790, 1004, 1345, 1345] + ydatayue=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] xdataYear=['2020','2021'] - ydataYear=['2','5'] + ydataYear=['0','0'] //提示框表格 tableTooltip(dataArr,title:string){ let data = dataArr @@ -386,7 +386,7 @@ export class verifiedComponent implements OnInit { }, // 标题 title: { - text: '已核查'+'总数：(1024)', + text: '已核查'+'总数：(0)', top: -4, left: 'center', textStyle:{ @@ -402,7 +402,7 @@ export class verifiedComponent implements OnInit { borderWidth:'1', borderRadius :'0', */ formatter: (params)=>{ - return this.echartsData.zhiorBuinding=="zhi"?this.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.tableTooltip(this.echartsData.buildingType,params[0].name) + return this.echartsData.zhiorBuinding=="zhi"?this.echartsData.tableTooltip(this.echartsData.tableDataZhi,params[0].name):this.echartsData.tableTooltip(this.echartsData.buildingType,params[0].name) }, position:this.echartsData.tableTooltipNoShow2 }, @@ -650,7 +650,7 @@ export class notVerifiedComponent implements OnInit { }, title: { text: '未核查', - subtext: '总数剩余 5850', + subtext: '总数剩余 0', left: 'center', textStyle:{ color:'#000', @@ -705,7 +705,7 @@ export class notVerifiedComponent implements OnInit { name: '剩余未核查', type: 'bar', stack: '差值', - data: [289, 307, 334, 356, 389, 413, 456, 477, 489, 503, 540, 570, 599], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], itemStyle:{color:'#C80000'}, label: { show: true, @@ -717,7 +717,7 @@ export class notVerifiedComponent implements OnInit { name: '总数', type: 'bar', stack: '差值', - data: [1520, 1430, 1170, 1441, 1094, 1147, 1098, 1142, 1274, 1400, 1265, 1341, 1200], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], itemStyle:{color:'#999'}, label: { show: true, @@ -773,7 +773,7 @@ export class yueDateComponent implements OnInit { this.oneEcharts = echarts.init(document.getElementById("center"), 'skinUpp'); var option = { title: { - text: this.echartsData.scheduledUpdatesXName+'已核查总数:(500)', + text: this.echartsData.scheduledUpdatesXName+'已核查总数:(0)', top: -4, left: '35%', textStyle:{ @@ -845,43 +845,43 @@ export class yueDateComponent implements OnInit { name: this.echartsData.zhuXname[1], type: 'bar', stack: '总数', - data: this.echartsData.zhiorBuinding=="zhi"?[68, 56, 69, 57, 15, 79, 78, 66, 49, 34, 49, 78, 45,78]:[68, 56, 69, 57, 15, 79, 78, 66, 49, 34, 49, 78, 45, 49, 78, 45], + data: this.echartsData.zhiorBuinding=="zhi"?[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0]:[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], barWidth :'38', }, { name: this.echartsData.zhuXname[2], type: 'bar', stack: '总数', - 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], + data: this.echartsData.zhiorBuinding=="zhi"?[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0]:[0, 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0,0,0,0], itemStyle:{color: '#626c91'} }, { name: this.echartsData.zhuXname[3], type: 'bar', stack: '总数', - 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], + data: this.echartsData.zhiorBuinding=="zhi"?[0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0]:[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0], 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,43], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0], itemStyle:{color: '#FFDC35'} }, { //name: '与上个月环比', type: 'line', // yAxisIndex: 1, - data: [25, 23, 27, 24, 25, 22, 24, 20, 19,20, 20, 22, 19,22], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0,0, 0, 0, 0,0], //itemStyle:{color: '#6be6c1'}, }, - { + /* { //name: '警报', type: 'effectScatter', //coordinateSystem: 'cartesian2d', - data: [[4,24]], + data: [[0,0]], symbolSize:30, itemStyle: { normal: { @@ -890,20 +890,8 @@ export class yueDateComponent implements OnInit { shadowColor: '#333' } }, - /* showEffectOn: 'render', - rippleEffect: { - brushType: 'stroke' - }, - hoverAnimation: true, - itemStyle: { - normal: { - color: 'red', - shadowBlur: 10, - shadowColor: '#333' - } - }, - zlevel: 1 */ - }, + + }, */ /* { name: '平均值2倍', @@ -985,7 +973,7 @@ export class yuebuildingDateComponent implements OnInit { this.oneEcharts = echarts.init(document.getElementById("center"), 'skinUpp'); var option = { title: { - text: this.echartsData.scheduledUpdatesXName+'已核查总数:(500)', + text: this.echartsData.scheduledUpdatesXName+'已核查总数:(0)', top: -4, left: '35%', textStyle:{ @@ -1057,28 +1045,28 @@ export class yuebuildingDateComponent implements OnInit { 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], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 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], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0], 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], + data:[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0], 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], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0], itemStyle:{color: '#FFDC35'} }, /* { @@ -1157,7 +1145,7 @@ export class detailedInformationComponent implements OnInit { if (this.echartsData.scheduledUpdatesType ===0) { //已核查 var option = { title: { - text: `${this.echartsData.scheduledUpdatesName}${this.echartsData.scheduledUpdatesXName}总数（699）`, + text: `${this.echartsData.scheduledUpdatesName}${this.echartsData.scheduledUpdatesXName}总数（0）`, top: -2, right: 655, textStyle:{ @@ -1216,42 +1204,42 @@ export class detailedInformationComponent implements OnInit { type: 'bar', stack: '总数', barWidth :'38', - data: [68, 15, 69, 57, 43, 79, 78, 66, 49, 9, 49, 78, 15], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], }, { name: this.echartsData.zhuXname[2], type: 'bar', stack: '总数', - data: [39, 8, 49, 27, 53, 29, 38, 49, 29, 10, 40, 27, 24], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], itemStyle:{color: '#626c91'} }, { name: this.echartsData.zhuXname[3], type: 'bar', stack: '总数', - data: [48, 8, 43, 53, 47, 39, 25, 26, 54, 9, 39, 24, 6], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], itemStyle:{color:'#c4ebad'} }, { name: this.echartsData.zhuXname[0], type: 'line', // yAxisIndex: 1, - data: [49, 60, 53, 47, 49, 43, 48, 41, 38, 56, 41, 43, 60], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], itemStyle:{color: '#FFDC35'} }, { //name: '与上个月环比', type: 'line', // yAxisIndex: 1, - data: [25, 35, 27, 24, 25, 22, 24, 20, 19,30, 20, 22, 40], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0,0, 0, 0, 0], //itemStyle:{color: '#6be6c1'}, }, - { + /* { //name: '警报', type: 'effectScatter', //coordinateSystem: 'cartesian2d', - data: [[1,35],[9,30],[12,40]], //2d坐标系 + data: [[0,0],[0,0],[0,0]], //2d坐标系 symbolSize:30, itemStyle: { normal: { @@ -1260,20 +1248,8 @@ export class detailedInformationComponent implements OnInit { shadowColor: '#333' } }, - /* showEffectOn: 'render', - rippleEffect: { - brushType: 'stroke' - }, - hoverAnimation: true, - itemStyle: { - normal: { - color: 'red', - shadowBlur: 10, - shadowColor: '#333' - } - }, - zlevel: 1 */ - }, + + }, */ /* { name: '平均值2倍', type: 'line', @@ -1353,7 +1329,7 @@ export class detailedInformationComponent implements OnInit { name: '剩余未核查', type: 'bar', stack: '差值', - data: [13, 19, 21, 27, 35, 39, 41, 43, 47, 47, 49, 50, 51], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], itemStyle:{color:'#C80000'}, label: { show: true, @@ -1365,7 +1341,7 @@ export class detailedInformationComponent implements OnInit { name: '总数', type: 'bar', stack: '差值', - data: [120, 130, 170, 141, 194, 147, 109, 142, 174, 100, 125, 131, 120], + data: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], itemStyle:{color:'#999'}, label: { show: true, diff --git a/src/assets/images/消防徽.png b/src/assets/images/xiaofang.png similarity index 100% rename from src/assets/images/消防徽.png rename to src/assets/images/xiaofang.png