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

src/app/key-unit/edit-unit-info/edit-unit-info.component.html

@@ -53,7 +53,7 @@
     </mat-tab>  
     <mat-tab label="10.作战部署">
         <ng-template matTabContent>
-            <iframe id="main" src="http://39.106.78.171:8000/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe>
+            <iframe id="main" src="/unityApp2/index.html" name="unityApp" frameborder="0" width="100%" height="98%"></iframe>
         </ng-template>
     </mat-tab> 
 </mat-tab-group>

src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.ts

@@ -89,7 +89,7 @@ export class DeleteFourComponent implements OnInit {
       tooltip: {
         trigger: 'item',
         formatter:  (params)=>{
-          console.log(666,params)
+          // console.log(666,params)
           return this.tableTooltip(params)
         },
         position: this.data.tableTooltipNoShow2

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

@@ -38,7 +38,7 @@ export class DeleteThereComponent implements OnInit {
     //let headtext:string;
     let datayuex:string;
     let headName:string;
-    console.log(this.activatedRoute.queryParams.subscribe)
+    // console.log(this.activatedRoute.queryParams.subscribe)
     //headtext=this.activatedRoute.queryParams["headtext"];
     this.activatedRoute.queryParams.subscribe(param=>{
       this.headtext=param.headtext
@@ -63,7 +63,7 @@ export class DeleteThereComponent implements OnInit {
     for (let i=date; i>=date-10;i--) {
       this.years.unshift(i)
     }
-    console.log(this.years)
+    // console.log(this.years)
   }
   
   selectOneYear:any = (new Date()).getFullYear() //开始年份
@@ -197,7 +197,7 @@ export class DeleteThereComponent implements OnInit {
       }]
     };
     this.zhutu.getZr().on('click',params=>{
-      console.log(params.name)
+      // console.log(params.name)
       const pointInPixel= [params.offsetX, params.offsetY];
       if (this.zhutu.containPixel('grid',pointInPixel)) {
         let xIndex=this.zhutu.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];

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-09-09 11:11:46
+ * @LastEditTime: 2020-09-10 10:56:58
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
@@ -125,14 +125,14 @@ export class DeleteTwoComponent implements OnInit {
     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(startTime)
-      console.log(endTime)
+      // 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(startTime)
-        console.log(endTime)
+        // console.log(endTime)
       } else {
         const config = new MatSnackBarConfig();
         config.verticalPosition = 'top';
@@ -275,7 +275,7 @@ export class DeleteTwoComponent implements OnInit {
       }]
     };
     this.headZx.getZr().on('click', (params) => {
-      console.log(params.name)
+      // console.log(params.name)
       if(`${headtext}`!=="删除数量总统计"){
         /* this.echartsData.statefulInspectionName =params.name+headtext;
         this.router.navigateByUrl(`/statisticanalysis/delete_one/delete_there`); */

src/app/statistic-analysis/home/home.component.html

@@ -10,7 +10,7 @@
             <div id="chartHynyxf" class="chart-item"></div>
           </div>
         </div>
-        <div class="box-wrap mt" style="flex: 0; height: 150px;">
+        <div class="box-wrap mt" style="flex: 0; height: 150px;cursor: pointer;" (click)="scheduled()">
           <div class="panel-hd" style="padding-top: 0px;">
             <div class="panel-tit" style="color: white;">计划完成情况</div>
           </div>

src/app/statistic-analysis/home/home.component.ts

@@ -41,7 +41,13 @@ export class HomeComponent implements OnInit {
   }
   otherPlan(){
     // this.router.navigate(['/planManagement/entryPlan'])
+  } 
+  
+  //计划更新页面跳转
+  scheduled(){
+    this.router.navigate(['/statisticanalysis/scheduledUpdates'])
   }
+
   ngOnDestroy(): void {
     this.planState.clear()
     this.planState.dispose()