shaojiahao
/
examSystem-Anxin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

[完善]完善创建试卷选择单位页面

master
邵佳豪 3 years ago
parent
5ad29edcc4
commit
e538e7983d
4 changed files with 232 additions and 458 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. 77
      src/app/examiner/examiner-new-one/examiner-new-one.component.html
  2. 121
      src/app/examiner/examiner-new-one/examiner-new-one.component.scss
  3. 25
      src/app/examiner/examiner-new-one/examiner-new-one.component.spec.ts
  4. 229
      src/app/examiner/examiner-new-one/examiner-new-one.component.ts

77
src/app/examiner/examiner-new-one/examiner-new-one.component.html
Unescape View File

@ -12,44 +12,45 @@
<form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
<div class="queryBox">
<div class="queryField">
<div><label style="margin-right: 10px;">单位名称:</label></div>
<div><input type="text" name="companyName" [(ngModel)]="companyName" autocomplete="off" placeholder="请填写"></div>
<div><label>单位名称:</label></div>
<div><input type="text" name="companyName" [(ngModel)]="companyName" autocomplete="off"
placeholder="请填写"></div>
</div>
<div class="queryField">
<div><label style="margin-right: 10px;">统一社会信用代码:</label></div>
<div><input type="text" name="shehui" [(ngModel)]="shehui" autocomplete="off" placeholder="请填写"></div>
<div><label>统一社会信用代码:</label></div>
<div><input type="text" name="shehui" [(ngModel)]="shehui" autocomplete="off" placeholder="请填写">
</div>
<div class="queryField ordiv">
<div><label style="margin-right: 10px;position: relative;top: 5px;" >消防救援站:</label></div>
</div>
<div class="queryField">
<div><label>消防救援站:</label></div>
<div>
<input (click)="stopclose($event)" readonly autocomplete="off" [(ngModel)]="js" name="js" (focus)="openorganizationbox()" placeholder="请填写">
<mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
<div class="organizationbox" *ngIf="isorganizationbox">
<div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
<mat-tree-node *matTreeNodeDef="let node" matTreeNodePadding (click)='add(node)' class="organizationlist">
<button type="button" mat-icon-button disabled ></button>
<li>{{node.name}}</li>
</mat-tree-node>
<mat-tree-node *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)='add(node)' class="organizationlist">
<button
type="button"
mat-icon-button
matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name">
<mat-icon class="mat-icon-rtl-mirror">
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
</mat-icon>
</button>
<li>{{node.name}}</li>
</mat-tree-node>
</mat-tree>
<nz-tree-select name="station" [nzDropdownClassName]="'maxHeightTreeSelect'"
style="width: 250px" [(ngModel)]="js" [nzNodes]="nodes" nzPlaceHolder="请选择"
[nzExpandedIcon]="multiExpandedIconTpl" [nzExpandedKeys]="expandedKeys">
</nz-tree-select>
<ng-template #multiExpandedIconTpl let-node let-origin="origin">
<ng-container *ngIf="node.children.length == 0; else elseTemplate">
</ng-container>
<ng-template #elseTemplate>
<ng-container *ngIf="node.isExpanded; else elseTemplate">
<mat-icon>expand_more</mat-icon>
</ng-container>
<ng-template #elseTemplate>
<mat-icon>chevron_right</mat-icon>
</ng-template>
</ng-template>
</ng-template>
<mat-checkbox color="primary" style="margin-left: 36px;" [(ngModel)]="jscheck"
name="jscheck">包含下级</mat-checkbox>
</div>
<button mat-raised-button style="background-color: #07CDCF;margin-left: 90px;" color="primary">查询</button>
<button mat-raised-button style=" background-color: #FF8678;margin-left: 10px;" (click)="reset()">重置</button>
</div>
<div class="queryFieldBtn">
<button mat-raised-button type="submit" style="background-color: #07CDCF;">查询</button>
<button mat-raised-button style=" background-color: #FF8678;" (click)="reset()">重置</button>
</div>
</div>
</form>
</div>
@ -59,7 +60,8 @@
<th mat-header-cell *matHeaderCellDef>
</th>
<td mat-cell *matCellDef="let element">
<mat-checkbox color="primary" id={{element.id}} (change)="checkChange($event,element)" [(ngModel)]="element.checked"></mat-checkbox>
<mat-checkbox color="primary" id={{element.id}} (change)="checkChange($event,element)"
[(ngModel)]="element.checked"></mat-checkbox>
</td>
</ng-container>
<ng-container matColumnDef="unitname">
@ -73,7 +75,8 @@
<ng-container matColumnDef="unittype">
<th mat-header-cell *matHeaderCellDef>单位类型</th>
<td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}</td>
<td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ?
element.buildingTypes[0].name : ''}}</td>
</ng-container>
<ng-container matColumnDef="scc">
<th mat-header-cell *matHeaderCellDef>统一社会信用代码</th>
@ -82,9 +85,7 @@
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
<mat-paginator [length]="length"
[pageSize]="pageSize"
[pageSizeOptions]="pageSizeOptions"
<mat-paginator [length]="length" [pageSize]="pageSize" [pageSizeOptions]="pageSizeOptions"
(page)="chagePage($event)">
</mat-paginator>
</div>
@ -108,7 +109,9 @@
</table>
</div>
<div class="rightthree">
<button mat-raised-button style="background-color: #07CDCF;margin-left: 100px;margin-top: 20px; width: 120px;" color="primary" (click)="nextClick()">下一步</button>
<button mat-raised-button
style="background-color: #07CDCF;margin-left: 100px;margin-top: 20px; width: 120px;" color="primary"
(click)="nextClick()">下一步</button>
</div>
</div>
</div>

121
src/app/examiner/examiner-new-one/examiner-new-one.component.scss
Unescape View File

@ -1,7 +1,7 @@
table {
width: 100%;
text-align: center;
.cdk-header-cell {
text-align: center;
}
@ -14,33 +14,42 @@ table {
background: #F2F5F6;
display: flex;
overflow-y: auto;
.contentLeft {
width: 80%;
height: 94%;
margin: 20px 20px 10px 50px;
background-color: #FFFFFF;
border-radius: 16px;
.contenttable {
width: 95%;
height: 80%;
//margin-right: 40px;
margin-left: 30px;
//background-color: none;
table {
width: 100%;
margin-top: 15px;
background-color: transparent;
font-size: 16px;
th {
background-color: #F5FDFE;
color: #000000;
font-size: 15px;
}
td{font-size: 15px;}
td {
font-size: 15px;
}
.mat-table {
background-color: transparent;
}
}
mat-paginator {
width: 100%;
// margin-top: 30px;
@ -56,143 +65,123 @@ table {
border-radius: 16px;
display: flex;
flex-direction: column;
.rightone {
width: 100%;
margin: 30px 20px;
span {
font-size: 20px;
}
}
.righttwo {
height: 670px;
width: 280px;
margin-left: 20px;
overflow-y: auto;
table {
th,td{
th,
td {
height: 48px;
font-size: 15px;
}
thead {
background-color: #F5FDFE;
}
table tbody {
height: 570px;
overflow-y: scroll;
tr {
table-layout: fixed
}
}
}
}
::-webkit-scrollbar {
width: 2px;
}
}
}
.header {
width: 100%;
padding: 10px;
margin-bottom: 10px;
box-sizing: border-box;
.queryBox {
box-sizing: border-box;
padding: 5px 10px;
display: flex;
flex-direction: row;
flex-wrap: wrap;
align-items: center;
justify-content: left;
.queryField {
margin: 0 10px;
margin-left: 12px;
font-size: 14px;
display: flex;
flex-direction: column;
input {
width: 260px;
height: 44px;
line-height: 34px;
border-radius: 5px;
width: 250px;
height: 33px;
line-height: 33px;
border-radius: 2px;
padding-left: 5px;
outline: none;
border: 1px solid rgb(226, 211, 211);
}
}
.queryFieldBtn {
display: flex;
button {
border: none;
color: white;
padding: 5px 25px;
padding: 0px 12px;
text-align: center;
text-decoration: none;
display: inline-block;
font-size: 16px;
margin: 4px 2px;
font-size: 13px;
cursor: pointer;
border-radius: 8px;
border-radius: 3px;
outline: 0 none !important;
margin-top: 15px;
margin-left: 12px;
}
}
.ordiv{
position: relative;
.organizationbox{
button{
color: #000000;
position: relative;
bottom: 5px;
}
width:450px;
height: 200px;
background: white;
position: absolute;
top: 70px;
//left: 27px;
z-index: 999;
border: 1px solid grey;
overflow-y: auto;
li{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
mat-tree-node{
cursor: pointer;
white-space:pre;
}
mat-tree-node:hover{
background: rgba(225, 225, 225, 0.8);
}
.closediv{
z-index: 100;
position: absolute;
right: 0;
top: 0;
width: 30px;
height: 30px;
cursor: pointer;
line-height: 30px;
text-align: center;
}
.closediv:hover{
background:rgba(225, 225, 225, 0.8);
}
}
}
.headerright{
float: right;
}
} //queryBox
}
.operationSpan {
margin: 0 10px;
.spanbtn {
font-weight: 550;
cursor: pointer;
}
.green{ color: #04ced1; }
.red{ color: #FF8678 }
.gray{ color: gray; }
.green {
color: #04ced1;
}
.red {
color: #FF8678
}
.gray {
color: gray;
}
}

25
src/app/examiner/examiner-new-one/examiner-new-one.component.spec.ts
Unescape View File

@ -1,25 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ExaminerNewOneComponent } from './examiner-new-one.component';
describe('ExaminerNewOneComponent', () => {
let component: ExaminerNewOneComponent;
let fixture: ComponentFixture<ExaminerNewOneComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ ExaminerNewOneComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ExaminerNewOneComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

229
src/app/examiner/examiner-new-one/examiner-new-one.component.ts
Unescape View File

@ -40,21 +40,8 @@ export class ExaminerNewOneComponent implements OnInit {
indexid = sessionStorage.getItem("paperId") //上个页面传过来的id
removeClass = document.getElementsByClassName("mat-form-field-underline")
private _transformer = (node, level: number) => { //初始化tree
return {
expandable: !!node.children && node.children.length > 0,
name: node.name,
level: level,
id: node.id,
parentId: node.parentId,
children: node.children
};
}
treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable);
treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children);
dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener);
myControl = new FormControl();
hasChild = (_: number, node: any) => node.expandable;
@ViewChild(MatSort) sort: MatSort;
@ -79,181 +66,27 @@ export class ExaminerNewOneComponent implements OnInit {
this.PageNumber = e.pageIndex + 1
this.getAllKeyUnit();
}
//获得所有重点单位
wanzhengduArr = [
{
id: 0, zong: 94, details: [
{ name: '单位信息', score: 5, totalpoints: 5 },
{ name: '建筑信息', score: 10, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 22, totalpoints: 25 },
{ name: '消防设施', score: 10, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 7, totalpoints: 10 },
{ name: '实景图', score: 10, totalpoints: 10 },
{ name: 'CAD上传', score: 10, totalpoints: 10 },
]
},
{
id: 1, zong: 90, details: [
{ name: '单位信息', score: 4, totalpoints: 5 },
{ name: '建筑信息', score: 8, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 25, totalpoints: 25 },
{ name: '消防设施', score: 10, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 8, totalpoints: 10 },
{ name: '实景图', score: 5, totalpoints: 10 },
{ name: 'CAD上传', score: 10, totalpoints: 10 },
]
},
{
id: 2, zong: 89, details: [
{ name: '单位信息', score: 4, totalpoints: 5 },
{ name: '建筑信息', score: 10, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 22, totalpoints: 25 },
{ name: '消防设施', score: 10, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 8, totalpoints: 10 },
{ name: '实景图', score: 5, totalpoints: 10 },
{ name: 'CAD上传', score: 10, totalpoints: 10 },
]
},
{
id: 3, zong: 87, details: [
{ name: '单位信息', score: 5, totalpoints: 5 },
{ name: '建筑信息', score: 8, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 20, totalpoints: 25 },
{ name: '消防设施', score: 10, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 6, totalpoints: 10 },
{ name: '实景图', score: 10, totalpoints: 10 },
{ name: 'CAD上传', score: 8, totalpoints: 10 },
]
},
{
id: 4, zong: 86, details: [
{ name: '单位信息', score: 5, totalpoints: 5 },
{ name: '建筑信息', score: 10, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 18, totalpoints: 25 },
{ name: '消防设施', score: 10, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 8, totalpoints: 10 },
{ name: '实景图', score: 5, totalpoints: 10 },
{ name: 'CAD上传', score: 10, totalpoints: 10 },
]
},
{
id: 5, zong: 81, details: [
{ name: '单位信息', score: 5, totalpoints: 5 },
{ name: '建筑信息', score: 8, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 22, totalpoints: 25 },
{ name: '消防设施', score: 10, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 5, totalpoints: 10 },
{ name: '实景图', score: 10, totalpoints: 10 },
{ name: 'CAD上传', score: 6, totalpoints: 10 },
]
},
{
id: 6, zong: 80, details: [
{ name: '单位信息', score: 5, totalpoints: 5 },
{ name: '建筑信息', score: 8, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 20, totalpoints: 25 },
{ name: '消防设施', score: 10, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 7, totalpoints: 10 },
{ name: '实景图', score: 0, totalpoints: 10 },
{ name: 'CAD上传', score: 10, totalpoints: 10 },
]
},
{
id: 7, zong: 78, details: [
{ name: '单位信息', score: 4, totalpoints: 5 },
{ name: '建筑信息', score: 8, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 22, totalpoints: 25 },
{ name: '消防设施', score: 10, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 6, totalpoints: 10 },
{ name: '实景图', score: 0, totalpoints: 10 },
{ name: 'CAD上传', score: 8, totalpoints: 10 },
]
},
{
id: 8, zong: 78, details: [
{ name: '单位信息', score: 5, totalpoints: 5 },
{ name: '建筑信息', score: 8, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 20, totalpoints: 25 },
{ name: '消防设施', score: 5, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 5, totalpoints: 10 },
{ name: '实景图', score: 5, totalpoints: 10 },
{ name: 'CAD上传', score: 10, totalpoints: 10 },
]
},
{
id: 9, zong: 73, details: [
{ name: '单位信息', score: 5, totalpoints: 5 },
{ name: '建筑信息', score: 7, totalpoints: 10 },
{ name: '平面图', score: 10, totalpoints: 10 },
{ name: '四周毗邻', score: 18, totalpoints: 25 },
{ name: '消防设施', score: 0, totalpoints: 10 },
{ name: '重点部位', score: 10, totalpoints: 10 },
{ name: '功能分区', score: 5, totalpoints: 10 },
{ name: '实景图', score: 10, totalpoints: 10 },
{ name: 'CAD上传', score: 8, totalpoints: 10 },
]
}
]
submit() {
this.PageNumber = '1'
this.getAllKeyUnit()
}
//获得所有重点单位
allKeyUnitInfo: any //所有的重点单位
getAllKeyUnit() {
// console.log(Boolean(Number(this.follow)))
let follow
if (this.follow == '') {
follow = ''
}
if (this.follow == '0') {
follow = false
}
if (this.follow == '1') {
follow = true
}
let paramsdata: any = {
Name: this.companyName || '',
OrganizationId: this.jsId || '',
OrganizationId: this.js || '',
HasChildren: this.jscheck || '',
USCI: this.shehui || '',
IsFollowed: follow,
BuildingTypeId: this.unittype || '',
PageNumber: this.PageNumber || '1',
PageSize: this.pageSizeOptions[0],
Sort: this.integritySort ? 'integrityscore' : '',
SortType: this.integritySort || '',
}
//console.log(paramsdata)
this.http.get("/api/Companies", { params: paramsdata }).subscribe((data: any) => {
//console.log(data)
this.length = data.totalCount
this.allKeyUnitInfo = data
// data.items.sort( (a,b) => {
// return a.usci - b.usci
// })
data.items.forEach((item, index) => {
item.integrity = this.wanzhengduArr[index]
})
//console.log(789,data.items)
this.tabledataSource = new MatTableDataSource(data.items);
//console.log(this.tabledataSource)
if (this.selectedunitArr.length != 0) {
for (var i = 0; i < this.tabledataSource.filteredData.length; i++) {
for (var j = 0; j < this.selectedunitArr.length; j++) {
@ -264,8 +97,6 @@ export class ExaminerNewOneComponent implements OnInit {
}
}
})
//console.log(this.tabledataSource)
}
//得到当前单位信息
getunitdata() {
@ -279,7 +110,9 @@ export class ExaminerNewOneComponent implements OnInit {
treedata: any //组织机构树型数据
newArr: any = []
newallorganizations: any //用于存储在原始数据基础上的每个机构增加children字段
newallorganizations2: any
nodes: any = []
expandedKeys: any = []//默认展开tree节点
//得到当前单位所在组织机构的tree型数据
getpresentOrganization() {
this.newallorganizations = this.allorganizations
@ -297,18 +130,21 @@ export class ExaminerNewOneComponent implements OnInit {
if (this.organizationName) {
this.newallorganizations.forEach(item => {
if (item.name == this.organizationName) {
this.dataSource.data = [item]
this.newallorganizations2 = [item]
this.expandedKeys = [item.key]
this.nodes = [item]
}
});
} else {
this.newallorganizations2 = this.treedata
this.dataSource.data = this.treedata
this.expandedKeys = this.nodes[0].key
this.nodes = this.tree.toTree(this.treedata);
}
}
)
}
//获得所有组织机构
getOrganizations() {
this.http.get('/api/Organizations').subscribe(
@ -423,7 +259,6 @@ export class ExaminerNewOneComponent implements OnInit {
//重置
js: any //辖区中队输入框
jsId: any //辖区中队选择的id
companyName: any //单位名称
shehui: any //统一社会信用代码
unittype: any //单位类型
@ -436,12 +271,8 @@ export class ExaminerNewOneComponent implements OnInit {
this.jscheck = '' //辖区中队包含下级
this.companyName = '' //单位名称
this.shehui = '' //统一社会信用代码
this.unittype = '' //单位类型
this.jsId = ''
this.follow = ''
this.PageNumber = 1
this.pageEvent.pageIndex = 0
this.integritySort = ''
this.getAllKeyUnit();
}
@ -451,34 +282,10 @@ export class ExaminerNewOneComponent implements OnInit {
this.pageEvent.pageIndex = 0
this.getAllKeyUnit();
}
bigclosediv(e) {
this.isorganizationbox = false
}
stopclose(e) {
e.stopPropagation();
}
//辖区中队div是否显示
isorganizationbox: boolean = false
//点击辖区中队树，将选择的辖区中队添加到变量
add(node) {
this.isorganizationbox = false
this.js = node.name
this.jsId = node.id
}
//关闭辖区中队隐藏框
closeorganizationbox() {
this.isorganizationbox = false
}
//打开辖区中队隐藏框
openorganizationbox() {
this.isorganizationbox = true
}
//关闭出现的组织机构div
closediv() {
this.isorganizationbox = false
}

Write Preview
Loading…
Cancel
Save