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

[完善]审核记录分页

tianjin
邵佳豪 2 years ago
parent
9d8159f38b
commit
ad9fc5d4c4
7 changed files with 141 additions and 135 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/app/plan-audit/plan-record/plan-record.component.html
  2. 47
      src/app/plan-audit/plan-record/plan-record.component.scss
  3. 12
      src/app/plan-audit/plan-record/plan-record.component.ts
  4. 36
      src/app/plan-audit/wait-examineer/wait-examineer.component.html
  5. 10
      src/app/plan-audit/wait-examineer/wait-examineer.component.scss
  6. 4
      src/index.html
  7. 7
      src/styles.scss

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

@ -75,35 +75,11 @@
</mat-select>
</mat-form-field>
<button mat-raised-button color="primary" type="submit">查询</button>
<button mat-raised-button color="primary" (click)='record()'><img src="../../../assets/images/refresh.png">
重置</button>
<button mat-raised-button color="primary" (click)='record()'>重置</button>
</div>
</form>
<!-- <div class="tablediv">
<table cellspacing="0" cellpadding="0">
<thead>
<th style="width: 15%;">类型</th>
<th style="width: 15%;">操作</th>
<th style="width: 15%;">所属组织</th>
<th style="width: 15%;">审核状态</th>
<th style="width: 15%;">提交人</th>
<th style="width: 25%;">提交时间</th>
</thead>
<tbody>
<tr *ngFor="let item of tableDate">
<td>{{item.level}}</td>
<td [ngClass]="{'green': item.option == '更新','red':item.option == '删除','blue':item.option == '新增'}">{{item.option}}</td>
<td>{{item.orgication}}</td>
<td [ngClass]="{'green': item.unitstate == '已通过','red':item.unitstate == '已拒绝'}">{{item.unitstate}}</td>
<td>{{item.addname}}</td>
<td>{{item.addtime}}</td>
</tr>
</tbody>
</table>
</div> -->
<div class="tablediv">
<table cellspacing="0" cellpadding="0" style="margin-top: 10px;">
<table class="header" cellspacing="0" cellpadding="0" style="margin-top: 10px;">
<thead>
<th style="width: 10%;">状态</th>
<th style="width: 10%;">类型</th>
@ -145,6 +121,8 @@
<td style="width: 15%;">{{item.createTime|date:'yyyy-MM-dd'}}</td>
</tr>
</table>
<mat-paginator [length]="count" [pageSize]="10" (page)="chagePage($event)">
</mat-paginator>
</div>

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

@ -12,6 +12,7 @@
flex-direction: column;
.lefthead {
height: 100%;
display: flex;
flex-direction: column;
@ -51,7 +52,7 @@
input {
@media screen and (min-device-width:1400px) {
margin-left:40px;
margin-left: 40px;
}
@ -102,6 +103,7 @@
display: flex;
flex-direction: row;
align-items: center;
span {
@media screen and (min-device-width:1200px) {
font-size: 16px;
@ -202,9 +204,9 @@
button {
@media screen and (min-device-width:1400px) {
margin-left: 40px;
font-size: 16px;
width: 80px;
height: 36px;
font-size: 14px;
width: 70px;
height: 32px;
}
@media screen and (max-device-width:1200px) {
@ -238,37 +240,20 @@
.tablediv {
width: 100%;
height: 100%;
padding-bottom: 20px;
.tbodycss {
//overflow-y: auto;
@media screen and (min-device-width:1400px) {
overflow-y: auto;
}
height:550px;
width: 100%;
.selectedTr {
background-color: #b3d3ee;
}
}
table {
//margin: 20px 20px;
flex: 1;
display: flex;
flex-direction: column;
overflow: hidden;
.header {
margin-left: 10px;
margin-right: 10px;
width: 97.5%;
//border: 1px solid #2196F3;
thead {
height: 48px;
color: #FFFFFF;
background-color: #2196F3;
//font-size: 16px;
th {
font-weight: 10;
@ -287,6 +272,16 @@
background: #FAFAFA;
}
}
.tbodycss {
flex: 1;
width: 100%;
overflow-y: auto;
.selectedTr {
background-color: #b3d3ee;
}
}
}
}

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

@ -94,6 +94,7 @@ export class PlanRecordComponent implements OnInit {
IsNewData = [true, false];
//获取表格数据
PageNumber = 1;
getAlltabledate() {
let paramsdata: any = {
Operation: this.level || [],
@ -104,6 +105,8 @@ export class PlanRecordComponent implements OnInit {
QueryEndTime: this.endtime || "",
PlanType: this.plantypes || [],
IsNewData: this.IsNewData,
PageNumber: this.PageNumber,
PageSize: 10,
};
this.http
.get("/api/ContentVerifies", { params: paramsdata })
@ -116,6 +119,7 @@ export class PlanRecordComponent implements OnInit {
//提交查询
onSubmit(value) {
//console.log(value)
this.PageNumber = 1;
this.getAlltabledate();
}
//刷新
@ -128,6 +132,14 @@ export class PlanRecordComponent implements OnInit {
let level = sessionStorage.getItem("level");
this.PlanLevel = "";
this.plantypes = [];
this.PageNumber = 1;
this.getAlltabledate();
}
//分页事件
chagePage(e) {
console.log(e);
this.PageNumber = e.pageIndex + 1;
this.getAlltabledate();
}
//表格点击事件

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

@ -39,7 +39,7 @@
</mat-form-field>
</div>
<div class="headthreetwo">
<span >状态：</span>
<span>状态：</span>
<mat-form-field>
<mat-select placeholder='请选择状态' name="IsNewData" [(ngModel)]="IsNewData" [multiple]="true">
<mat-option value=true>新增</mat-option>
@ -84,10 +84,12 @@
<table cellspacing="0" cellpadding="0" id="table">
<tr [ngClass]="{'selectedTr': item.id == id}" *ngFor="let item of tableDate;let key = index"
(click)='radioClick($event,item)'>
<td style="width: 10%;" [ngClass]="{'green': item.itemMaintenanceState == '0','yellow':item.itemMaintenanceState != '0'}">
<td style="width: 10%;"
[ngClass]="{'green': item.itemMaintenanceState == '0','yellow':item.itemMaintenanceState != '0'}">
<mat-checkbox color="primary" (change)='radioClick($event,item)' style="float: left;margin-bottom:'2px'">
</mat-checkbox>
{{item.itemMaintenanceState=='0'?'新增':'维护'}}</td>
{{item.itemMaintenanceState=='0'?'新增':'维护'}}
</td>
<td style="width: 10%;">
{{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'?
@ -139,7 +141,9 @@
<div *ngIf="showtype == 3" id="firefacilities" style="margin: 10px;">
<mat-accordion *ngIf="selectedItem.differentContent" class="tableContent" multi>
<!-- 基本信息 -->
<mat-expansion-panel *ngIf="this.differentContentOfUnitInfo && this.differentContentOfUnitInfo.length != 0 && this.differentContentOfUnitInfo[0].childrens.length != 0" expanded>
<mat-expansion-panel
*ngIf="this.differentContentOfUnitInfo && this.differentContentOfUnitInfo.length != 0 && this.differentContentOfUnitInfo[0].childrens.length != 0"
expanded>
<mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px' class="panelhead"
style="background-color: #2196F3;">
<mat-panel-title style="font-size: 16px;color: #FFFFFF;">
@ -161,9 +165,11 @@
<ng-container *ngIf="i.propertyName == 'imageUrl'; else elseTemplate">
<td>
<span class="spantext" style="vertical-align: top;">由</span>
<img (click)="lookImg(i.oldValue,true)" class="spantext" style="width: 150px;height: 105px;" [src]="i.oldValue ? i.oldValue : '/assets/images/noImg.png'" alt="">
<img (click)="lookImg(i.oldValue,true)" class="spantext" style="width: 150px;height: 105px;"
[src]="i.oldValue ? i.oldValue : '/assets/images/noImg.png'" alt="">
<span class="spantext" style="vertical-align: top;">变更为</span>
<img (click)="lookImg(i.newValue,true)" class="spantext" style="width: 150px;height: 105px;" [src]="i.newValue ? i.newValue : '/assets/images/noImg.png'" alt="">
<img (click)="lookImg(i.newValue,true)" class="spantext" style="width: 150px;height: 105px;"
[src]="i.newValue ? i.newValue : '/assets/images/noImg.png'" alt="">
</td>
</ng-container>
<ng-template #elseTemplate>
@ -176,7 +182,7 @@
</ng-container>
<ng-template #elseTemplate>
<td >
<td>
<span class="spantext">由</span>
<span class="spantext buleColor">{{i.oldValue | differentContentTitle}}</span>
<span class="spantext">变更为</span>
@ -191,7 +197,9 @@
</div>
</mat-expansion-panel>
<!-- 建筑信息 -->
<mat-expansion-panel *ngIf="this.differentContentOfBuildingsInfo && this.differentContentOfBuildingsInfo.childrens.length != 0" expanded>
<mat-expansion-panel
*ngIf="this.differentContentOfBuildingsInfo && this.differentContentOfBuildingsInfo.childrens.length != 0"
expanded>
<mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px' class="panelhead"
style="background-color: #2196F3;">
<mat-panel-title style="font-size: 16px;color: #FFFFFF;">
@ -227,7 +235,8 @@
</div>
</mat-expansion-panel>
<!-- 功能分区 -->
<mat-expansion-panel *ngIf="this.differentContentOfFunction && this.differentContentOfFunction.length != 0" expanded>
<mat-expansion-panel *ngIf="this.differentContentOfFunction && this.differentContentOfFunction.length != 0"
expanded>
<mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px' class="panelhead"
style="background-color: #2196F3;">
<mat-panel-title style="font-size: 16px;color: #FFFFFF;">
@ -235,7 +244,7 @@
</mat-panel-title>
</mat-expansion-panel-header>
<div class="accordingin">
<mat-accordion *ngFor="let item of this.differentContentOfFunction" >
<mat-accordion *ngFor="let item of this.differentContentOfFunction">
<mat-expansion-panel expanded hideToggle>
<mat-expansion-panel-header collapsedHeight='30px' expandedHeight='30px' class="panelhead">
<mat-panel-title style="font-size: 16px;color:#2196F3;">
@ -259,7 +268,9 @@
</div>
</mat-expansion-panel>
<!-- 实景图 -->
<mat-expansion-panel *ngIf="this.differentContentOfPicture && this.differentContentOfPicture.length != 0 && this.differentContentOfPicture[0].childrens.length != 0" expanded>
<mat-expansion-panel
*ngIf="this.differentContentOfPicture && this.differentContentOfPicture.length != 0 && this.differentContentOfPicture[0].childrens.length != 0"
expanded>
<mat-expansion-panel-header collapsedHeight='40px' expandedHeight='40px' class="panelhead"
style="background-color: #2196F3;">
<mat-panel-title style="font-size: 16px;color: #FFFFFF;">
@ -286,7 +297,8 @@
<tr>
<th>新增图片</th>
<td>
<img (click)="lookImg(i.imageUrl)" *ngFor="let i of item.newValue" [src]="'/api/Objects/PlanPlatform/'+i.imageUrl" alt="">
<img (click)="lookImg(i.imageUrl)" *ngFor="let i of item.newValue"
[src]="'/api/Objects/PlanPlatform/'+i.imageUrl" alt="">
</td>
</tr>
</table>

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

@ -16,6 +16,7 @@
height: 30%;
display: flex;
flex-direction: column;
align-items: center;
.headdiv {
@media screen and (min-device-width: 1400px) {
margin: 0 0 0 28px;
@ -29,6 +30,7 @@
height: 40px;
display: flex;
flex-direction: row;
align-items: center;
.radio {
height: 10px;
}
@ -47,16 +49,16 @@
input {
position: relative;
@media screen and (min-device-width: 1400px) {
margin-left: 50px;
top: 6px;
margin-left: 40px;
}
@media screen and (max-device-width: 1200px) {
margin-left: 8px;
top: 4px;
}
@media screen and (max-device-width: 1400px) and (min-device-width: 1200px) {
margin-left: 8px;
top: 6px;
}
}
.count {

4
src/index.html
Unescape View File

@ -31,9 +31,9 @@
securityJsCode: '0afa0b144398727fad2ca06f5f7156b3'
}
</script>
<script
<!-- <script
src="http://10.81.73.39:8000/webapi/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script>
<script src="http://10.81.73.39:8000/webapi/ui/1.1/main.js"></script> -->
<!-- <script
src="https://webapi.amap.com/maps?v=2.0&key=17bb9b27e49451cde8f2e6655b11ff1a&plugin=AMap.Driving,AMap.MouseTool,AMap.RangingTool"></script>
<script src="https://webapi.amap.com/ui/1.1/main.js"></script> -->

7
src/styles.scss
Unescape View File

@ -512,3 +512,10 @@ td {
}
}
#tbodydiv {
.mat-paginator-container {
margin: 12px 0;
justify-content: center;
}
}

Write Preview
Loading…
Cancel
Save