diff --git a/src/app/examiner/examiner-index/examiner-index.component.html b/src/app/examiner/examiner-index/examiner-index.component.html index 1e89125..f81a5a6 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.html +++ b/src/app/examiner/examiner-index/examiner-index.component.html @@ -1 +1,69 @@ -

examiner-index works!

+ +
+
+
+
+ + + + +
+
+ + +
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + +
试卷名称考核中队开始时间结束时间考试状态操作
{{item.name}}{{item.organization}}{{item.startTime}}{{item.overTime}}{{item.testState}} + 编辑 + 详情 + 删除 +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/examiner/examiner-index/examiner-index.component.scss b/src/app/examiner/examiner-index/examiner-index.component.scss index e69de29..e7510fe 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.scss +++ b/src/app/examiner/examiner-index/examiner-index.component.scss @@ -0,0 +1,94 @@ +table { + width: 100%; + text-align: center; + .cdk-header-cell { + text-align: center; + } + } + + .content { + width: 100%; + height: 100%; + overflow: hidden; + background: #F2F5F6; + } + .header { + width: 100%; + padding: 10px; + margin-bottom: 10px; + box-sizing: border-box; + .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: 14px; + input { + width: 320px; + height: 44px; + line-height: 34px; + border-radius: 5px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); + } + button { + border: none; + color: white; + padding: 10px 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; + } + } + .headerright{ + float: right; + } + } //queryBox + } + .centertable{ + width: 1632px; + margin-right: 40px; + margin-left: 40px; + background-color: #FFFFFF; + table{ + td,th{ + height: 48px; + font-size: 18px; + } + td{ + border-bottom: 1px solid #F2F5F6; + } + thead{ + background-color:#F5FDFE; + } + .green{ + color: #07CDCF; + } + .red{ + color: #FF8678; + } + } + } + + .operationSpan{ + margin: 0 10px; + .spanbtn { + font-weight: 550; + cursor: pointer; + } + .green{ color: #04ced1; } + .red{ color: #FF8678 } + .gray{ color: gray; } + } + \ No newline at end of file diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index 426699d..91558ff 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -1,4 +1,31 @@ -import { Component, OnInit } from '@angular/core'; +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-11 09:06:03 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-11 19:38:25 + */ +import { Component, OnInit, ViewChild, Inject } 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'; +import { MatTableDataSource } from '@angular/material/table'; +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'; + +const ELEMENT_DATA = [ + {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'未开考'}, + {name: "富华酒店", organization: '黄埔支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'未开考'}, + {name: "雁山园", organization: '徐汇支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'}, + {name: "富华酒店", organization: '普陀支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'}, + {name: "立新加油站", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'开考中'}, + {name: "富华酒店", organization: '宝山支队', startTime: "2020-07-19 10:00", overTime: '2020-07-19 12:00',testState:'已结束'}, + {name: "裕达国际酒店", organization: '浦东支队', startTime: "2020-08-19 10:00", overTime: '2020-08-19 12:00',testState:'已结束'}, + {name: "锦德大酒店", organization: '长宁支队', startTime: "2019-09-19 10:00", overTime: '2019-09-19 12:00',testState:'已结束'}, +]; @Component({ selector: 'app-examiner-index', @@ -7,9 +34,16 @@ import { Component, OnInit } from '@angular/core'; }) export class ExaminerIndexComponent implements OnInit { - constructor() { } + constructor(private router: Router,private activatedRoute: ActivatedRoute,public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } + displayedColumns: string[] = ['name', 'organization', 'startTime', 'overTime', 'testState', 'operation']; + dataSource = ELEMENT_DATA; ngOnInit(): void { + + } + //新增考题跳转 + newExamination(){ + this.router.navigate(['/home/examiner-new-one']) } } diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.html b/src/app/examiner/examiner-new-one/examiner-new-one.component.html new file mode 100644 index 0000000..75a1628 --- /dev/null +++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.html @@ -0,0 +1,39 @@ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 包含下级 + + +
+
+ +
+
+
+
+
+
+
+
+
diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.scss b/src/app/examiner/examiner-new-one/examiner-new-one.component.scss new file mode 100644 index 0000000..ac8deaa --- /dev/null +++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.scss @@ -0,0 +1,111 @@ +table { + width: 100%; + text-align: center; + .cdk-header-cell { + text-align: center; + } + } + + .content { + width: 100%; + height: 100%; + overflow: hidden; + background: #F2F5F6; + display: flex; + .contentLeft{ + width: 1270px; + height: 850px; + margin: 20px 20px 10px 50px; + background-color: #FFFFFF; + border-radius: 16px ; + } + .contentRight{ + width: 320px; + height: 850px; + margin: 20px 20px 10px 10px; + background-color: #FFFFFF; + border-radius: 16px ; + } + } + .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; + font-size: 14px; + display: flex; + flex-direction: column; + input { + width: 260px; + height: 44px; + line-height: 34px; + border-radius: 5px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); + } + 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; + } + } + .headerright{ + float: right; + } + } //queryBox + } + .centertable{ + width: 1632px; + margin-right: 40px; + margin-left: 40px; + background-color: #FFFFFF; + table{ + td,th{ + height: 48px; + font-size: 18px; + } + td{ + border-bottom: 1px solid #F2F5F6; + } + thead{ + background-color:#F5FDFE; + } + .green{ + color: #07CDCF; + } + .red{ + color: #FF8678; + } + } + } + + .operationSpan{ + margin: 0 10px; + .spanbtn { + font-weight: 550; + cursor: pointer; + } + .green{ color: #04ced1; } + .red{ color: #FF8678 } + .gray{ color: gray; } + } + \ No newline at end of file diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.spec.ts b/src/app/examiner/examiner-new-one/examiner-new-one.component.spec.ts new file mode 100644 index 0000000..c142b26 --- /dev/null +++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExaminerNewOneComponent } from './examiner-new-one.component'; + +describe('ExaminerNewOneComponent', () => { + let component: ExaminerNewOneComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ExaminerNewOneComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ExaminerNewOneComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 0000000..6940fe3 --- /dev/null +++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts @@ -0,0 +1,395 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2020-12-11 16:34:26 + * @LastEditors: sueRimn + * @LastEditTime: 2020-12-12 09:13:04 + */ +import { Component, OnInit, ViewChild, Inject } from '@angular/core'; +import { HttpClient } from '@angular/common/http' +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { MatPaginator } from '@angular/material/paginator'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { FormControl } from '@angular/forms'; +import { Router,ActivatedRoute } from '@angular/router' +import { PageEvent } from '@angular/material/paginator'; +import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import { TreeService } from '../../http-interceptors/tree.service' +import { MatSort } from '@angular/material/sort'; +import { MatTableDataSource } from '@angular/material/table'; + +@Component({ + selector: 'app-examiner-new-one', + templateUrl: './examiner-new-one.component.html', + styleUrls: ['./examiner-new-one.component.scss'] +}) +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.getAllKeyUnit(); + } + + 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); + myControl = new FormControl(); + hasChild = (_: number, node: any) => node.expandable; + + @ViewChild(MatSort) sort: MatSort; + + allunittype:any //获取所有的单位类型 + + //分页 + @ViewChild(MatPaginator, {static: true}) + pageEvent: PageEvent; + paginator: MatPaginator; + length:any; //共多少条数据 + pageSize:any; //每页条数 + pageSizeOptions: number[] = [10] //设置每页条数 + PageNumber:any //第几页 + + displayedColumns: string[] = ['checked','Follow','unitname','integrity','jurisdictionsquadron', 'unittype','scc', 'time','operation']; + tabledataSource:any + allorganizations:any + oldDataSource:any; //原始表格数据 + + //分页事件 + chagePage(e){ + 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}, + ]} + ] + + 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 || '', + 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); + }) + } + //得到当前单位信息 + getunitdata(){ + this.http.get("/api/Account/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/Account/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 + } + ) + } + selectedunitArr:any =[] //选中单位的数组 + //勾选框事件 + checkChange(e,element){ + element.checked = e.checked + } + //编辑单位信息 + editunit(){ + sessionStorage.setItem("six","edit") + let selectedunitArr = [] + let selectedunitobj = [] + this.allKeyUnitInfo.items.forEach(item => { + if(item.checked){ + selectedunitArr.push(item.id) + selectedunitobj.push(item) + } + }); + + if(selectedunitArr.length == 0){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('请先选择要修改的单位','确定',config); + } + if(selectedunitArr.length != 1 && selectedunitArr.length != 0){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('只能选择一个单位修改','确定',config); + } + if(selectedunitArr.length == 1){ //带着id跳到修改页面 + // console.log(778,selectedunitArr[0]) + this.allKeyUnitInfo.items.forEach(item => { + if(item.id == selectedunitArr[0]){ + let companyName = item.name + sessionStorage.setItem("companyName",companyName) + } + }); + sessionStorage.setItem("editable","1") + sessionStorage.setItem(selectedunitobj[0].id,JSON.stringify(selectedunitobj[0].companyIntegrityScore)) + window.open(`/keyUnit/editplaninfo?id=${selectedunitArr[0]}`); + } + } + + + //重置 + js:any //辖区中队输入框 + jsId:any //辖区中队选择的id + companyName:any //单位名称 + shehui:any //统一社会信用代码 + unittype:any //单位类型 + jscheck:any //辖区中队包含下级 + OrganizationId // + follow:any = '' //是否为关注单位 + integritySort:any //完整度排序 + reset(){ + this.js='' //辖区中队输入框 + this.jscheck='' //辖区中队包含下级 + this.companyName='' //单位名称 + this.shehui='' //统一社会信用代码 + this.unittype='' //单位类型 + this.jsId = '' + this.follow = '' + this.PageNumber = 1 + this.pageEvent.pageIndex = 0 + this.integritySort = '' + this.getAllKeyUnit(); + } + + //提交查询表单 + onSubmit(value){ + this.PageNumber = 1 + 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 + } + +} diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts index 33e459b..c2fcb4c 100644 --- a/src/app/examiner/examiner-routing.ts +++ b/src/app/examiner/examiner-routing.ts @@ -4,14 +4,19 @@ * @Author: sueRimn * @Date: 2020-12-10 12:11:26 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-11 09:15:24 + * @LastEditTime: 2020-12-12 09:16:04 */ import { Routes, RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; import { ExaminerIndexComponent } from './examiner-index/examiner-index.component' +import { ExaminerNewOneComponent} from './examiner-new-one/examiner-new-one.component' const routes: Routes = [ - { path: 'createexam-index', component:ExaminerIndexComponent }, + // { path: '', component:CreateExamComponent } + { path: 'createexam-index', component:ExaminerIndexComponent }, + { path: 'examiner-new-one', component:ExaminerNewOneComponent } + + //{ path: 'createexam-index', component:ExaminerIndexComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts index 588a71b..2ce8e13 100644 --- a/src/app/examiner/examiner.module.ts +++ b/src/app/examiner/examiner.module.ts @@ -50,11 +50,11 @@ import { AddPlanDialog, AddPlanTwoDialog, CreateTestScoreComponent, LookTreeNode import { NavigationModule } from '../navigation/navigation.module'; import { NzTreeModule } from 'ng-zorro-antd/tree'; import { ExaminerIndexComponent } from './examiner-index/examiner-index.component'; - +import { ExaminerNewOneComponent } from './examiner-new-one/examiner-new-one.component'; @NgModule({ - declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog], + declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent], imports: [ CommonModule, examinerRoutingModule, @@ -103,7 +103,7 @@ import { ExaminerIndexComponent } from './examiner-index/examiner-index.componen ReactiveFormsModule, FormsModule, NavigationModule, - NzTreeModule + NzTreeModule, ], providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ] }) diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index e30e975..e9b6bba 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -23,7 +23,7 @@ export class NavigationComponent implements OnInit { selectedDataBank:any //当前选中的资料库 hoverDataBank:any//当前鼠标移入的资料库 isOneClick:boolean //是否第一次进入网页 - leftMenuname="found" + leftMenuname="" //左侧菜单点击事件 clickLeftmenu(name){ diff --git a/src/assets/images/add.png b/src/assets/images/add.png new file mode 100644 index 0000000..eba8533 Binary files /dev/null and b/src/assets/images/add.png differ