From e0dc1fb1d54d2acab7ab6e695f83e4cb062d58ec Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 15 May 2023 15:36:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=88=97=E8=A1=A8=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examiner-index.component.html | 14 +-- .../examiner-index.component.ts | 8 -- src/app/examiner/examiner-routing.ts | 4 + src/app/examiner/examiner.module.ts | 2 + .../examinee-capacity.component.html | 57 ++++++++- .../examinee-capacity.component.scss | 116 +++++++++++++++++ .../examinee-capacity.component.ts | 108 +++++++++++++++- .../echarts/echarts.component.html | 3 +- .../echarts/echarts.component.ts | 22 ++-- .../examinee-papers.component.html | 50 +++++++- .../examinee-papers.component.scss | 118 ++++++++++++++++++ .../examinee-papers.component.ts | 109 +++++++++++++++- .../station-examinee.component.html | 54 +++++++- .../station-examinee.component.scss | 118 ++++++++++++++++++ .../station-examinee.component.ts | 108 +++++++++++++++- src/app/theme.scss | 25 ++-- src/styles.scss | 1 + 17 files changed, 861 insertions(+), 56 deletions(-) diff --git a/src/app/examiner/examiner-index/examiner-index.component.html b/src/app/examiner/examiner-index/examiner-index.component.html index ec56fc6..bcb33dd 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.html +++ b/src/app/examiner/examiner-index/examiner-index.component.html @@ -1,18 +1,11 @@ -
+ [nzNodes]="nodes" nzPlaceHolder="请选择" [nzExpandedIcon]="multiExpandedIconTpl" + [nzExpandedKeys]="expandedKeys" (click)="zIndex()"> @@ -36,7 +29,8 @@
- +
diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index 50e8ed0..f12bd50 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -1,11 +1,3 @@ -/* - * @Descripttion: - * @version: - * @Author: sueRimn - * @Date: 2020-12-11 09:06:03 - * @LastEditors: sueRimn - * @LastEditTime: 2021-02-25 11:44:34 - */ import { Component, OnInit, diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts index 4587bbb..b79f766 100644 --- a/src/app/examiner/examiner-routing.ts +++ b/src/app/examiner/examiner-routing.ts @@ -14,6 +14,8 @@ import { MarkPapersIndexComponent} from './mark-papers-index/mark-papers-index.c import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.component' import { EchartsComponent } from './statistic-analysis/examStatistics/echarts/echarts.component'; import { ExamineeCapacityComponent } from './statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component'; +import { StationExamineeComponent } from './statistic-analysis/examStatistics/station-examinee/station-examinee.component'; +import { ExamineePapersComponent } from './statistic-analysis/examStatistics/examinee-papers/examinee-papers.component'; const routes: Routes = [ { path: 'createexam-index', component:ExaminerIndexComponent }, @@ -21,6 +23,8 @@ const routes: Routes = [ { path: 'mark-papers-index',component:MarkPapersIndexComponent}, { path: 'mark-papers-index/mark-papers-two',component:MarkPapersTwoComponent}, { path: 'statistic-examination',component:EchartsComponent}, + { path: 'statistic-examination/station-examinee',component:StationExamineeComponent}, + { path: 'statistic-examination/examinee-papers',component:ExamineePapersComponent}, { path: 'statistic-capacity',component:ExamineeCapacityComponent} ] @NgModule({ diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts index 74f6b6e..edde9d3 100644 --- a/src/app/examiner/examiner.module.ts +++ b/src/app/examiner/examiner.module.ts @@ -76,6 +76,7 @@ import { EchartsComponent } from "./statistic-analysis/examStatistics/echarts/ec import { StationExamineeComponent } from "./statistic-analysis/examStatistics/station-examinee/station-examinee.component"; import { ExamineePapersComponent } from "./statistic-analysis/examStatistics/examinee-papers/examinee-papers.component"; import { ExamineeCapacityComponent } from "./statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component"; +import { NzRateModule } from "ng-zorro-antd/rate"; @NgModule({ declarations: [ CreateTestScoreComponent, @@ -148,6 +149,7 @@ import { ExamineeCapacityComponent } from "./statistic-analysis/abilityAnalysis/ NzTreeModule, NzDatePickerModule, NzTreeSelectModule, + NzRateModule, ], providers: [{ provide: MatPaginatorIntl, useValue: myPaginator() }], exports: [PlanLevel], diff --git a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html index 444cd24..212c0e1 100644 --- a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html +++ b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html @@ -1 +1,56 @@ -

examinee-capacity works!

+
+
+
+
+ + +
+
+ + + + 包含下级 + +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
编号考生姓名所属机构综合素质评分作战能力评分综合评分
{{key + 1}}{{item.organizationsName}}{{item.startTime|date:'yyyy-MM-dd HH:mm'}} + +
+ 		+ +
+ 		+ +
+
+ + +
+ +
\ No newline at end of file diff --git a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.scss b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.scss index e69de29..05b1714 100644 --- a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.scss +++ b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.scss @@ -0,0 +1,116 @@ +table { + width: 100%; + text-align: center; + + .cdk-header-cell { + text-align: center; + } +} + +.content { + width: 100%; + height: 100%; + overflow: hidden; + background: #F2F5F6; + overflow-y: auto; +} + +.header { + width: 100%; + padding: 10px; + box-sizing: border-box; + display: flex; + align-items: center; + + .queryBox { + box-sizing: border-box; + padding: 5px 15px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + justify-content: left; + + .queryField { + margin: 0 25px; + font-size: 13px; + + label { + margin-right: 10px; + font-size: 15px; + } + + input { + font-size: 13px; + width: 320px; + height: 30px; + line-height: 30px; + border-radius: 3px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); + } + + button { + border: none; + color: white; + padding: 8px 20px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 13px; + margin: 4px 2px; + cursor: pointer; + border-radius: 5px; + outline: 0 none !important; + } + } + + .headerright { + float: right; + } + } +} + +.centertable { + width: 95%; + margin-right: 40px; + margin-left: 40px; + background-color: #FFFFFF; + + table { + + td, + th { + height: 48px; + font-size: 13px; + } + + td { + border-bottom: 1px solid #F2F5F6; + } + + .ratebox{ + position: relative; + .mask{ + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + } + } + thead { + background-color: #F5FDFE; + } + + .green { + color: #07CDCF; + } + + .red { + color: #FF8678; + } + } + +} diff --git a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.ts b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.ts index fa3dd21..922bb69 100644 --- a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.ts +++ b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.ts @@ -1,15 +1,111 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { MatSnackBar } from "@angular/material/snack-bar"; +import { Router } from "@angular/router"; +import { TreeService } from "src/app/http-interceptors/tree.service"; @Component({ - selector: 'app-examinee-capacity', - templateUrl: './examinee-capacity.component.html', - styleUrls: ['./examinee-capacity.component.scss'] + selector: "app-examinee-capacity", + templateUrl: "./examinee-capacity.component.html", + styleUrls: ["./examinee-capacity.component.scss"], }) export class ExamineeCapacityComponent implements OnInit { - - constructor() { } + constructor( + private router: Router, + public http: HttpClient, + public snackBar: MatSnackBar, + private tree: TreeService + ) {} ngOnInit(): void { + //获得登陆组织机构id + this.getProfiles().then((res) => { + //过滤得到正确的组织机构tree + this.getOrganizations(); + }); + this.getAlltabledate(); + } + //获取登录账号的个人资料 + Profiles: any; + getProfiles() { + return new Promise((resolve) => { + this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => { + this.Profiles = data; + sessionStorage.setItem("creatorData", JSON.stringify(data)); + resolve(data); + }); + }); + } + + //获得所有组织机构 + allorganizations; + treedata; + nodes; + expandedKeys = []; + getOrganizations() { + this.http.get("/api/Organizations").subscribe((data: any) => { + this.allorganizations = data; + this.treedata = this.tree.toTree(data); + this.getpresentOrganization(); + }); + } + //得到当前单位所在组织机构的tree型数据 + organizationName; + newallorganizations; + getpresentOrganization() { + this.newallorganizations = this.allorganizations; + this.newallorganizations.forEach((item) => { + item.children = []; + this.newallorganizations.forEach((element) => { + if (element.parentId == item.id) { + item.children.push(element); + } + }); + }); + this.organizationName = this.Profiles.organizationName; + if (this.organizationName) { + this.newallorganizations.forEach((item) => { + if (item.name == this.organizationName) { + this.nodes = [item]; + this.expandedKeys = [item.key]; + } + }); + } else { + this.nodes = this.tree.toTree(this.treedata); + this.expandedKeys = this.nodes[0].key; + } + } + + //获取表格信息 + PageNumber = 1; + PageSize = 10; + name; + orId; + orIdChecked; + tabledataSource; + length; + getAlltabledate() { + let paramsdata: any = { + PageNumber: this.PageNumber, + PageSize: this.PageSize, + OrganizationId: this.orId || "", + HasChildren: this.orIdChecked || "", + }; + this.http + .get("/api/Papers", { params: paramsdata }) + .subscribe((data: any) => { + this.tabledataSource = data.items; + this.length = data.totalCount; + }); + } + //分页事件 + chagePage(e) { + this.PageNumber = e.pageIndex + 1; + this.getAlltabledate(); } + //查询按钮 + Submit() {} + //重置按钮 + Reset() {} } diff --git a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.html b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.html index 1ed10f1..1e55017 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.html +++ b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.html @@ -1 +1,2 @@ -

echarts works!

+ + \ No newline at end of file diff --git a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts index 521af60..4eff659 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts +++ b/src/app/examiner/statistic-analysis/examStatistics/echarts/echarts.component.ts @@ -1,15 +1,21 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from "@angular/core"; +import { Router } from "@angular/router"; @Component({ - selector: 'app-echarts', - templateUrl: './echarts.component.html', - styleUrls: ['./echarts.component.scss'] + selector: "app-echarts", + templateUrl: "./echarts.component.html", + styleUrls: ["./echarts.component.scss"], }) export class EchartsComponent implements OnInit { + constructor(private router: Router) {} - constructor() { } - - ngOnInit(): void { + ngOnInit(): void {} + ok1() { + window.open("/home/statistic-examination/station-examinee") + // this.router.navigate(["/home/statistic-examination/station-examinee"]); //登陆成功跳转页面 + } + ok2() { + window.open("/home/statistic-examination/examinee-papers") + // this.router.navigate(["/home/statistic-examination/examinee-papers"]); //登陆成功跳转页面 } - } diff --git a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html index 381070c..6b81781 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html +++ b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html @@ -1 +1,49 @@ -

examinee-papers works!

+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
编号试卷名称考核机构考试时间试卷得分操作
{{key + 1}}xxx试卷{{item.organizationsName}} + {{item.startTime|date:'yyyy-MM-dd HH:mm'}} + + 85分 + + 详情 +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.scss b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.scss index e69de29..6abe71d 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.scss +++ b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.scss @@ -0,0 +1,118 @@ +table { + width: 100%; + text-align: center; + + .cdk-header-cell { + text-align: center; + } +} + +.content { + width: 100%; + height: 100%; + overflow: hidden; + background: #F2F5F6; + overflow-y: auto; +} + +.header { + width: 100%; + padding: 10px; + box-sizing: border-box; + display: flex; + align-items: center; + + .queryBox { + box-sizing: border-box; + padding: 5px 15px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + justify-content: left; + + .queryField { + margin: 0 25px; + font-size: 13px; + + label { + margin-right: 10px; + font-size: 15px; + } + + input { + font-size: 13px; + width: 320px; + height: 30px; + line-height: 30px; + border-radius: 3px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); + } + + button { + border: none; + color: white; + padding: 8px 20px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 13px; + margin: 4px 2px; + cursor: pointer; + border-radius: 5px; + outline: 0 none !important; + } + } + + .headerright { + float: right; + } + } +} + +.centertable { + width: 95%; + margin-right: 40px; + margin-left: 40px; + background-color: #FFFFFF; + + table { + + td, + th { + height: 48px; + font-size: 13px; + } + + td { + border-bottom: 1px solid #F2F5F6; + } + + .ratebox { + position: relative; + + .mask { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + } + } + + thead { + background-color: #F5FDFE; + } + + .green { + color: #07CDCF; + } + + .red { + color: #FF8678; + } + } + +} diff --git a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts index 64c0c5f..1e5b2db 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts +++ b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts @@ -1,15 +1,112 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { MatSnackBar } from "@angular/material/snack-bar"; +import { Router } from "@angular/router"; +import { TreeService } from "src/app/http-interceptors/tree.service"; @Component({ - selector: 'app-examinee-papers', - templateUrl: './examinee-papers.component.html', - styleUrls: ['./examinee-papers.component.scss'] + selector: "app-examinee-papers", + templateUrl: "./examinee-papers.component.html", + styleUrls: ["./examinee-papers.component.scss"], }) export class ExamineePapersComponent implements OnInit { - - constructor() { } + constructor( + private router: Router, + public http: HttpClient, + public snackBar: MatSnackBar, + private tree: TreeService + ) {} ngOnInit(): void { + //获得登陆组织机构id + this.getProfiles().then((res) => { + //过滤得到正确的组织机构tree + this.getOrganizations(); + }); + this.getAlltabledate(); + } + //获取登录账号的个人资料 + Profiles: any; + getProfiles() { + return new Promise((resolve) => { + this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => { + this.Profiles = data; + sessionStorage.setItem("creatorData", JSON.stringify(data)); + resolve(data); + }); + }); + } + + //获得所有组织机构 + allorganizations; + treedata; + nodes; + expandedKeys = []; + getOrganizations() { + this.http.get("/api/Organizations").subscribe((data: any) => { + this.allorganizations = data; + this.treedata = this.tree.toTree(data); + this.getpresentOrganization(); + }); + } + //得到当前单位所在组织机构的tree型数据 + organizationName; + newallorganizations; + getpresentOrganization() { + this.newallorganizations = this.allorganizations; + this.newallorganizations.forEach((item) => { + item.children = []; + this.newallorganizations.forEach((element) => { + if (element.parentId == item.id) { + item.children.push(element); + } + }); + }); + this.organizationName = this.Profiles.organizationName; + if (this.organizationName) { + this.newallorganizations.forEach((item) => { + if (item.name == this.organizationName) { + this.nodes = [item]; + this.expandedKeys = [item.key]; + } + }); + } else { + this.nodes = this.tree.toTree(this.treedata); + this.expandedKeys = this.nodes[0].key; + } + } + + //获取表格信息 + PageNumber = 1; + PageSize = 10; + name; + time; + orId; + orIdChecked; + tabledataSource; + length; + getAlltabledate() { + let paramsdata: any = { + PageNumber: this.PageNumber, + PageSize: this.PageSize, + OrganizationId: this.orId || "", + HasChildren: this.orIdChecked || "", + }; + this.http + .get("/api/Papers", { params: paramsdata }) + .subscribe((data: any) => { + this.tabledataSource = data.items; + this.length = data.totalCount; + }); + } + //分页事件 + chagePage(e) { + this.PageNumber = e.pageIndex + 1; + this.getAlltabledate(); } + //查询按钮 + Submit() {} + //重置按钮 + Reset() {} } diff --git a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.html b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.html index 6a766f5..79d84c2 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.html +++ b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.html @@ -1 +1,53 @@ -

station-examinee works!

+
+
+
+
+ + +
+
+ + + + 包含下级 + +
+
+ + +
+
+
+
+ + + + + + + + + + + + + + + + + + + +
编号考生姓名所属机构考试次数平均成绩操作
{{key + 1}}{{item.organizationsName}}{{item.startTime|date:'yyyy-MM-dd HH:mm'}} + 3次 + + 85分 + + 详情 +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.scss b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.scss index e69de29..6abe71d 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.scss +++ b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.scss @@ -0,0 +1,118 @@ +table { + width: 100%; + text-align: center; + + .cdk-header-cell { + text-align: center; + } +} + +.content { + width: 100%; + height: 100%; + overflow: hidden; + background: #F2F5F6; + overflow-y: auto; +} + +.header { + width: 100%; + padding: 10px; + box-sizing: border-box; + display: flex; + align-items: center; + + .queryBox { + box-sizing: border-box; + padding: 5px 15px; + display: flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + justify-content: left; + + .queryField { + margin: 0 25px; + font-size: 13px; + + label { + margin-right: 10px; + font-size: 15px; + } + + input { + font-size: 13px; + width: 320px; + height: 30px; + line-height: 30px; + border-radius: 3px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); + } + + button { + border: none; + color: white; + padding: 8px 20px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 13px; + margin: 4px 2px; + cursor: pointer; + border-radius: 5px; + outline: 0 none !important; + } + } + + .headerright { + float: right; + } + } +} + +.centertable { + width: 95%; + margin-right: 40px; + margin-left: 40px; + background-color: #FFFFFF; + + table { + + td, + th { + height: 48px; + font-size: 13px; + } + + td { + border-bottom: 1px solid #F2F5F6; + } + + .ratebox { + position: relative; + + .mask { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + } + } + + thead { + background-color: #F5FDFE; + } + + .green { + color: #07CDCF; + } + + .red { + color: #FF8678; + } + } + +} diff --git a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts index 07723ee..c7d8077 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts +++ b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts @@ -1,15 +1,111 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { MatSnackBar } from "@angular/material/snack-bar"; +import { Router } from "@angular/router"; +import { TreeService } from "src/app/http-interceptors/tree.service"; @Component({ - selector: 'app-station-examinee', - templateUrl: './station-examinee.component.html', - styleUrls: ['./station-examinee.component.scss'] + selector: "app-station-examinee", + templateUrl: "./station-examinee.component.html", + styleUrls: ["./station-examinee.component.scss"], }) export class StationExamineeComponent implements OnInit { - - constructor() { } + constructor( + private router: Router, + public http: HttpClient, + public snackBar: MatSnackBar, + private tree: TreeService + ) {} ngOnInit(): void { + //获得登陆组织机构id + this.getProfiles().then((res) => { + //过滤得到正确的组织机构tree + this.getOrganizations(); + }); + this.getAlltabledate(); + } + //获取登录账号的个人资料 + Profiles: any; + getProfiles() { + return new Promise((resolve) => { + this.http.get("/api/ExamAccounts/Profiles").subscribe((data: any) => { + this.Profiles = data; + sessionStorage.setItem("creatorData", JSON.stringify(data)); + resolve(data); + }); + }); + } + + //获得所有组织机构 + allorganizations; + treedata; + nodes; + expandedKeys = []; + getOrganizations() { + this.http.get("/api/Organizations").subscribe((data: any) => { + this.allorganizations = data; + this.treedata = this.tree.toTree(data); + this.getpresentOrganization(); + }); + } + //得到当前单位所在组织机构的tree型数据 + organizationName; + newallorganizations; + getpresentOrganization() { + this.newallorganizations = this.allorganizations; + this.newallorganizations.forEach((item) => { + item.children = []; + this.newallorganizations.forEach((element) => { + if (element.parentId == item.id) { + item.children.push(element); + } + }); + }); + this.organizationName = this.Profiles.organizationName; + if (this.organizationName) { + this.newallorganizations.forEach((item) => { + if (item.name == this.organizationName) { + this.nodes = [item]; + this.expandedKeys = [item.key]; + } + }); + } else { + this.nodes = this.tree.toTree(this.treedata); + this.expandedKeys = this.nodes[0].key; + } + } + + //获取表格信息 + PageNumber = 1; + PageSize = 10; + name; + orId; + orIdChecked; + tabledataSource; + length; + getAlltabledate() { + let paramsdata: any = { + PageNumber: this.PageNumber, + PageSize: this.PageSize, + OrganizationId: this.orId || "", + HasChildren: this.orIdChecked || "", + }; + this.http + .get("/api/Papers", { params: paramsdata }) + .subscribe((data: any) => { + this.tabledataSource = data.items; + this.length = data.totalCount; + }); + } + //分页事件 + chagePage(e) { + this.PageNumber = e.pageIndex + 1; + this.getAlltabledate(); } + //查询按钮 + Submit() {} + //重置按钮 + Reset() {} } diff --git a/src/app/theme.scss b/src/app/theme.scss index f220098..3fe4b52 100644 --- a/src/app/theme.scss +++ b/src/app/theme.scss @@ -1,18 +1,27 @@ @import "./theming"; @include mat-core(); -$my-app-primary:mat-palette($mat-blue,500); -$my-app-accent :mat-palette($mat-pink,A200,A100,A400); +$my-app-primary:mat-palette($mat-blue, 500); +$my-app-accent :mat-palette($mat-pink, A200, A100, A400); $my-app-warn :mat-palette($mat-red); -$my-app-theme :mat-light-theme($my-app-primary,$my-app-accent,$my-app-warn); +$my-app-theme :mat-light-theme($my-app-primary, $my-app-accent, $my-app-warn); @include angular-material-theme($my-app-theme); -$my-dark-primary:mat-palette($mat-red,A700); -$my-dark-accent :mat-palette($mat-amber,A200,A100,A400); +$my-dark-primary:mat-palette($mat-red, A700); +$my-dark-accent :mat-palette($mat-amber, A200, A100, A400); $my-dark-warn :mat-palette($mat-deep-orange); -$my-dark-theme :mat-dark-theme($my-dark-primary,$my-dark-accent,$my-dark-warn); +$my-dark-theme :mat-dark-theme($my-dark-primary, $my-dark-accent, $my-dark-warn); -.myapp-dark-theme{ -@include angular-material-theme($my-dark-theme); +.myapp-dark-theme { + @include angular-material-theme($my-dark-theme); +} + +.ant-rate-star:not(:last-child) { + margin-right: 0; +} + +.ant-rate { + box-sizing: border-box; + padding-top: 10px; } diff --git a/src/styles.scss b/src/styles.scss index aa72e22..0e2210b 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -4,6 +4,7 @@ /* 引入组件样式 */ @import "~ng-zorro-antd/tree-select/style/index.min.css"; @import "~ng-zorro-antd/modal/style/index.min.css"; +@import "~ng-zorro-antd/rate/style/index.min.css"; /* 引入组件样式 */ @import "./assets/css/time.scss";