diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html index ed8126d..c0810b4 100644 --- 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,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:22:35 * @LastEditors: sueRimn - * @LastEditTime: 2020-09-07 10:41:43 + * @LastEditTime: 2020-09-07 16:05:31 --> -
-
-
- 查询年份: - - - {{item}} - - - 查询月份: - - - {{item}} - - - -
-
+
+
+
+
+ 查询年份: + + + {{item}} + + + 查询月份: + + + {{item}} + + + +
+
-
- +
+ +
+
+
+
+ +
-
-
-
diff --git a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss index ba65ca5..7581631 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss +++ b/src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss @@ -1,61 +1,76 @@ -/* .head{ - //display: flex; - border-bottom:2px solid #d4dde4; - width: 100%; - height: 68px; - background-color:white ; -} */ +.box{ + width: 100%; + height: 92%; + display: flex; + flex-direction: column; + overflow: hidden; + position: relative; + .echartsbox{ + width: 100%; + height: 100%; + // overflow: auto; + } + #Line{ + width: 50%; + height: 420px; + margin: 50px auto; + } +} +.publicCss{ + height: 350px; + width: 50%; + display: inline-block; + box-sizing: border-box; + padding: 20px; +} + //头部搜索栏 .header { - border-bottom: 1px solid #999; - height: 80px; - min-height: 81px;; - box-sizing: border-box; - // padding: 0 15px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items:center; - justify-content:center; - .queryField { - margin: 0 10px; - font-size: 14px; - .mat-form-field { - width: 130px; - max-height: 50px;; - margin: 0 15px 0 10px; - } + border-bottom: 1px solid #999; + height: 80px; + min-height: 81px;; + box-sizing: border-box; + // padding: 0 15px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items:center; + justify-content:center; + .queryField { + margin: 0 10px; + font-size: 14px; + .mat-form-field { + width: 130px; + max-height: 50px;; + margin: 0 15px 0 10px; } - .btnbox{ - height: 80px; - display: flex; - flex-direction:column; - justify-content: space-around; - position: fixed; - top: 64px; - right: 4%; - width: 88px; - button{ - width: 88px; - height: 36px; - } + } + .btnbox{ + height: 80px; + display: flex; + flex-direction:column; + justify-content: space-around; + position: fixed; + top: 64px; + right: 4%; + width: 88px; + button{ + width: 88px; + height: 36px; + } - } } -.chaxun{ - margin-left: 20px; - padding: 15px 32px; } .zhu{ - width: 100%; - height: 100%; - position: relative; - #zhidui{ - width: 100%; - height: 350px; - position: absolute; - left: 50%; - top: 45%; - transform: translate(-50%,-50%); - } + width: 100%; + height: 100%; + overflow: auto; + #zhidui{ + width: 100%; + height: 350px; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + } } \ No newline at end of file diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html index 27af928..c859182 100644 --- 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-07 08:56:53 + * @LastEditTime: 2020-09-07 15:57:47 --> @@ -71,6 +71,7 @@
-->
+
@@ -110,5 +111,8 @@
-
+ + + +
diff --git a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss index 2c550f0..85cadc3 100644 --- a/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss +++ b/src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss @@ -1,13 +1,15 @@ body{ - overflow:auto; + overflow: hidden; } + //头部搜索栏 .header { + width: 90%; + position: fixed ; border-bottom: 1px solid #999; - height: 70px; - min-height: 70px; + height: 68px; + //min-height: 81px; box-sizing: border-box; - padding: 0 15px; display: flex; flex-direction: row; flex-wrap: wrap; @@ -22,11 +24,7 @@ body{ margin: 0 15px 0 10px; } } - /* .fixedCss{ - position: fixed; - top: 81px; - right: 32px; - } */ + } /* 最上面的折线图 */ @@ -35,11 +33,12 @@ body{ margin:0 auto; width: 800px; height: 450px; - padding-top: 50px; + //padding-top: 150px; + margin-top: 50px; } /* 其余折线图 */ .mainbox { - margin-top: 100px; + margin-top: 80px; //padding-top: 50px; padding-bottom: 50px; min-width: 1024px;