Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHai-YuAn

src/app/statistic-analysis/echarts-data.service.ts

@@ -9,7 +9,13 @@ export class EchartsDataService {
 
   //预案状态分析
   statefulInspectionName:string;
-  statefulInspectionToggle:boolean = true; // true=显示所有柱状图 flase=显示当前点击柱状图
+  statefulInspectionToggle:boolean = true; // true=显示当前点击柱状图 flase=显示当前点击折现图
+
+  //计划更新统计
+  scheduledUpdatesType:number = 0; //已核查/未核查
+  scheduledUpdatesName:string;
+  scheduledUpdatesToggle:boolean = true; // 显示  当前点击 已核查/未核查
+
 
 
   //支队提示框

src/app/statistic-analysis/scheduled-updates/detailedInformation.html

@@ -0,0 +1 @@
+<div style="height: 90%;width: 90%;margin: 0 auto;" id="center"></div>

src/app/statistic-analysis/scheduled-updates/moreTable.html

@@ -0,0 +1,24 @@
+<div class="table">
+  <p class="tableHeader">公告</p>
+  <table mat-table [dataSource]="dataSource">
+
+    <ng-container matColumnDef="team">
+      <th mat-header-cell *matHeaderCellDef>支队</th>
+      <td mat-cell *matCellDef="let element">{{element.team}}</td>
+    </ng-container>
+        
+    <ng-container matColumnDef="header">
+      <th mat-header-cell *matHeaderCellDef>标题</th>
+      <td mat-cell *matCellDef="let element">{{element.content}}</td>
+    </ng-container>
+
+    <ng-container matColumnDef="time">
+      <th mat-header-cell *matHeaderCellDef>时间</th>
+      <td mat-cell *matCellDef="let element">{{element.time}}</td>
+    </ng-container>
+
+    <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+    <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+
+  </table>
+</div>

src/app/statistic-analysis/scheduled-updates/notVerified.html

@@ -0,0 +1,3 @@
+<app-detailedInformation *ngIf="!echartsData.scheduledUpdatesToggle"></app-detailedInformation>
+
+<div style="height: 90%;width: 90%;margin: 0 auto;" id="center" [hidden]="!echartsData.scheduledUpdatesToggle"></div>

src/app/statistic-analysis/scheduled-updates/publicEcharts.html

@@ -0,0 +1,26 @@
+<div class="content">
+
+  <div class="header">
+
+    <div class="queryField" *ngIf="isToggle">
+      <h3 style="display: inline-block; font-size: 20px; font-weight: 550; color: red;">公告:</h3>
+      <p style="display: inline-block; margin: 0 10px;">浦东支队1月份已核查案件高于平均值;黄浦支队1月份已核查案件高于平均值...</p>
+      <button mat-raised-button (click)='moreOpen()'>更多</button>
+    </div>
+
+    <div class="fixedCss">
+      <button mat-raised-button (click)='goBack()' *ngIf="!echartsData.scheduledUpdatesToggle">返回</button>
+      <button mat-raised-button (click)='verified()' [ngClass]="{'selectButton': isToggle}" style="margin:0 10px;" >已核查</button>
+      <button mat-raised-button (click)='notVerified()' [ngClass]="{'selectButton': !isToggle}">未核查</button>
+    </div>
+
+  </div>
+
+  <div class="echarts">
+    <div class="center">
+      <app-verified *ngIf="isToggle"></app-verified>
+      <app-notVerified *ngIf="!isToggle"></app-notVerified>
+    </div>
+  </div>
+
+</div>

src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html

@@ -1 +1,3 @@
-<p>计划更新</p>
+<div class="content">
+  <div class="center" id="center"></div>
+</div>

src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.scss

@@ -0,0 +1,41 @@
+.content {
+  width: 100%;
+  height: 93%;
+  overflow: hidden;
+  box-sizing: border-box;
+  padding: 10px 10px 20px 10px;
+  .center {
+    width: 100%;
+    height: 100%;
+  }
+}
+
+
+
+//table
+table {
+  width: 100%;
+  text-align: center;
+  .cdk-header-cell {
+    text-align: center;
+  }
+}
+.table {
+  width: 1000px;
+  height: 600px;
+  overflow: auto;
+  .tableHeader {
+    font-size: 24px;
+    text-align: center;
+    font-weight: 550;
+  }
+}
+
+//滚动条样式
+::-webkit-scrollbar{
+  width: 5px;
+  background-color: white;
+}
+::-webkit-scrollbar-thumb{
+  background-color: #999;
+}

src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.ts

@@ -1,4 +1,8 @@
 import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import {EchartsDataService} from '../echarts-data.service'
+import { MatDialog } from '@angular/material/dialog';
+declare var echarts: any;
 
 @Component({
   selector: 'app-scheduled-updates',
@@ -7,9 +11,667 @@ import { Component, OnInit } from '@angular/core';
 })
 export class ScheduledUpdatesComponent implements OnInit {
 
-  constructor() { }
+  constructor(private router: Router) { }
 
   ngOnInit(): void {
+    window.setTimeout(()=>{
+      this.initCharts()
+    })
   }
 
+   /* 首页饼状图 */
+   initCharts(){
+    var indexBzt = echarts.init(document.getElementById('center'));
+    var options={
+      title: {
+        text: '计划更新统计（7100家）',
+        padding:[80,100],
+        left: 'center',
+        textStyle:{
+          fontSize:34
+        }
+      },
+      tooltip: {
+        trigger: 'item',
+        formatter:  (params)=>{
+          // return this.biaogeTishi(params.name)
+        } ,
+        backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度
+        borderWidth:'1',
+        borderRadius :'0'
+      },
+      legend: {
+        orient: 'vertical',
+        right: 150,
+        top:80,
+        itemWidth:60,
+        itemHeight:25,
+        textStyle:{
+          fontSize:28
+        },
+        data: ['已核查无需修改', '已核查修改中', '已核查提交审核', '未核查']
+      },
+      series: [{ 
+        name: '访问来源',
+        type: 'pie',
+        radius: '65%',
+        center: ['50%', '60%'],
+        label:{
+          normal:{
+          show:true,
+          position: 'inner',
+          fontSize:18,
+          formatter:'{d}% ({c}家)'
+        }},
+        data: [
+          {value: 2000, name: '已核查无需修改'},
+          {value: 2500, name: '已核查修改中',itemStyle:{color:'#02A7F0'}},
+          {value: 1900, name: '已核查提交审核',itemStyle:{color:'#87cebb'}},
+          {value: 700, name: '未核查'},],
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+
+      }]
+    };
+    indexBzt.setOption(options);
+    indexBzt.on('click', (params) => {
+      this.router.navigateByUrl('/statisticanalysis/scheduledUpdates/PublicEcharts');
+    });
+  }
+
+
+
 }
+
+@Component({
+  selector: 'app-publicEcharts',
+  templateUrl: './publicEcharts.html',
+  styleUrls: ['../state/page-two-time/page-two-time.component.scss']
+})
+export class publicEchartsComponent implements OnInit {
+
+  constructor(private router: Router,public echartsData:EchartsDataService,public dialog: MatDialog,) { }
+
+  ngOnInit(): void {
+
+  }
+
+  isToggle:boolean = true; // 已核查/未核查
+
+  //已核查
+  verified () {
+    this.isToggle = true
+    this.echartsData.scheduledUpdatesToggle = true
+  }
+
+  //未核查
+  notVerified () {
+    this.isToggle = false
+    this.echartsData.scheduledUpdatesToggle = true
+  }
+
+  //返回
+  goBack () {
+    this.echartsData.scheduledUpdatesToggle = true
+  }
+
+  //更多 窗口
+  moreOpen () {
+    let dialogRef = this.dialog.open(moreTableComponent);
+  }
+
+
+
+}
+
+
+
+//已核查组件
+@Component({
+  selector: 'app-verified',
+  templateUrl: './verified.html',
+  styleUrls: ['../state/page-two-time/page-two-time.component.scss']
+})
+export class verifiedComponent implements OnInit {
+
+  constructor(private router: Router,public echartsData:EchartsDataService) { }
+
+  ngOnInit(): void {
+    window.setTimeout(()=>{
+      this.oneInit()
+      this.twoInit()
+    },0)
+  }
+
+  ngOnDestroy () {
+    this.oneEcharts.clear()
+    this.items.forEach((element,index) => {
+      element.echart.clear()
+    });
+  }
+
+  oneEcharts:any;
+  oneInit () {
+    this.oneEcharts = echarts.init(document.getElementById('center'), 'skinUpp');
+    var option = {
+      grid: {
+        top: 50,
+        left:40,
+        right: 20,
+        bottom: 20,
+      },
+      // 标题
+      title: {
+        text: '已核查',
+        top: -4,
+        left: 'center',
+        textStyle:{
+          //文字颜色
+          color:'#000',
+          fontSize: 22,
+        }
+      },
+      //提示框
+      tooltip: {
+        trigger: 'axis',
+      },
+      // x轴
+      xAxis: {
+        type: 'category',
+        data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月','9月','10月','11月','12月'],
+        boundaryGap: false,
+        axisLabel: {
+          color: "#000", //刻度线标签颜色
+        },
+        //设置坐标轴字体颜色和宽度
+        axisLine: {    
+          lineStyle: {
+            color: "#000",
+          },
+        },
+        splitLine: {//分割线配置
+          show:true,
+          lineStyle: {
+            color: '#999',
+          }
+        }
+      },
+      // y轴
+      yAxis: {
+        type: 'value',
+        axisLabel: {
+          color: "#000" //刻度线标签颜色
+        },
+         //设置坐标轴字体颜色和宽度
+         axisLine: {
+          lineStyle: {
+            color: "#000",
+          }
+        }
+      },
+      // 数据
+      series: [{
+          name: '单位预案编制数量',
+          type: 'line',
+          data: [1170, 953, 1144, 799, 789, 773, 660, 998, 790, 1004, 1345, 1245],
+        }
+      ],
+    };
+    this.oneEcharts.setOption(option);
+  }
+
+  months:any = ['一月','二月','三月','四月','五月','六月','七月','八月','九月','十月','十一月','十二月']
+  echartIds:any = ['one','two','three','four','five','six','seven','eight','nine','ten','eleven','twelve']
+  items:any = [{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null},{echart:null}]
+
+  twoInit () {
+    this.months.forEach((element,index) => {
+      this.items[index].echart = echarts.init(document.getElementById(this.echartIds[index]), 'skinUpp');
+      var option = {
+        title: {
+          text: element,
+          top: -4,
+          left: 'center',
+          textStyle:{
+            color:'#000',
+            fontSize: 18,
+          }
+        },
+        //提示框
+        tooltip: {
+          trigger: 'axis',
+        },
+        legend: {
+          data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'],
+          textStyle: { color: '#000' }
+        },
+        xAxis: [{
+          axisLabel: {
+            color: "#000", //刻度线标签颜色
+          },
+          //设置坐标轴字体颜色和宽度
+          axisLine: {    
+            lineStyle: {color: "#000",}
+          },
+          type: 'category',
+          data: ['浦东支队','黄浦支队','徐汇支队','长宁支队','静安支队','普陀支队','虹口支队','杨浦支队','闵行支队','宝山支队','嘉定支队','崇明支队','金山支队'],
+          axisPointer: {type: 'shadow'}
+        }],
+        yAxis: [
+          {
+            //设置坐标轴字体颜色和宽度
+            axisLine: {    
+              lineStyle: {color: "#000"},
+            },
+            type: 'value',
+            axisLabel: {
+              color: "#000", //刻度线标签颜色
+              formatter: '{value}'
+            }
+          },
+          // {
+          //   //设置坐标轴字体颜色和宽度
+          //   axisLine: {    
+          //     lineStyle: {color: "#000"},
+          //   },
+          //   type: 'value',
+          //   name: '个',
+          //   axisLabel: {
+          //     color: "#000", //刻度线标签颜色
+          //     formatter: '{value}'
+          //   }
+          // }
+        ],
+        series: [
+          {
+            name: '已核查无需修改',
+            type: 'bar',
+            stack: '总数',
+            data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45],
+          },
+          {
+            name: '已核查修改中',
+            type: 'bar',
+            stack: '总数',
+            data: [39, 43, 49, 27, 53, 29, 38, 49, 29, 40, 40, 27, 54],
+            itemStyle:{color: '#DC143C'}
+          },
+          {
+            name: '已核查提交审核',
+            type: 'bar',
+            stack: '总数',
+            data: [48, 42, 43, 53, 47, 39, 25, 26, 54, 34, 39, 24, 14],
+            itemStyle:{color:'#00BB00'}
+          },
+          {
+            name: '平均值',
+            type: 'line',
+            // yAxisIndex: 1,
+            data: [49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37],
+            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: '#FF00FF'}
+          },
+          {
+            name: '平均值3倍',
+            type: 'line',
+            // yAxisIndex: 1,
+            data: [143, 135, 159, 143, 127, 144, 144, 123, 114, 117, 124, 129, 111],
+            itemStyle:{color: '#999'}
+          },
+        ]
+      };
+      this.items[index].echart.setOption(option);
+      this.items[index].echart.on('click', (params) => {
+        this.echartsData.scheduledUpdatesType = 0
+        this.echartsData.scheduledUpdatesName = this.months[index]
+        this.echartsData.scheduledUpdatesToggle = false
+      });
+    });
+  }
+
+
+
+}
+
+
+
+//未核查组件
+@Component({
+  selector: 'app-notVerified',
+  templateUrl: './notVerified.html',
+  styleUrls: ['../state/page-two-time/page-two-time.component.scss']
+})
+export class notVerifiedComponent implements OnInit {
+
+  constructor(private router: Router,public echartsData:EchartsDataService) { }
+
+  ngOnInit(): void {
+    window.setTimeout(()=>{
+      this.oneInit()
+    },0)
+  }
+
+  ngOnDestroy () {
+    this.oneEcharts.clear()
+  }
+
+  oneEcharts:any;
+  oneInit () {
+    this.oneEcharts = echarts.init(document.getElementById('center'), 'skinUpp');
+    var option = {
+      title: {
+        text: '未核查',
+        subtext: '总数剩余 5850',
+        left: 'center',
+        textStyle:{
+          color:'#000',
+          fontSize: 22,
+        },
+        subtextStyle: {color:'#999',} 
+      },
+      tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+            type: 'shadow'
+        }
+      },
+      legend: {
+        data: ['剩余未核查','总数'],
+        textStyle: { color: '#000' }
+      },
+      xAxis: {
+        type: 'value',
+        boundaryGap: [0, 0.01],
+        axisLabel: {
+          color: "#000", //刻度线标签颜色
+        },
+        //设置坐标轴字体颜色和宽度
+        axisLine: {    
+          lineStyle: {color: "#000",}
+        },
+      },
+      yAxis: {
+        type: 'category',
+        //设置坐标轴字体颜色和宽度
+        axisLine: {    
+          lineStyle: {color: "#000"},
+        },
+        axisLabel: {
+          color: "#000", //刻度线标签颜色
+          formatter: '{value}'
+        },
+        data:  ['浦东支队','黄浦支队','徐汇支队','长宁支队','静安支队','普陀支队','虹口支队','杨浦支队','闵行支队','宝山支队','嘉定支队','崇明支队','金山支队'],
+      },
+      series: [
+        {
+          name: '剩余未核查',
+          type: 'bar',
+          stack: '差值',
+          data: [289, 307, 334, 356, 389, 413, 456, 477, 489, 503, 540, 570, 599],
+          itemStyle:{color:'#C80000'},
+          label: {
+            show: true,
+            position: 'insideRight',
+            color: '#fff'
+          },
+        },
+        {
+          name: '总数',
+          type: 'bar',
+          stack: '差值',
+          data: [1520, 1430, 1170, 1441, 1094, 1147, 1098, 1142, 1274, 1400, 1265, 1341, 1200],
+          itemStyle:{color:'#999'},
+          label: {
+            show: true,
+            position: 'insideRight',
+            color: '#fff'
+          },
+        },
+      ]
+    };
+    this.oneEcharts.setOption(option);
+    this.oneEcharts.on('click', (params) => {
+      this.echartsData.scheduledUpdatesType = 1
+      this.echartsData.scheduledUpdatesName = params.name
+      this.echartsData.scheduledUpdatesToggle = false
+    });
+  }
+
+
+
+}
+
+
+
+//echarts详情组件
+@Component({
+  selector: 'app-detailedInformation',
+  templateUrl: './detailedInformation.html',
+  styleUrls: ['../state/page-two-time/page-two-time.component.scss']
+})
+export class detailedInformationComponent implements OnInit {
+
+  constructor(private router: Router,public echartsData:EchartsDataService) { }
+
+  ngOnInit(): void {
+    window.setTimeout(()=>{
+      this.oneInit()
+    },0)
+  }
+
+  oneInit () {
+    let echart = echarts.init(document.getElementById('center'), 'skinUpp');
+    if (this.echartsData.scheduledUpdatesType ===0) { //已核查
+      var option = {
+        title: {
+          text: this.echartsData.scheduledUpdatesName,
+          top: -4,
+          left: 'center',
+          textStyle:{
+            color:'#000',
+            fontSize: 18,
+          }
+        },
+        //提示框
+        tooltip: {
+          trigger: 'axis',
+        },
+        legend: {
+          data: ['平均值','平均值2倍','平均值3倍', '已核查无需修改', '已核查修改中', '已核查提交审核'],
+          textStyle: { color: '#000' }
+        },
+        xAxis: [{
+          axisLabel: {
+            color: "#000", //刻度线标签颜色
+          },
+          //设置坐标轴字体颜色和宽度
+          axisLine: {    
+            lineStyle: {color: "#000",}
+          },
+          type: 'category',
+          data: ['浦东支队','黄浦支队','徐汇支队','长宁支队','静安支队','普陀支队','虹口支队','杨浦支队','闵行支队','宝山支队','嘉定支队','崇明支队','金山支队'],
+          axisPointer: {type: 'shadow'}
+        }],
+        yAxis: [
+          {
+            //设置坐标轴字体颜色和宽度
+            axisLine: {    
+              lineStyle: {color: "#000"},
+            },
+            type: 'value',
+            axisLabel: {
+              color: "#000", //刻度线标签颜色
+              formatter: '{value}'
+            }
+          },
+        ],
+        series: [
+          {
+            name: '已核查无需修改',
+            type: 'bar',
+            stack: '总数',
+            data: [68, 56, 69, 57, 43, 79, 78, 66, 49, 34, 49, 78, 45],
+          },
+          {
+            name: '已核查修改中',
+            type: 'bar',
+            stack: '总数',
+            data: [39, 43, 49, 27, 53, 29, 38, 49, 29, 40, 40, 27, 54],
+            itemStyle:{color: '#DC143C'}
+          },
+          {
+            name: '已核查提交审核',
+            type: 'bar',
+            stack: '总数',
+            data: [48, 42, 43, 53, 47, 39, 25, 26, 54, 34, 39, 24, 14],
+            itemStyle:{color:'#00BB00'}
+          },
+          {
+            name: '平均值',
+            type: 'line',
+            // yAxisIndex: 1,
+            data: [49, 45, 53, 47, 49, 43, 48, 41, 38, 39, 41, 43, 37],
+            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: '#FF00FF'}
+          },
+          {
+            name: '平均值3倍',
+            type: 'line',
+            // yAxisIndex: 1,
+            data: [143, 135, 159, 143, 127, 144, 144, 123, 114, 117, 124, 129, 111],
+            itemStyle:{color: '#999'}
+          },
+        ]
+      };
+      echart.setOption(option);
+    } else { //未核查
+      var options = {
+        title: {
+          text: this.echartsData.scheduledUpdatesName,
+          left: 'center',
+          textStyle:{
+            color:'#000',
+            fontSize: 18,
+          },
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+              type: 'shadow'
+          }
+        },
+        legend: {
+          data: ['剩余未核查','总数'],
+          textStyle: { color: '#000' }
+        },
+        xAxis: {
+          type: 'value',
+          boundaryGap: [0, 0.01],
+          axisLabel: {
+            color: "#000", //刻度线标签颜色
+          },
+          //设置坐标轴字体颜色和宽度
+          axisLine: {    
+            lineStyle: {color: "#000",}
+          },
+        },
+        yAxis: {
+          type: 'category',
+          //设置坐标轴字体颜色和宽度
+          axisLine: {    
+            lineStyle: {color: "#000"},
+          },
+          axisLabel: {
+            color: "#000", //刻度线标签颜色
+            formatter: '{value}'
+          },
+          data:  ['浦东中队','黄浦中队','徐汇中队','长宁中队','静安中队','普陀中队','虹口中队','杨浦中队','闵行中队','宝山中队','嘉定中队','崇明中队','金山中队'],
+        },
+        series: [
+          {
+            name: '剩余未核查',
+            type: 'bar',
+            stack: '差值',
+            data: [13, 19, 21, 27, 35, 39, 41, 43, 47, 47, 49, 50, 51],
+            itemStyle:{color:'#C80000'},
+            label: {
+              show: true,
+              position: 'insideRight',
+              color: '#fff'
+            },
+          },
+          {
+            name: '总数',
+            type: 'bar',
+            stack: '差值',
+            data: [120, 130, 170, 141, 194, 147, 109, 142, 174, 100, 125, 131, 120],
+            itemStyle:{color:'#999'},
+            label: {
+              show: true,
+              position: 'insideRight',
+              color: '#fff'
+            },
+          },
+        ]
+      };
+      echart.setOption(options);
+    }
+  }
+
+
+
+}
+
+
+
+//更多资讯组件
+@Component({
+  selector: 'app-moreTable',
+  templateUrl: './moreTable.html',
+  styleUrls: ['./scheduled-updates.component.scss']
+})
+export class moreTableComponent implements OnInit {
+
+  constructor(private router: Router,public echartsData:EchartsDataService) { }
+
+  ngOnInit(): void {
+
+  }
+
+  displayedColumns: string[]=['team','header','time'];
+  dataSource:any = [
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-03',team: '浦东支队'},
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-05',team: '徐汇支队'},
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-05',team: '普陀支队'},
+    {content: '1月份已核查案件 高于平均值', time: '2020-02-05',team: '黄浦支队'},
+    {content: '1月份已核查案件 高于平均值', time: '2020-02-05',team: '长宁支队'},
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-05',team: '静安支队'},
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-05',team: '虹口支队'},
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-07',team: '杨浦支队'},
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-07',team: '闵行支队'},
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-07',team: '宝山支队'},
+    {content: '1月份已核查案件 高于平均值', time: '2020-02-07',team: '嘉定支队'},
+    {content: '1月份已核查案件 高于平均值', time: '2020-02-07',team: '崇明支队'},
+    {content: '1月份已核查案件 高于平均值2倍', time: '2020-02-07',team: '金山支队'},
+  ]
+
+
+
+}

src/app/statistic-analysis/scheduled-updates/verified.html

@@ -0,0 +1,16 @@
+<app-detailedInformation *ngIf="!echartsData.scheduledUpdatesToggle"></app-detailedInformation>
+<div [hidden]="!echartsData.scheduledUpdatesToggle">
+  <div style="height: 400px;width: 50%;margin: 0 auto;" id="center"></div>
+  <div class="publicOneLineCss" id="one"></div>
+  <div class="publicOneLineCss" id="two"></div>
+  <div class="publicOneLineCss" id="three"></div>
+  <div class="publicOneLineCss" id="four"></div>
+  <div class="publicOneLineCss" id="five"></div>
+  <div class="publicOneLineCss" id="six"></div>
+  <div class="publicOneLineCss" id="seven"></div>
+  <div class="publicOneLineCss" id="eight"></div>
+  <div class="publicOneLineCss" id="nine"></div>
+  <div class="publicOneLineCss" id="ten"></div>
+  <div class="publicOneLineCss" id="eleven"></div>
+  <div class="publicOneLineCss" id="twelve"></div>
+</div>

src/app/statistic-analysis/state/page-one/page-one.component.ts

@@ -30,8 +30,6 @@ export class PageOneComponent implements OnInit {
 
   /* 首页饼状图 */
   initCharts(){
-    //console.log(document.getElementById('indexBzt'))
-    
     var ec = echarts as any;
     var indexBzt = ec.init(document.getElementById('indexBzt'));
     var options={

src/app/statistic-analysis/state/page-two-time/page-two-time.component.html

@@ -2,14 +2,14 @@
 
   <div class="header">
 
-    <div class="queryField" *ngIf="!isQuery">
+    <div class="queryField" *ngIf="!isQuery && 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>
 
-    <div class="queryField" *ngIf="selectType=='month' && !isQuery">
+    <div class="queryField" *ngIf="selectType=='month' && !isQuery && echartsData.statefulInspectionToggle">
       <form #form="ngForm" (ngSubmit)="monthSubmit(form.value)">
         <span>开始年份:</span>
         <mat-form-field>
@@ -39,7 +39,7 @@
       </form>
     </div>
 
-    <div class="queryField" *ngIf="selectType=='year' && !isQuery">
+    <div class="queryField" *ngIf="selectType=='year' && !isQuery && echartsData.statefulInspectionToggle">
       <form #form2="ngForm" (ngSubmit)="yearSubmit(form2.value)">
         <span>开始年份:</span>
         <mat-form-field>
@@ -58,8 +58,9 @@
     </div>
 
     <div class="fixedCss">
-      <button mat-raised-button color="primary" (click)='toggleTrue()'>横向查询</button>
-      <button mat-raised-button color="primary" style="margin-left: 10px;" (click)='toggleFalse()'>纵向查询</button>
+      <button mat-raised-button (click)='goBack()' *ngIf="!echartsData.statefulInspectionToggle">返回</button>
+      <button mat-raised-button (click)='toggleTrue()' [ngClass]="{'selectButton': isQuery}" style="margin:0 10px;" >横向查询</button>
+      <button mat-raised-button (click)='toggleFalse()' [ngClass]="{'selectButton': !isQuery}">纵向查询</button>
     </div>
 
   </div>

src/app/statistic-analysis/state/page-two-time/page-two-time.component.scss

@@ -21,6 +21,7 @@
 .header {
   border-bottom: 1px solid #999;
   height: 70px;
+  min-height: 70px;
   box-sizing: border-box;
   padding: 0 15px;
   display: flex;
@@ -39,7 +40,7 @@
   }
   .fixedCss{
     position: fixed;
-    top: 78px;
+    top: 81px;
     right: 32px;
   }
 }
@@ -50,7 +51,21 @@
   width: 50%;
   display: inline-block;
   box-sizing: border-box;
-  padding: 20px;
+  padding: 10px;
+  margin: 10px 0;
+}
+.publicOneLineCss{
+  height: 350px;
+  width: 90%;
+  margin: 10px auto;
+  box-sizing: border-box;
+  padding: 10px;
+}
+
+//切换按钮 选中状态
+.selectButton{
+  background-color: #2196f3;
+  color: white;
 }
 
 //滚动条样式

src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts

@@ -37,6 +37,11 @@ export class PageTwoTimeComponent implements OnInit {
     this.echartsData.statefulInspectionToggle = true
   }
 
+  //返回
+  goBack () {
+    this.echartsData.statefulInspectionToggle = true
+  }
+
   selectType:string = 'month'; //选择当前的 查询类型 按月/年
 
   //查询数据

src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts

@@ -41,7 +41,6 @@ export class PageZhongDuiDetailsComponent implements OnInit {
       tooltip: {
         trigger: 'item',
         formatter:  (params)=>{
-          console.log(666,params)
           return this.tableTooltip(params)
         },
         backgroundColor:'rgba(255,255,255,1)',//通过设置rgba调节背景颜色与透明度

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

@@ -9,6 +9,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';
+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';
 import { BuildingTypeThreeDetailsComponent } from './buildingType/building-type-three-details/building-type-three-details.component';
@@ -16,7 +17,6 @@ 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';
-import {ScheduledUpdatesComponent} from './scheduled-updates/scheduled-updates.component'
 import { AddUnitThreeLineDetailsComponent } from './addUnit/add-unit-three-line-details/add-unit-three-line-details.component';
 import { AddUnitThreeBarDetailsComponent } from './addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component';
 
@@ -37,7 +37,9 @@ const routes: Routes = [
   { path: 'addUnit_one/addUnit_two_time', component: AddUnitTwoTimeComponent},
   { path: 'addUnit_one/addUnit_two_time/three_lineDetails', component: AddUnitThreeLineDetailsComponent},
   { path: 'addUnit_one/addUnit_two_time/three_barDetails', component: AddUnitThreeBarDetailsComponent},
-  { path: 'scheduledUpdates', component: ScheduledUpdatesComponent}
+  { path: 'scheduledUpdates', component: ScheduledUpdatesComponent},
+  { path: 'scheduledUpdates', component: ScheduledUpdatesComponent},
+  { path: 'scheduledUpdates/PublicEcharts', component: publicEchartsComponent}
 ];
 
 @NgModule({

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

@@ -52,6 +52,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';
+import { ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent } 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';
@@ -59,14 +60,13 @@ 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';
-import { ScheduledUpdatesComponent } from './scheduled-updates/scheduled-updates.component';
 import { AddUnitThreeLineDetailsComponent } from './addUnit/add-unit-three-line-details/add-unit-three-line-details.component';
 import { AddUnitThreeBarDetailsComponent } from './addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component';
 
 
 
 @NgModule({
-  declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,ScheduledUpdatesComponent, AddUnitThreeLineDetailsComponent, AddUnitThreeBarDetailsComponent],
+  declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent],
   imports: [
     CommonModule,
     StatisticAnalysisRoutingModule,