diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html index ed4ee36..5bd279e 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -4,27 +4,29 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-20 15:12:57 + * @LastEditTime: 2021-03-24 14:35:51 -->
- 操作类型: + 操作类型: 全部 - 更新 - 新增 - 删除 - 共计:{{count}}条 + 更新 + 新增 + 删除 +
+ 共计:{{count}}条 +
-
- 审核状态: +
+ 审核状态: 全部 - 初审通过 - 初审驳回 - 终审通过 - 终审驳回 + 初审通过 + 初审驳回 + 终审通过 + 终审驳回
类型: @@ -53,16 +55,16 @@
- 时间: + 时间: - 🠊 + arrow forward - - + +
@@ -124,48 +126,51 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss index 3336d7c..6c729a8 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.scss +++ b/src/app/plan-audit/plan-record/plan-record.component.scss @@ -5,6 +5,7 @@ .boxleft{ height: 100%; width: 45%; + overflow-y: auto; background-color: #FFFFFF; display: flex; flex-direction: column; @@ -12,31 +13,106 @@ display: flex; flex-direction: column; .headdiv{ - margin: 0 0 0 30px; + @media screen and (min-device-width:1300px){ + margin: 0 0 0 28px; + } + @media screen and (max-device-width:1300px){ + margin-left: 0; + } height: 40px; + display: flex; + flex-direction: row; span{ font-size: 16px; margin-left: 3px; } input{ - margin-left: 15px; + @media screen and (min-device-width:1300px){ + margin-left: 50px; + } + @media screen and (max-device-width:1300px){ + margin-left: 12px; + } position: relative; - top: 1px; + top: 6px; + } + .count{ + @media screen and (min-device-width:1300px){ + margin-left: 110px; + } + @media screen and (max-device-width:1300px){ + margin-left: 20px; + } + } + } + .headdivtwo{ + @media screen and (min-device-width:1300px){ + margin: 0 0 0 28px; + } + @media screen and (max-device-width:1300px){ + margin-left: 0; + } + height: 40px; + display: flex; + flex-direction: row; + span{ + font-size: 16px; + margin-left: 3px; + } + input{ + @media screen and (min-device-width:1300px){ + margin-left: 50px; + } + @media screen and (max-device-width:1300px){ + margin-left: 0; + } + position: relative; + top: 5px; + } + .count{ + @media screen and (min-device-width:1300px){ + margin-left: 110px; + } + @media screen and (max-device-width:1300px){ + margin-left: 20px; + } } } .headthree{ - margin-left: 30px; + @media screen and (min-device-width:1300px){ + margin-left: 30px; + } + mat-form-field{ width: 150px; } } + .headfour{ + span{ + @media screen and (min-device-width:1300px){ + margin-left: 30px; + } + } + button{ + @media screen and (min-device-width:1300px){ + margin-left: 40px; + } + @media screen and (max-device-width:1300px){ + margin-left: 120px; + } + } + } } .tablediv{ width: 100%; height: 100%; padding-bottom: 20px; + .tbodycss{ - overflow-y: auto; + //overflow-y: auto; + @media screen and (min-device-width:1300px){ + overflow-y: auto; + } height:550px; width: 100%; .selectedTr{ @@ -74,6 +150,17 @@ margin-left: 10px; display: flex; flex-direction: column; + @media screen and (max-device-width:1300px){ + overflow-y: auto; + } + .company{ + @media screen and (min-device-width:1300px){ + overflow-y: auto; + } + flex: 1; + //overflow-y: auto; + margin-top: 10px; + } .word{ width: 100%; height: 100%; diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index 735def0..60c2964 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -5,16 +5,19 @@
操作类型: 全部 - 更新 - 新增 - 删除 + 更新 + 新增 + 删除 - 共计:{{count}}条 +
+ 共计:{{count}}条 +
+
类型: @@ -34,13 +37,13 @@ 联动力量 - 编制级别: + 编制级别: {{item.name}} - +
@@ -96,7 +99,7 @@
- + diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss index 5461692..8e7a58c 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss @@ -8,12 +8,20 @@ background-color: #FFFFFF; display: flex; flex-direction: column; + overflow: auto; .lefthead{ display: flex; flex-direction: column; .headdiv{ - margin: 0 0 0 30px; + @media screen and (min-device-width:1300px){ + margin: 0 0 0 28px; + } + @media screen and (max-device-width:1300px){ + margin-left: 5px; + } height: 40px; + display: flex; + flex-direction: row; .radio{ height: 10px; } @@ -22,13 +30,31 @@ margin-left: 3px; } input{ - margin-left: 15px; + @media screen and (min-device-width:1300px){ + margin-left: 50px; + } + @media screen and (max-device-width:1300px){ + margin-left: 12px; + } position: relative; - top: 1px; + top: 6px; + } + .count{ + @media screen and (min-device-width:1300px){ + margin-left: 110px; + } + @media screen and (max-device-width:1300px){ + margin-left: 20px; + } } } .headthree{ - margin-left: 30px; + @media screen and (min-device-width:1300px){ + margin-left: 30px; + } + @media screen and (max-device-width:1300px){ + margin-left: 7px; + } mat-form-field{ width: 150px; } @@ -41,13 +67,17 @@ height: 14px; width: 14px; } + } } .tablediv{ width: 100%; height: 100%; .tbodycss{ - overflow-y: auto; + @media screen and (min-device-width:1300px){ + overflow-y: auto; + } + height: 650px; width: 100%; .selectedTr{ @@ -82,12 +112,23 @@ } .boxright{ height: 100%; + @media screen and (max-device-width:1300px){ + overflow-y: auto; + } width: 55%; flex: 1; background-color: #FFFFFF; margin-left: 10px; display: flex; flex-direction: column; + .company{ + @media screen and (min-device-width:1300px){ + overflow-y: auto; + } + flex: 1; + //overflow-y: auto; + margin-top: 10px; + } .righthead{ width: 100%; display: flex; @@ -103,7 +144,7 @@ margin-right: 7%; } .rightheadtwo{ - width: 40%; + width: 50%; margin-right: 2%; } } diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index 3164b0c..80371fd 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 16:13:50 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-20 15:35:16 + * @LastEditTime: 2021-03-23 16:36:07 */ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index 788e2d9..a7a79a8 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 10:59:48 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-23 15:09:09 + * @LastEditTime: 2021-03-24 13:36:02 -->
@@ -75,13 +75,13 @@ 操作 - 改名 + 改名 编辑 查看 下载 - 删除 + 删除 审批结果 - 提交审核 + 提交审核 撤销审核 diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts index c6fae9e..36cdc25 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts @@ -87,11 +87,13 @@ export class AddUnitOneComponent implements OnInit { }, legend: { //type: tid=="pieone"?'scroll':'', - orient: 'vertical', - left: tid=="pieone"?0:650, + //orient: 'vertical', + //left: tid=="pieone"?0:650, //right:30, //top:100, - bottom:tid=="pieone"?600:500, + //bottom:tid=="pieone"?600:500, + bottom: 90, + left: 'center', textStyle:{ fontSize:12, color:"#000000" @@ -102,9 +104,9 @@ export class AddUnitOneComponent implements OnInit { { name: '访问来源', type: 'pie', - radius: '70%', + radius: '50%', center: ['45%', '53%'], - top:300, + bottom:130, left:30, label:{ show:true, diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.html b/src/app/statistic-analysis/all-plan/all-plan.component.html index 2b9a48a..b45e2ec 100644 --- a/src/app/statistic-analysis/all-plan/all-plan.component.html +++ b/src/app/statistic-analysis/all-plan/all-plan.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-03-05 15:57:08 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-16 13:53:17 + * @LastEditTime: 2021-03-24 14:19:05 -->
@@ -44,7 +44,7 @@ - diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.scss b/src/app/statistic-analysis/all-plan/all-plan.component.scss index dceb5cf..01512e9 100644 --- a/src/app/statistic-analysis/all-plan/all-plan.component.scss +++ b/src/app/statistic-analysis/all-plan/all-plan.component.scss @@ -24,7 +24,7 @@ .title{ width: 100%; text-align: center; - margin-top: 2%; + margin-top: 3%; span{ text-align: center; font-size: 28px; @@ -39,10 +39,11 @@ .tablebox{ width: 100%; text-align: center; + margin-top:2%; table{ - width: 50%; + width: 100%; text-align: center; - margin-left: 25%; + //margin-left: 25%; margin-top:20px; th,td{ text-align: center; diff --git a/src/app/statistic-analysis/compang-info/compang-info.component.html b/src/app/statistic-analysis/compang-info/compang-info.component.html index 557c6fd..da2f00c 100644 --- a/src/app/statistic-analysis/compang-info/compang-info.component.html +++ b/src/app/statistic-analysis/compang-info/compang-info.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-03-05 15:57:08 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-06 11:35:12 + * @LastEditTime: 2021-03-24 14:13:53 -->
@@ -42,7 +42,7 @@ - diff --git a/src/app/statistic-analysis/compang-info/compang-info.component.scss b/src/app/statistic-analysis/compang-info/compang-info.component.scss index dceb5cf..01512e9 100644 --- a/src/app/statistic-analysis/compang-info/compang-info.component.scss +++ b/src/app/statistic-analysis/compang-info/compang-info.component.scss @@ -24,7 +24,7 @@ .title{ width: 100%; text-align: center; - margin-top: 2%; + margin-top: 3%; span{ text-align: center; font-size: 28px; @@ -39,10 +39,11 @@ .tablebox{ width: 100%; text-align: center; + margin-top:2%; table{ - width: 50%; + width: 100%; text-align: center; - margin-left: 25%; + //margin-left: 25%; margin-top:20px; th,td{ text-align: center;