[删除]页面修改2

4 years ago · 2a3fd37bf3
6 changed files with 19 additions and 17 deletions
--- a/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html
+++ b/src/app/statistic-analysis/deleteUnit/delete-four/delete-four.component.html
@ -4,10 +4,10 @@
 * @Author: sueRimn
 * @Date: 2020-09-02 16:22:58
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-05 14:52:26
+ * @LastEditTime: 2020-09-05 16:33:04
 -->
-<div style="height: 100px; width: 100%; padding-right: 20px;">
-    <button mat-raised-button (click)='goBack()' style="float: right;">返回</button>
+<div style="height: 68px; width: 100%; border-bottom:2px solid #d4dde4;">
+    <button mat-raised-button (click)='goBack()' style="float: right; margin-right: 50px;margin-top: 20px;">返回</button>
 </div>

 <div class="detailBox">
--- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html
@ -4,13 +4,13 @@
 * @Author: sueRimn
 * @Date: 2020-09-02 16:22:35
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-05 15:10:46
+ * @LastEditTime: 2020-09-05 16:35:25
 -->
 <div class="head">
-    <select style="width: 80px;height: 50px; margin-left: 400px;margin-top: 20px;">
+    <select style="width: 80px;height: 30px; margin-left: 600px;margin-top: 20px;">
        <option value ="2020">2020</option>
      </select>
-      <select style="width: 80px;height: 50px; margin-left: 50px;" >
+      <select style="width: 80px;height: 30px; margin-left: 50px;" >
        <option value ="1">1</option>
        <option value ="1">2</option>
        <option value ="1">3</option>
@ -23,7 +23,7 @@
      </select>
      
      <button type="submit" mat-raised-button color="primary" style="margin-left: 50px;">查询</button>
-      <button mat-raised-button (click)='goBack()' style="margin-left: 50px;">返回</button>
+      <button mat-raised-button (click)='goBack()' style="float: right; margin-top: 20px;margin-right: 50px;">返回</button>
      
 </div>
 <div id="zhidui" class="zhu"></div>
--- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss
@ -2,17 +2,18 @@
    //display: flex;
    border-bottom:2px solid #d4dde4;
    width: 100%;
-    height: 100px;
+    height: 68px;
    background-color:white ;
 }
 .chaxun{
-     margin-left: 50px;
+     margin-left: 20px;
     padding: 15px 32px;
 }
 .zhu{
    padding-top: 200px;
-    padding-left: 200px;
+    //padding: 100px 100px 100px 100px;
+    
    text-align: center;
-    height: 270px;
-    width: 880px;
+    height: 300px;
+    width: 1700px;
 }
--- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts
+++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.ts
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-09-02 16:22:35
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-05 14:43:05
+ * @LastEditTime: 2020-09-05 16:27:05
 */
 import { Component, OnInit } from '@angular/core';
 import { Router,ActivatedRoute } from '@angular/router';
@ -115,7 +115,7 @@ export class DeleteThereComponent implements OnInit {
          backgroundStyle: {
              color: 'rgba(220, 220, 220, 0.8)'
          },
-          barWidth :'28',
+          barWidth :'58',
          //label: this.topTextlabel
      }]
    };
--- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
+++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html
@ -4,7 +4,7 @@
 * @Author: sueRimn
 * @Date: 2020-09-02 16:21:18
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-05 09:57:47
+ * @LastEditTime: 2020-09-05 15:46:21
 -->
 <body>

--- 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,14 +4,14 @@
 * @Author: sueRimn
 * @Date: 2020-09-02 16:21:18
 * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-05 15:09:27
+ * @LastEditTime: 2020-09-05 16:25:00
 */
 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'
+import {EchartsDataService,} from '../../echarts-data.service'
 declare var echarts: any;

@Component({
@ -32,6 +32,7 @@ export class DeleteTwoComponent implements OnInit {

  ngOnInit(): void {
    this.dateInit()
+    this.echartsData.tableTooltipNoShow2
    window.setTimeout(()=>{
      console.log(this.selectType)