shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]审核页面优化

tianjin
邵佳豪 2 years ago
parent
ad9fc5d4c4
commit
648a04b4a0
6 changed files with 1129 additions and 877 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/app/plan-audit/plan-record/plan-record.component.html
  2. 28
      src/app/plan-audit/plan-record/plan-record.component.scss
  3. 3
      src/app/plan-audit/plan-record/plan-record.component.ts
  4. 18
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  5. 885
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  6. 1062
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts

10
src/app/plan-audit/plan-record/plan-record.component.html
Unescape View File

@ -74,6 +74,8 @@
<mat-option value="16">文本预案</mat-option> <mat-option value="16">文本预案</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div>
<div class="btnbox">
<button mat-raised-button color="primary" type="submit">查询</button> <button mat-raised-button color="primary" type="submit">查询</button>
<button mat-raised-button color="primary" (click)='record()'>重置</button> <button mat-raised-button color="primary" (click)='record()'>重置</button>
</div> </div>
@ -121,14 +123,16 @@
<td style="width: 15%;">{{item.createTime|date:'yyyy-MM-dd'}}</td> <td style="width: 15%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr> </tr>
</table> </table>
<mat-paginator [length]="count" [pageSize]="10" (page)="chagePage($event)"> <mat-paginator [length]="count" [pageIndex]="PageNumber - 1" [pageSize]="10" (page)="chagePage($event)">
</mat-paginator> </mat-paginator>
</div> </div>
</div> </div>
</div> </div>
<div class="mask" *ngIf="isTableData">
<mat-spinner [diameter]="30"></mat-spinner>
</div>
</div> </div>
<div class="boxright"> <div class="boxright">
<div class="company" *ngIf="showtype == 3"> <div class="company" *ngIf="showtype == 3">
@ -179,7 +183,7 @@
<div class="word" *ngIf="showtype==0"> <div class="word" *ngIf="showtype==0">
<div class="shadow" *ngIf="!iftrue"> <div class="shadow" *ngIf="!iftrue">
<mat-spinner></mat-spinner> <mat-spinner [diameter]="30"></mat-spinner>
</div> </div>
<button mat-raised-button color="primary" style="float: right;margin-top: 10px;margin-right: 15px;" <button mat-raised-button color="primary" style="float: right;margin-top: 10px;margin-right: 15px;"
*ngIf="showtype == 0||bianzhi" (click)='lookNew()'>查看详情</button> *ngIf="showtype == 0||bianzhi" (click)='lookNew()'>查看详情</button>

28
src/app/plan-audit/plan-record/plan-record.component.scss
Unescape View File

@ -10,6 +10,7 @@
background-color: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: relative;
.lefthead { .lefthead {
height: 100%; height: 100%;
@ -204,9 +205,9 @@
button { button {
@media screen and (min-device-width:1400px) { @media screen and (min-device-width:1400px) {
margin-left: 40px; margin-left: 40px;
font-size: 14px; font-size: 13px;
width: 70px; width: 65px;
height: 32px; height: 34px;
} }
@media screen and (max-device-width:1200px) { @media screen and (max-device-width:1200px) {
@ -236,6 +237,16 @@
} }
} }
.btnbox {
display: flex;
justify-content: center;
align-items: center;
button {
margin: 0 6px;
}
}
} }
.tablediv { .tablediv {
@ -244,6 +255,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
.header { .header {
margin-left: 10px; margin-left: 10px;
margin-right: 10px; margin-right: 10px;
@ -283,6 +295,16 @@
} }
} }
} }
.mask {
position: absolute;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.2);
display: flex;
justify-content: center;
align-items: center;
}
} }
.boxright { .boxright {

3
src/app/plan-audit/plan-record/plan-record.component.ts
Unescape View File

@ -95,7 +95,9 @@ export class PlanRecordComponent implements OnInit {
//获取表格数据 //获取表格数据
PageNumber = 1; PageNumber = 1;
isTableData = false;
getAlltabledate() { getAlltabledate() {
this.isTableData = true;
let paramsdata: any = { let paramsdata: any = {
Operation: this.level || [], Operation: this.level || [],
ContentType: Number(this.projectlevel) || [], ContentType: Number(this.projectlevel) || [],
@ -112,6 +114,7 @@ export class PlanRecordComponent implements OnInit {
.get("/api/ContentVerifies", { params: paramsdata }) .get("/api/ContentVerifies", { params: paramsdata })
.subscribe((data: any) => { .subscribe((data: any) => {
//console.log(data) //console.log(data)
this.isTableData = false;
this.tableDate = data.items; this.tableDate = data.items;
this.count = data.totalCount; this.count = data.totalCount;
}); });

18
src/app/plan-audit/wait-examineer/wait-examineer.component.html
Unescape View File

@ -55,19 +55,18 @@
<mat-option value="16">文本预案</mat-option> <mat-option value="16">文本预案</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<button mat-raised-button color="primary" type="submit" class="find">查询</button>
<button mat-raised-button color="primary" (click)='record()'><img src="../../../assets/images/refresh.png">
重置</button>
</div> </div>
</div>
<div class="btnbox">
<button mat-raised-button color="primary" type="submit">查询</button>
<button mat-raised-button color="primary" (click)='record()'>重置</button>
</div> </div>
</form> </form>
</div> </div>
<div class="tablediv"> <div class="tablediv">
<table cellspacing="0" cellpadding="0" style="margin-top: 10px;margin-bottom: 5px;"> <table class="theader" cellspacing="0" cellpadding="0" style="margin-top: 10px;margin-bottom: 5px;">
<thead> <thead>
<th style="width: 10%;margin-left: 5px;">状态</th> <th style="width: 10%;margin-left: 5px;">状态</th>
<th style="width: 10%;">类型</th> <th style="width: 10%;">类型</th>
@ -112,9 +111,12 @@
<td style="width: 13%;">{{item.createTime|date:'yyyy-MM-dd'}}</td> <td style="width: 13%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr> </tr>
</table> </table>
<mat-paginator [length]="count" [pageIndex]="PageNumber - 1" [pageSize]="10" (page)="chagePage($event)">
</mat-paginator>
</div> </div>
</div>
<div class="mask" *ngIf="isTableData">
<mat-spinner [diameter]="30"></mat-spinner>
</div> </div>
</div> </div>

885
src/app/plan-audit/wait-examineer/wait-examineer.component.scss
Unescape View File

@ -1,440 +1,555 @@
.box { .box {
height: 100%;
width: 100%;
display: flex;
img {
cursor: pointer;
}
.boxleft {
height: 100%; height: 100%;
width: 100%; width: 45%;
background-color: #ffffff;
display: flex; display: flex;
img{ flex-direction: column;
cursor: pointer; overflow: hidden;
} position: relative;
.boxleft {
height: 100%; .lefthead {
width: 45%; display: flex;
background-color: #ffffff; flex-direction: column;
align-items: center;
form{
width: 100%;
}
.headdiv {
@media screen and (min-device-width: 1400px) {
margin: 0 0 0 28px;
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 15px;
}
@media screen and (max-device-width: 1200px) {
margin-left: 5px;
}
height: 40px;
display: flex; display: flex;
flex-direction: column; flex-direction: row;
//overflow: auto; align-items: center;
.lefthead {
height: 30%; .radio {
display: flex; height: 10px;
flex-direction: column;
align-items: center;
.headdiv {
@media screen and (min-device-width: 1400px) {
margin: 0 0 0 28px;
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 15px;
}
@media screen and (max-device-width: 1200px) {
margin-left: 5px;
}
height: 40px;
display: flex;
flex-direction: row;
align-items: center;
.radio {
height: 10px;
}
span {
@media screen and (min-device-width: 1400px) {
font-size: 16px;
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
font-size: 16px;
}
@media screen and (max-device-width: 1200px) {
font-size: 14px;
}
margin-left: 3px;
}
input {
position: relative;
@media screen and (min-device-width: 1400px) {
margin-left: 40px;
}
@media screen and (max-device-width: 1200px) {
margin-left: 8px;
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 8px;
}
}
.count {
@media screen and (min-device-width: 1400px) {
margin-left: 110px;
}
@media screen and (max-device-width: 1200px) {
margin-left: 20px;
position: relative;
bottom: 3px;
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 20px;
/* position: relative;
bottom: 3px; */
}
}
}
.headthree {
display: flex;
flex-direction: column;
.bzjb{
@media screen and (min-device-width: 1400px){
margin-left: 100px;
}
}
.find{
@media screen and (min-device-width: 1400px){
margin-left: 200px;
}
}
@media screen and (min-device-width: 1400px) {
margin-left: 30px;
}
@media screen and (max-device-width: 1200px) {
margin-left: 7px;
font-size: 14px;
mat-form-field {
width: 120px;
}
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 15px;
//font-size: 14px;
mat-form-field {
width: 140px;
}
}
button {
@media screen and (min-device-width: 1400px) {
margin-left: 30px;
font-size: 16px;
width: 80px;
height: 36px;
}
@media screen and (max-device-width: 1400px) {
margin-left: 20px;
font-size: 14px;
}
}
img {
@media screen and (min-device-width: 1400px) {
height: 14px;
width: 14px;
}
@media screen and (max-device-width: 1400px) {
height: 12px;
width: 12px;
}
}
}
} }
.tablediv {
width: 100%; span {
height: 62%; @media screen and (min-device-width: 1400px) {
.tbodycss { font-size: 16px;
overflow-y: auto; }
height: 100%; @media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
width: 100%; font-size: 16px;
.selectedTr { }
background-color: #b3d3ee;
} @media screen and (max-device-width: 1200px) {
td { font-size: 14px;
font-weight: 10; }
@media screen and (min-device-width: 1200px) {
font-size: 16px; margin-left: 3px;
}
@media screen and (max-device-width: 1200px) {
font-size: 14px;
}
}
}
table {
margin-left: 10px;
margin-right: 10px;
width: 97.5%;
//margin-bottom: 10px;
thead {
height: 48px;
color: #ffffff;
background-color: #2196f3;
//font-size: 10px;
th {
font-weight: 10;
@media screen and (min-device-width: 1200px) {
font-size: 16px;
}
@media screen and (max-device-width: 1200px) {
font-size: 14px;
}
}
}
tr:nth-child(odd) {
background: #fafafa;
}
}
} }
}
.boxright { input {
height: 100%; position: relative;
width: 53%;
@media screen and (max-device-width: 1400px) { @media screen and (min-device-width: 1400px) {
overflow-y: auto; margin-left: 40px;
}
@media screen and (max-device-width: 1200px) {
margin-left: 8px;
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 8px;
}
} }
flex: 1; .count {
background-color: #ffffff; @media screen and (min-device-width: 1400px) {
margin-left: 10px; margin-left: 110px;
}
@media screen and (max-device-width: 1200px) {
margin-left: 20px;
position: relative;
bottom: 3px;
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 20px;
/* position: relative;
bottom: 3px; */
}
}
}
.headthree {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.company {
//margin-left: 20px; .bzjb {
@media screen and (min-device-width: 1400px) { @media screen and (min-device-width: 1400px) {
overflow-y: auto; margin-left: 100px;
} }
flex: 1;
//overflow-y: auto;
margin-top: 10px;
} }
.righthead {
width: 100%; .find {
display: flex; @media screen and (min-device-width: 1400px) {
height: 50px; margin-left: 80px;
align-items: center; }
flex-direction: row-reverse;
button {
margin-left: 10px;
font-size: 16px;
}
.rightheadone {
width: 40%;
margin-right: 7%;
}
.rightheadtwo {
width: 60%;
margin-right: 2%;
}
} }
.word { @media screen and (min-device-width: 1400px) {
width: 100%; margin-left: 30px;
height: 100%; }
.shadow{
height: 95%; @media screen and (max-device-width: 1200px) {
width: 97%; margin-left: 7px;
margin: 10px 10px 10px 10px; font-size: 14px;
/* position:absolute;
left:0; mat-form-field {
top:0; */ width: 120px;
z-index:998; }
background-color:#FFFFFF; }
opacity:0.6;
mat-spinner{ @media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
position: relative; margin-left: 15px;
top: 40%;
left: 40%; //font-size: 14px;
} mat-form-field {
width: 140px;
}
}
button {
@media screen and (min-device-width: 1400px) {
margin-left: 40px;
font-size: 13px;
width: 65px;
height: 34px;
}
@media screen and (max-device-width: 1400px) {
margin-left: 20px;
font-size: 14px;
}
}
img {
@media screen and (min-device-width: 1400px) {
height: 14px;
width: 14px;
}
@media screen and (max-device-width: 1400px) {
height: 12px;
width: 12px;
}
}
}
.btnbox{
display: flex;
justify-content: center;
align-items: center;
button{
margin: 0 6px;
}
}
}
.tablediv {
width: 100%;
flex: 1;
overflow: hidden;
display: flex;
flex-direction: column;
.theader {
margin-left: 10px;
margin-right: 10px;
width: 97.5%;
thead {
height: 48px;
color: #ffffff;
background-color: #2196f3;
th {
font-weight: 10;
@media screen and (min-device-width: 1200px) {
font-size: 16px;
} }
iframe {
height: 95%; @media screen and (max-device-width: 1200px) {
width: 97%; font-size: 14px;
margin: 10px 10px 10px 10px;
overflow-y: auto;
border: medium none;
} }
}
} }
#viewer {
margin: 10px 10px 10px 10px; tr:nth-child(odd) {
width: 97%; background: #fafafa;
height: 93%;
} }
.waterAudit, }
.fireForceAudit,
.LinkageForcesAudit { .tbodycss {
flex: 1;
width: 100%; flex: 1;
height: 100%; width: 100%;
box-sizing: border-box; overflow-y: auto;
box-sizing: border-box;
padding-left: 15px;
.selectedTr {
background-color: #b3d3ee;
} }
.emptyContent {
width: 100%; td {
text-align: center; font-weight: 10;
@media screen and (min-device-width: 1200px) {
font-size: 16px;
}
@media screen and (max-device-width: 1200px) {
font-size: 14px;
}
} }
}
} }
}
th, .mask {
td { position: absolute;
height: 43px; width: 100%;
@media screen and (min-device-width: 1400px) { height: 100%;
font-size: 16px; background: rgba(0, 0, 0, 0.2);
display: flex;
justify-content: center;
align-items: center;
} }
}
.boxright {
height: 100%;
width: 53%;
@media screen and (max-device-width: 1400px) { @media screen and (max-device-width: 1400px) {
font-size: 14px; overflow-y: auto;
}
flex: 1;
background-color: #ffffff;
margin-left: 10px;
display: flex;
flex-direction: column;
.company {
//margin-left: 20px;
@media screen and (min-device-width: 1400px) {
overflow-y: auto;
}
flex: 1;
//overflow-y: auto;
margin-top: 10px;
}
.righthead {
width: 100%;
display: flex;
height: 50px;
align-items: center;
flex-direction: row-reverse;
button {
margin-left: 10px;
font-size: 16px;
}
.rightheadone {
width: 40%;
margin-right: 7%;
}
.rightheadtwo {
width: 60%;
margin-right: 2%;
}
}
.word {
width: 100%;
height: 100%;
.shadow {
height: 95%;
width: 97%;
margin: 10px 10px 10px 10px;
/* position:absolute;
left:0;
top:0; */
z-index: 998;
background-color: #FFFFFF;
opacity: 0.6;
mat-spinner {
position: relative;
top: 40%;
left: 40%;
}
}
iframe {
height: 95%;
width: 97%;
margin: 10px 10px 10px 10px;
overflow-y: auto;
border: medium none;
}
} }
text-align: center;
//white-space: nowrap; #viewer {
margin: 10px 10px 10px 10px;
width: 97%;
height: 93%;
}
.waterAudit,
.fireForceAudit,
.LinkageForcesAudit {
flex: 1;
width: 100%;
height: 100%;
box-sizing: border-box;
}
.emptyContent {
width: 100%;
text-align: center;
}
}
}
th,
td {
height: 43px;
@media screen and (min-device-width: 1400px) {
font-size: 16px;
}
@media screen and (max-device-width: 1400px) {
font-size: 14px;
}
text-align: center;
//white-space: nowrap;
} }
.green { .green {
color: #00c756; color: #00c756;
} }
.red { .red {
color: #ff4d4d; color: #ff4d4d;
} }
.yellow { .yellow {
color: #FFC94B; color: #FFC94B;
} }
.accordingin { .accordingin {
margin: 5px; margin: 5px;
.panelhead {
background-color: #e8f4fe; .panelhead {
color: #2196f3; background-color: #e8f4fe;
font-size: 16px; color: #2196f3;
span { font-size: 16px;
margin-left: 10px;
} span {
margin-left: 10px;
} }
table { }
margin: 5px 0;
width: 100%; table {
th { margin: 5px 0;
background-color: #fafafa; width: 100%;
width: 30%;
font-size: 16px; th {
text-align: right; background-color: #fafafa;
} width: 30%;
td { font-size: 16px;
text-align: left; text-align: right;
font-size: 16px;
margin-left: 3px;
.spantext{
margin-left: 7px;
}
.buleColor{
color: #2196f3;
}
}
} }
.addFiles{
tr{ td {
td{ text-align: left;
img{ font-size: 16px;
width: 150px; margin-left: 3px;
height: 105px;
margin-right: 6px; .spantext {
} margin-left: 7px;
} }
}
.buleColor {
color: #2196f3;
}
} }
.onebuilding { }
display: flex;
margin: 5px 0; .addFiles {
width: 100%; tr {
.accordingleft { td {
background-color: #fafafa; img {
width: 30%; width: 150px;
height: 120px; height: 105px;
font-size: 16px; margin-right: 6px;
text-align: right;
}
.accordingright {
margin: 7px;
height: 100px;
font-size: 16px;
img {
margin-left: 10px;
//height: 80px;
}
span {
margin-left: 10px;
position: relative;
bottom: 90px;
}
} }
}
} }
} }
.echarts {
width: 480px; .onebuilding {
height: 304px;
display: flex; display: flex;
background-color: #000000; margin: 5px 0;
opacity: 0.7; width: 100%;
position: absolute;
top: 13%; .accordingleft {
left: 55%; background-color: #fafafa;
z-index: 100; width: 30%;
.bar { height: 120px;
height: 100%; font-size: 16px;
width: 40%; text-align: right;
opacity: 1;
//margin: 40px 30px;
} }
.zhu {
margin-bottom: 100px; .accordingright {
margin-right: 20px; margin: 7px;
height: 95%; height: 100px;
width: 60%; font-size: 16px;
opacity: 1;
img {
margin-left: 10px;
//height: 80px;
}
span {
margin-left: 10px;
position: relative;
bottom: 90px;
}
} }
}
}
.echarts {
width: 480px;
height: 304px;
display: flex;
background-color: #000000;
opacity: 0.7;
position: absolute;
top: 13%;
left: 55%;
z-index: 100;
.bar {
height: 100%;
width: 40%;
opacity: 1;
//margin: 40px 30px;
}
.zhu {
margin-bottom: 100px;
margin-right: 20px;
height: 95%;
width: 60%;
opacity: 1;
}
} }
.twoD { .twoD {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: left; align-items: left;
.planBox {
margin: 30px 30px; .planBox {
color: black; margin: 30px 30px;
:first-child { color: black;
margin-right: 10px;
} :first-child {
margin-right: 10px;
} }
}
} }
//滚动条样式 //滚动条样式
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 6px; width: 6px;
background-color: white; background-color: white;
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background-color: #2196f3; background-color: #2196f3;
} }
.remarkbox { .remarkbox {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
.remarkhead {
width: 100%; width: 100%;
height: 100%;
display: flex; span {
flex-direction: column; font-size: 20px;
.remarkhead { text-align: center;
width: 100%; width: 80px;
span { margin-left: 40%;
font-size: 20px;
text-align: center;
width: 80px;
margin-left: 40%;
}
} }
.remarktext { }
width: 100%;
margin-top: 20px; .remarktext {
textarea { width: 100%;
width: 420px; margin-top: 20px;
height: 110px;
outline: none; textarea {
} width: 420px;
height: 110px;
outline: none;
} }
.remarkbottom { }
width: 100%;
margin-top: 22px; .remarkbottom {
button { width: 100%;
width: 100px; margin-top: 22px;
height: 36px;
font-size: 17px; button {
} width: 100px;
height: 36px;
font-size: 17px;
} }
}
} }

1062
src/app/plan-audit/wait-examineer/wait-examineer.component.ts
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save