diff --git a/package-lock.json b/package-lock.json index 5eccfb3..f568697 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7530,11 +7530,11 @@ } }, "echarts": { - "version": "4.6.0", - "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.6.0.tgz?cache=0&sync_timestamp=1577438297540&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fecharts%2Fdownload%2Fecharts-4.6.0.tgz", - "integrity": "sha1-taR6EEbOyTzu75VPnuVHUTQFWOw=", + "version": "4.9.0", + "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.9.0.tgz?cache=0&sync_timestamp=1606890707379&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fecharts%2Fdownload%2Fecharts-4.9.0.tgz", + "integrity": "sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=", "requires": { - "zrender": "4.2.0" + "zrender": "4.3.2" } }, "ee-first": { @@ -11999,7 +11999,7 @@ }, "parse5": { "version": "5.1.1", - "resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz?cache=0&sync_timestamp=1595849319979&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse5%2Fdownload%2Fparse5-5.1.1.tgz", + "resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz", "integrity": "sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg=", "optional": true }, @@ -18471,9 +18471,9 @@ "integrity": "sha1-Z8oISzEW/DP8QENeDV6kCiB+OS4=" }, "zrender": { - "version": "4.2.0", - "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.2.0.tgz?cache=0&sync_timestamp=1576159866096&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.2.0.tgz", - "integrity": "sha1-0AEwLhVfKN4fn8f81cJUutKEcc8=" + "version": "4.3.2", + "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz?cache=0&sync_timestamp=1605885988121&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.2.tgz", + "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY=" } } } diff --git a/package.json b/package.json index d86f914..1716269 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "bson-objectid": "^1.3.1", "cesium": "^1.64.0", "e-ngx-cesium": "^6.3.2", - "echarts": "^4.6.0", + "echarts": "^4.9.0", "firebase": "^7.6.2", "ng-zorro-antd": "^10.2.0", "ng2-file-upload": "^1.4.0", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index bd6ecc8..bfe5587 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,3 +1,11 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-20 10:30:23 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-20 15:36:30 + */ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { LoginComponent } from './pages/login/login.component'; @@ -17,6 +25,7 @@ const routes: Routes = [ path:'home',component:NavigationComponent,canActivate: [AuthGuard],//守卫验证 children:[ {path:'',loadChildren:() => import('./examiner/examiner.module').then(m => m.ExaminerModule)}, + {path:'',loadChildren:() => import('./student/student.module').then(m => m.StudentModule)}, {path:'',loadChildren:() => import('./ui/ui.module').then(m => m.UiModule)} ] }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 126f803..9aa784e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,3 +1,11 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-12 09:14:54 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-20 15:34:49 + */ import { BrowserModule } from '@angular/platform-browser'; import { NgModule } from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; @@ -20,7 +28,9 @@ import { ComponentServiceService } from './component-service.service'; import { registerLocaleData } from '@angular/common'; import zh from '@angular/common/locales/zh'; import { ExaminerModule } from './examiner/examiner.module'; +import { StudentModule} from './student/student.module' registerLocaleData(zh); +import { from } from 'rxjs'; @NgModule({ declarations: [ @@ -37,7 +47,8 @@ registerLocaleData(zh); PagesModule, FormsModule, HttpClientModule, - ExaminerModule + ExaminerModule, + StudentModule ], providers: [httpInterceptorProviders, CacheTokenService,TreeService,ComponentServiceService], bootstrap: [AppComponent] diff --git a/src/app/examiner/examiner-index/examiner-index.component.html b/src/app/examiner/examiner-index/examiner-index.component.html index 9ee8aae..896fc78 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.html +++ b/src/app/examiner/examiner-index/examiner-index.component.html @@ -4,20 +4,40 @@ * @Author: sueRimn * @Date: 2020-12-11 09:06:03 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-15 14:40:26 + * @LastEditTime: 2020-12-20 09:33:02 -->
-
+
- + + 包含下级 +
+
clear
+ + + +
  • {{node.name}}
    • +     + + +
  • {{node.name}}
    • +     +     +
    {{item.status=="2"?"已结束":item.status=="0"?"未开考":"开考中"}} diff --git a/src/app/examiner/examiner-index/examiner-index.component.scss b/src/app/examiner/examiner-index/examiner-index.component.scss index 389689f..455cdd3 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.scss +++ b/src/app/examiner/examiner-index/examiner-index.component.scss @@ -57,6 +57,52 @@ table { float: right; } } //queryBox + .ordiv{ + position: relative; + .organizationbox{ + button{ + color: #000000; + position: relative; + bottom: 9px; + } + width:450px; + height: 200px; + background: white; + position: absolute; + top: 47px; + left: 105px; + 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); + } + } + + } } .centertable{ width: 95%; diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index 98a792d..fee4c15 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -4,9 +4,9 @@ * @Author: sueRimn * @Date: 2020-12-11 09:06:03 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-15 14:10:50 + * @LastEditTime: 2020-12-21 10:44:17 */ -import { Component, OnInit, ViewChild, Inject } from '@angular/core'; +import { Component, OnInit, ViewChild, Inject,Input } from '@angular/core'; import {HttpClient} from '@angular/common/http' import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatPaginator } from '@angular/material/paginator'; @@ -15,7 +15,9 @@ import { PageEvent } from '@angular/material/paginator'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import {FormControl} from '@angular/forms'; import { Router,ActivatedRoute } from '@angular/router'; - +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { TreeService } from '../../http-interceptors/tree.service' @Component({ @@ -25,12 +27,16 @@ import { Router,ActivatedRoute } from '@angular/router'; }) export class ExaminerIndexComponent implements OnInit { - constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } + constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private tree: TreeService) { } //displayedColumns: string[] = ['name', 'organization', 'startTime', 'overTime', 'testState', 'operation']; ngOnInit(): void { + this.getunitdata(); + this.getOrganizations(); + this.getUnittype(); this.getAlltabledate() - this.getHelp() + setInterval(()=>this.getAlltabledate(),60000) + //this.getHelp() } displayedColumns: string[] = ['name','startTime','endTime', 'examzhong','scc']; @@ -38,6 +44,7 @@ export class ExaminerIndexComponent implements OnInit { accound helpName//消防救援对名称 optionId + @ViewChild('son') son; //分页 @ViewChild(MatPaginator, {static: true}) pageEvent: PageEvent; @@ -48,6 +55,85 @@ export class ExaminerIndexComponent implements OnInit { PageNumber:any //第几页 startTime:[] endTime:[] + allorganizations:any + allunittype:any //获取所有的单位类型 + jscheck:any //辖区中队包含下级 + 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(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); + hasChild = (_: number, node: any) => node.expandable; + + //得到当前单位信息 + getunitdata(){ + this.http.get("/api/ExamAccounts/Profiles").subscribe( + (data:any)=>{ + this.organizationName = data.organizationName + } + ) + } + organizationName:any //当前单位组织机构名称 + treedata:any //组织机构树型数据 + newArr:any = [] + newallorganizations:any //用于存储在原始数据基础上的每个机构增加children字段 + newallorganizations2:any + //得到当前单位所在组织机构的tree型数据 + 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.http.get("/api/ExamAccounts/Profiles").subscribe( + (data:any)=>{ + this.organizationName = data.organizationName + if(this.organizationName){ + this.newallorganizations.forEach(item => { + if(item.name == this.organizationName){ + this.dataSource.data = [item] + this.newallorganizations2 = [item] + } + }); + }else{ + this.newallorganizations2 = this.treedata + this.dataSource.data = this.treedata + } + } + ) + + } + //获得所有组织机构 + getOrganizations(){ + this.http.get('/api/Organizations').subscribe( + (data:any)=>{ + this.allorganizations = data + this.treedata = this.tree.toTree(data); + this.getpresentOrganization(); + } + ) + } + + //获得所有单位类型 + getUnittype(){ + this.http.get('/api/BuildingTypes/Simple').subscribe( + data=>{ + this.allunittype = data + } + ) + } //获得查询支队信息 help(){ @@ -73,6 +159,8 @@ export class ExaminerIndexComponent implements OnInit { let paramsdata:any = { PageNumber: this.PageNumber || '1', PageSize: this.pageSizeOptions[0], + OrganizationId: this.jsId || '', + HasChildren:this.jscheck || '', Sort: null, SortType: null, } @@ -108,7 +196,7 @@ export class ExaminerIndexComponent implements OnInit { } //查询按钮 findClick(){ - const config = new MatSnackBarConfig(); + /* const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 if(this.accound==undefined){ @@ -119,26 +207,165 @@ export class ExaminerIndexComponent implements OnInit { console.log(data) }) } - console.log(this.accound) + console.log(this.accound) */ + console.log(this.jscheck,this.jsId) + this.PageNumber = 1 + this.pageEvent.pageIndex = 0 + this.getAlltabledate() } //重置按钮 Reset(){ - this.accound=undefined + //this.accound=undefined + this.jsId='' + this.js='' + this.jscheck='' } //删除一套考题 deleteExam(examid){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.http.delete(`/api/Papers/${examid}`).subscribe((data:any)=>{ + let isTrue = confirm('您确定要删除吗') + if(isTrue){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.http.delete(`/api/Papers/${examid}`).subscribe((data:any)=>{ this.snackBar.open('删除试卷成功','确定',config); this.getAlltabledate() }) + } + } //新增考题跳转 newExamination(){ - this.router.navigate(['/home/createexam-index/examiner-new-one']) + //this.router.navigate(['/home/createexam-index/examiner-new-one']) + const dialogRef = this.dialog.open(FinishDia, { + width: '650px', + //data: paperDataInfo + }); + } + //辖区中队div是否显示 + isorganizationbox:boolean = false + js:any //辖区中队输入框 + jsId:any //辖区中队选择的id + stopclose(e){ + e.stopPropagation(); + } + //点击辖区中队树，将选择的辖区中队添加到变量 + 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 } } + +@Component({ + selector: 'finish-dialog', + templateUrl: 'finishDia.html', + styleUrls: ['finishDia.scss'] +}) +export class FinishDia{ + + constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) {} + ngOnInit(): void { + this.getProfiles() + } + //获取登录账号的个人资料 + Profiles:any + getProfiles(){ + this.http.get('/api/ExamAccounts/Profiles').subscribe(data => { + console.log(data) + this.Profiles = data + }) + } + + + startTime:string//考试开始时间 + endTime:string//考试结束时间 + examName:string//考试名称 + indexid:string//创建考试的id + tabledate + + //弹窗确定点击事件 + onNoClick(): void { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + if(this.startTime!=undefined&&this.endTime!=undefined&&this.examName!=undefined){ + if(this.startTime>this.endTime){ + this.snackBar.open('开始时间不能大于结束时间','确定',config); + } + else{ + //截取字符串，得到日期部分"2009-12-02",用split把字符串分隔成数组 + var begin1=this.startTime.substr(0,10).split("-"); + var end1=this.endTime.substr(0,10).split("-"); + //将拆分的数组重新组合，并实例成化新的日期对象 + var date1=new Date(begin1[1] + - + begin1[2] + - + begin1[0]); + var date2=new Date(end1[1] + - + end1[2] + - + end1[0]); + //得到两个日期之间的差值m，以分钟为单位 + var m=Number(Math.abs(Number(date2)-Number(date1))/1000/60); + //小时数和分钟数相加得到总的分钟数 + var min1=parseInt(this.startTime.substr(11,2))*60+parseInt(this.startTime.substr(14,2)); + var min2=parseInt(this.endTime.substr(11,2))*60+parseInt(this.endTime.substr(14,2)); + //两个分钟数相减得到时间部分的差值，以分钟为单位 + var n=min2-min1; + //将日期和时间两个部分计算出来的差值相加，即得到两个时间相减后的分钟数 + var minutes=m+n; + + console.log(this.startTime,this.endTime) + let params = { + id: null, + title: this.examName, + duration: minutes, + modifiedTime: new Date(), + deleted: false, + startTime: this.startTime, + endTime: this.endTime, + organizationId: this.Profiles.organizationId, + creatorId: this.Profiles.id, + paperDataInfo: null + } + console.log(params) + this.http.post('/api/Papers',params).subscribe(data => { + this.snackBar.open('创建成功','确定',config); + this.dialogRef.close(); + //sessionStorage.removeItem("checkedWork") + this.tabledate=data + console.log(this.tabledate) + sessionStorage.setItem("indexId",this.tabledate.id) + this.router.navigate(['/home/createexam-index/examiner-new-one']) //跳转试卷列表页面 + },err => { + this.snackBar.open('创建失败','确定',config); + }) + } + } + else{ + if(this.startTime==undefined) + this.snackBar.open('请输入开始时间','确定',config); + else if(this.endTime==undefined) + this.snackBar.open('请输入结束时间','确定',config); + else if(this.examName==undefined) + this.snackBar.open('请输入试卷名称','确定',config); + } + + } + + + close(){ + this.dialogRef.close(); + } +} diff --git a/src/app/examiner/examiner-index/finishDia.html b/src/app/examiner/examiner-index/finishDia.html new file mode 100644 index 0000000..7cd8b49 --- /dev/null +++ b/src/app/examiner/examiner-index/finishDia.html @@ -0,0 +1,32 @@ + +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    + + +
    +
    \ No newline at end of file diff --git a/src/app/examiner/examiner-index/finishDia.scss b/src/app/examiner/examiner-index/finishDia.scss new file mode 100644 index 0000000..93c9f42 --- /dev/null +++ b/src/app/examiner/examiner-index/finishDia.scss @@ -0,0 +1,44 @@ +.box{ + display: flex; + flex-direction: column; + margin-left: 20px; + input{ + width: 260px; + height: 40px; + line-height: 34px; + border-radius: 5px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); + } + .diaone{ + display: flex; + flex-direction: column; + + button { + border: none; + color: white; + padding: 5px 25px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 16px; + margin: 4px 2px; + cursor: pointer; + border-radius: 8px; + outline:0 none !important; + } + } + .diatwo{ + margin-top: 20px; + display: flex; + flex-direction: row; + .endtime{ + margin-left: 20px; + } + .datepicker{ + height: 44px; + border-radius: 5px; + } + } +} diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.ts b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts index 4a1c835..edb165d 100644 --- a/src/app/examiner/examiner-new-one/examiner-new-one.component.ts +++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-11 16:34:26 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-15 13:44:05 + * @LastEditTime: 2020-12-21 10:52:07 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -30,11 +30,13 @@ export class ExaminerNewOneComponent implements OnInit { constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { } ngOnInit(): void { + this.getunitdata(); this.getOrganizations(); this.getUnittype(); this.getAllKeyUnit(); } + indexid=sessionStorage.getItem("indexId") //上个页面传过来的id removeClass=document.getElementsByClassName("mat-form-field-underline") private _transformer = (node, level: number) => { //初始化tree @@ -305,7 +307,7 @@ export class ExaminerNewOneComponent implements OnInit { } ) } - selectedunitArr:any =JSON.parse(sessionStorage.getItem("checkedWork"))||[] //选中单位的数组 + selectedunitArr:any =JSON.parse(sessionStorage.getItem(this.indexid))||[] //选中单位的数组 deleteByid=""//根据id取消选中 //勾选框事件 checkChange(e,element){ @@ -354,7 +356,7 @@ export class ExaminerNewOneComponent implements OnInit { this.snackBar.open('请选择单位','确定',config); } else{ - sessionStorage.setItem("checkedWork",JSON.stringify(this.selectedunitArr) ) + sessionStorage.setItem(this.indexid,JSON.stringify(this.selectedunitArr) ) this.router.navigateByUrl("/examiner/create-test-score") } diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts index 8fab453..930a949 100644 --- a/src/app/examiner/examiner.module.ts +++ b/src/app/examiner/examiner.module.ts @@ -56,10 +56,11 @@ import { PlanLevel } from '../pipes/size.pipe'; import { MarkPapersIndexComponent } from './mark-papers-index/mark-papers-index.component'; import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.component'; import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; +import { FinishDia }from './examiner-index/examiner-index.component' @NgModule({ - declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,MarkPapersIndexComponent, MarkPapersTwoComponent, StatisticAnalysisComponent], + declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,MarkPapersIndexComponent, MarkPapersTwoComponent, StatisticAnalysisComponent,FinishDia], imports: [ CommonModule, examinerRoutingModule, diff --git a/src/app/examiner/statistic-analysis/statistic-analysis.component.html b/src/app/examiner/statistic-analysis/statistic-analysis.component.html index 6afb4fe..49cc609 100644 --- a/src/app/examiner/statistic-analysis/statistic-analysis.component.html +++ b/src/app/examiner/statistic-analysis/statistic-analysis.component.html @@ -4,6 +4,26 @@ * @Author: sueRimn * @Date: 2020-12-15 14:19:50 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-15 14:32:36 + * @LastEditTime: 2020-12-17 14:30:16 --> -

    统计分析

    +
    +
    +
    +
    +
    +
    + +
    +
    STATISTICS
    +
    消防救援单位信息
    +
    考核统计分析
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/app/examiner/statistic-analysis/statistic-analysis.component.scss b/src/app/examiner/statistic-analysis/statistic-analysis.component.scss index e69de29..e836026 100644 --- a/src/app/examiner/statistic-analysis/statistic-analysis.component.scss +++ b/src/app/examiner/statistic-analysis/statistic-analysis.component.scss @@ -0,0 +1,69 @@ +.conter{ + width: 100%; + height: 100%; + overflow: hidden; + background: #F2F5F6; + display: flex; + overflow-y: auto; + .left{ + width: 80%; + height: 60%; + margin: 20px 20px 10px 50px; + background-color: #FFFFFF; + border-radius: 16px ; + #zhidui{ + width: 80%; + height: 50%; + position: absolute; + top: 100px; + //left: 40%; + //top: 45%; + //transform: translate(-50%,-60%); + } + } + .right{ + width: 228px; + height: 60%; + margin: 20px 20px 10px 10px; + background-color: #07CDCF; + border-radius: 16px ; + display: flex; + flex-direction: column; + .rightone{ + //margin-top: 80px; + margin-left: 24px; + color:#FFFFFF; + display: flex; + flex-direction: column; + position: absolute; + top: 110px; + } + .righttwo{ + margin-top: 100px; + margin-left: 24px; + button{ + width: 180px; + height: 44px; + color: #FFFFFF; + background: rgba(255,255,255,0.6); + opacity: 1; + border-radius: 8px; + border: none; + font-size: 18px; + outline: none; + cursor: pointer; + } + .clickButton{ + background-color: #FFFFFF; + color: #07CDCF; + } + } + .rightthree{ + width: 100%; + margin-top: 110px; + img{ + float: right; + } + } + } +} \ No newline at end of file diff --git a/src/app/examiner/statistic-analysis/statistic-analysis.component.ts b/src/app/examiner/statistic-analysis/statistic-analysis.component.ts index c17eb42..6031b46 100644 --- a/src/app/examiner/statistic-analysis/statistic-analysis.component.ts +++ b/src/app/examiner/statistic-analysis/statistic-analysis.component.ts @@ -1,4 +1,14 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-15 14:19:50 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-17 16:02:43 + */ import { Component, OnInit } from '@angular/core'; +//import {EchartsDataService} from '../../echarts-data.service'; +declare var echarts: any; @Component({ selector: 'app-statistic-analysis', @@ -10,6 +20,82 @@ export class StatisticAnalysisComponent implements OnInit { constructor() { } ngOnInit(): void { + window.setTimeout(()=>{ + this.initCharts() + },0) + } + + zhutu//柱状图实例 + zhiNameData =["浦东支队","黄浦支队","徐汇支队","长宁支队","静安支队","普陀支队","虹口支队","杨浦支队","闵行支队","宝山支队","嘉定支队"] + staticExam=false//考试统计 + upStatic=false//发布考试统计 + //考试统计按钮 + staticecam(){ + this.staticExam=true + this.upStatic=false + } + //发布考试按钮 + upexam(){ + this.staticExam=false + this.upStatic=true + } + + initCharts() { + var detailPlanEchart = echarts.init(document.getElementById('zhidui')); + var option = { + xAxis: { + type: 'category', + data: this.zhiNameData, + axisLabel:{ + fontSize:18, + lineHeight:31, + }, + axisLine:{ + show:false + }, + splitLine:{ + show:false + }, + axisTick:{ + show:false + }, + }, + yAxis: { + type: 'value', + axisLabel:{ + fontSize:18, + lineHeight:31 + }, + axisTick:{ + show:false + }, + axisLine:{ + show:false + }, + splitLine:{ + show:true, + lineStyle:{ + opacity:0.2, + type:'dashed' + } + }, + show:true + }, + series: [{ + data: [160, 150,140,130, 120, 100,90, 80, 60, 40,30], + type: 'bar', + showBackground: true, + backgroundStyle: { + color: '#F2F5F6' + }, + itemStyle:{ + color:"#FF8678", + barBorderRadius:12 + }, + barWidth:"24px" + }] + }; + detailPlanEchart.setOption(option); } } diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index f389b85..7c6d997 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-10 10:21:40 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-15 14:32:13 + * @LastEditTime: 2020-12-20 16:32:02 --> @@ -41,6 +41,14 @@ +
      +
    • + +
      • +
    • + +
      • +
    diff --git a/src/app/student/student-exam-record/student-exam-record.component.html b/src/app/student/student-exam-record/student-exam-record.component.html new file mode 100644 index 0000000..00e0b82 --- /dev/null +++ b/src/app/student/student-exam-record/student-exam-record.component.html @@ -0,0 +1 @@ +

    student-exam-record works!

    diff --git a/src/app/student/student-exam-record/student-exam-record.component.scss b/src/app/student/student-exam-record/student-exam-record.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/student/student-exam-record/student-exam-record.component.spec.ts b/src/app/student/student-exam-record/student-exam-record.component.spec.ts new file mode 100644 index 0000000..124461f --- /dev/null +++ b/src/app/student/student-exam-record/student-exam-record.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StudentExamRecordComponent } from './student-exam-record.component'; + +describe('StudentExamRecordComponent', () => { + let component: StudentExamRecordComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ StudentExamRecordComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(StudentExamRecordComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/student/student-exam-record/student-exam-record.component.ts b/src/app/student/student-exam-record/student-exam-record.component.ts new file mode 100644 index 0000000..223b0d7 --- /dev/null +++ b/src/app/student/student-exam-record/student-exam-record.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-student-exam-record', + templateUrl: './student-exam-record.component.html', + styleUrls: ['./student-exam-record.component.scss'] +}) +export class StudentExamRecordComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/student/student-index/student-index.component.html b/src/app/student/student-index/student-index.component.html new file mode 100644 index 0000000..6db07b8 --- /dev/null +++ b/src/app/student/student-index/student-index.component.html @@ -0,0 +1 @@ +

    student-index works!

    diff --git a/src/app/student/student-index/student-index.component.scss b/src/app/student/student-index/student-index.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/student/student-index/student-index.component.spec.ts b/src/app/student/student-index/student-index.component.spec.ts new file mode 100644 index 0000000..3d9ffad --- /dev/null +++ b/src/app/student/student-index/student-index.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StudentIndexComponent } from './student-index.component'; + +describe('StudentIndexComponent', () => { + let component: StudentIndexComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ StudentIndexComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(StudentIndexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/student/student-index/student-index.component.ts b/src/app/student/student-index/student-index.component.ts new file mode 100644 index 0000000..2492f3b --- /dev/null +++ b/src/app/student/student-index/student-index.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-student-index', + templateUrl: './student-index.component.html', + styleUrls: ['./student-index.component.scss'] +}) +export class StudentIndexComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/student/student-routing.module.ts b/src/app/student/student-routing.module.ts new file mode 100644 index 0000000..8e6d8d1 --- /dev/null +++ b/src/app/student/student-routing.module.ts @@ -0,0 +1,24 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-20 11:21:49 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-20 16:31:55 + */ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { StudentIndexComponent} from './student-index/student-index.component' +import { StudentExamRecordComponent} from './student-exam-record/student-exam-record.component' + + +const routes: Routes = [ + { path: 'student-index', component:StudentIndexComponent }, + { path: 'student-exarecord', component:StudentExamRecordComponent }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class StudentRoutingModule { } diff --git a/src/app/student/student.module.ts b/src/app/student/student.module.ts new file mode 100644 index 0000000..71bf87c --- /dev/null +++ b/src/app/student/student.module.ts @@ -0,0 +1,112 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {A11yModule} from '@angular/cdk/a11y'; +import {DragDropModule} from '@angular/cdk/drag-drop'; +import {PortalModule} from '@angular/cdk/portal'; +import {ScrollingModule} from '@angular/cdk/scrolling'; +import {CdkStepperModule} from '@angular/cdk/stepper'; +import {CdkTableModule} from '@angular/cdk/table'; +import {CdkTreeModule} from '@angular/cdk/tree'; +import {MatAutocompleteModule} from '@angular/material/autocomplete'; +import {MatBadgeModule} from '@angular/material/badge'; +import {MatBottomSheetModule} from '@angular/material/bottom-sheet'; +import {MatButtonModule} from '@angular/material/button'; +import {MatButtonToggleModule} from '@angular/material/button-toggle'; +import {MatCardModule} from '@angular/material/card'; +import {MatCheckboxModule} from '@angular/material/checkbox'; +import {MatChipsModule} from '@angular/material/chips'; +import {MatStepperModule} from '@angular/material/stepper'; +import {MatDatepickerModule} from '@angular/material/datepicker'; +import {MatDialogModule} from '@angular/material/dialog'; +import {MatDividerModule} from '@angular/material/divider'; +import {MatExpansionModule} from '@angular/material/expansion'; +import {MatGridListModule} from '@angular/material/grid-list'; +import {MatIconModule} from '@angular/material/icon'; +import {MatInputModule} from '@angular/material/input'; +import {MatListModule} from '@angular/material/list'; +import {MatMenuModule} from '@angular/material/menu'; +import {MatNativeDateModule, MatRippleModule, MatOption} from '@angular/material/core'; +import {MatPaginatorModule} from '@angular/material/paginator'; +import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; +import {MatRadioModule} from '@angular/material/radio'; +import {MatSelectModule} from '@angular/material/select'; +import {MatSidenavModule} from '@angular/material/sidenav'; +import {MatSliderModule} from '@angular/material/slider'; +import {MatSlideToggleModule} from '@angular/material/slide-toggle'; +import {MatSnackBarModule} from '@angular/material/snack-bar'; +import {MatSortModule} from '@angular/material/sort'; +import {MatTableModule} from '@angular/material/table'; +import {MatTabsModule} from '@angular/material/tabs'; +import {MatToolbarModule} from '@angular/material/toolbar'; +import {MatTooltipModule} from '@angular/material/tooltip'; +import {MatTreeModule} from '@angular/material/tree'; +import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatPaginatorIntl } from '@angular/material/paginator'; +import { myPaginator } from '../ui/my-paginator'; +import { NavigationModule } from '../navigation/navigation.module'; +import { NzTreeModule } from 'ng-zorro-antd/tree'; +import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; + +import { StudentRoutingModule } from './student-routing.module'; +import { StudentIndexComponent } from './student-index/student-index.component'; +import { StudentExamRecordComponent } from './student-exam-record/student-exam-record.component'; + + +@NgModule({ + declarations: [StudentIndexComponent, StudentExamRecordComponent], + imports: [ + CommonModule, + StudentRoutingModule, + A11yModule, + CdkStepperModule, + CdkTableModule, + CdkTreeModule, + DragDropModule, + MatAutocompleteModule, + MatBadgeModule, + MatBottomSheetModule, + MatButtonModule, + MatButtonToggleModule, + MatCardModule, + MatCheckboxModule, + MatChipsModule, + MatStepperModule, + MatDatepickerModule, + MatDialogModule, + MatDividerModule, + MatExpansionModule, + MatGridListModule, + MatIconModule, + MatInputModule, + MatListModule, + MatMenuModule, + MatNativeDateModule, + MatPaginatorModule, + MatProgressBarModule, + MatProgressSpinnerModule, + MatRadioModule, + MatRippleModule, + MatSelectModule, + MatSidenavModule, + MatSliderModule, + MatSlideToggleModule, + MatSnackBarModule, + MatSortModule, + MatTableModule, + MatTabsModule, + MatToolbarModule, + MatTooltipModule, + MatTreeModule, + PortalModule, + ScrollingModule, + ReactiveFormsModule, + FormsModule, + NavigationModule, + NzTreeModule, + NzDatePickerModule, + ], + providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ] +}) +export class StudentModule { } diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 6fcb652..688a14c 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -397,15 +397,6 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV } this.canvasData.isChange = true; }); - - // todo 创建一个无限大的grid - const cell = new PIXI.Graphics(); - cell.lineStyle(1, 0xff0000); - cell.beginFill(0x0000ff); - cell.drawRect(0, 0, 500, 500); - - cell.endFill(); - this.app.stage.addChild(cell); } /** * 重置画布 diff --git a/src/assets/images/examdown.png b/src/assets/images/examdown.png new file mode 100644 index 0000000..3c3cf9d Binary files /dev/null and b/src/assets/images/examdown.png differ diff --git a/src/assets/images/examrecord.png b/src/assets/images/examrecord.png new file mode 100644 index 0000000..cf55a7d Binary files /dev/null and b/src/assets/images/examrecord.png differ diff --git a/src/assets/images/examstatic.png b/src/assets/images/examstatic.png new file mode 100644 index 0000000..065dfb0 Binary files /dev/null and b/src/assets/images/examstatic.png differ diff --git a/src/assets/images/joinexam.png b/src/assets/images/joinexam.png new file mode 100644 index 0000000..aa1a862 Binary files /dev/null and b/src/assets/images/joinexam.png differ diff --git a/src/assets/images/statictop.png b/src/assets/images/statictop.png new file mode 100644 index 0000000..540fb3c Binary files /dev/null and b/src/assets/images/statictop.png differ diff --git a/src/assets/images/upload.png b/src/assets/images/upload.png new file mode 100644 index 0000000..8e934e8 Binary files /dev/null and b/src/assets/images/upload.png differ