From 6fa6f5e7ce68ef003bcb7fc808cb1838be6d64bb Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 15 Dec 2020 14:45:34 +0800 Subject: [PATCH 01/24] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=A2=84=E6=A1=88=E8=80=83=E9=A2=98=E7=94=9F=E6=88=90=E4=B8=B4?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE[=E5=AE=8C=E5=96=84]=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=88=86=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-test-score.component.html | 10 +- .../create-test-score.component.ts | 115 +++++++++++------- 2 files changed, 77 insertions(+), 48 deletions(-) diff --git a/src/app/examiner/create-test-score/create-test-score.component.html b/src/app/examiner/create-test-score/create-test-score.component.html index 03965ee..7299db5 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.html +++ b/src/app/examiner/create-test-score/create-test-score.component.html @@ -272,12 +272,12 @@ 设置分数 操作 - + {{item.name}} - {{item.or}} - {{item.time}} - {{item.isOpen}} - {{item.level}} + {{item.creatorName}} + {{item.modifiedTime | date:'yyyy-MM-dd'}} + {{item.openRange}} + {{item.planLevel | planlevel}} diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts index f8af142..07bf7ad 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.ts +++ b/src/app/examiner/create-test-score/create-test-score.component.ts @@ -23,6 +23,25 @@ export class CreateTestScoreComponent implements OnInit { this.selectedTab = index } ngOnInit(): void { + for (let y = 0, length = this.unitId.length; y < length; y++){ + let element = this.unitId[y] + element.score = 0 + element.basicInfoScore = 0 + element.basicInfoItemScore = 0 + element.basicInfoNodes = [] + element.aroundScore = 0 + element.aroundItemScore = 0 + element.aroundNodes = [] + element.keySiteScore = 0 + element.keySiteItemScore = 0 + element.keySiteNodes = [] + element.funDivScore = 0 + element.funDivItemScore = 0 + element.funDivNodes = [] + element.fireFacScore = 0 + element.fireFacItemScore = 0 + element.fireFacNodes = [] + } this.getUnitData().then(()=>{ this.getAround().then(()=>{ this.getKeySite().then(()=>{ @@ -32,21 +51,12 @@ export class CreateTestScoreComponent implements OnInit { }) }) }) - // Promise.all([this.getUnitData(),this.getAround(),this.getKeySite(),this.getFunDiv()]).then(()=>{ - // this.getFireFac() - // }) } //当前选中的单位 selectedUnitIndex = 0 clickUnitName(key){ this.selectedUnitIndex = key } - - //上个页面传过来的单位数据 - // unitId:any = [{name:'最最最最最',id:'5fb76c42919f2b44e464016f'}, - // {name:'华南城集团有限公司',id:'5ee19fe06f91049f5e23e937'}, - // {name:'贵港油库',id:'5fa35d68f8eb762cb03c662e'} - // ] unitId:any = JSON.parse(sessionStorage.getItem('checkedWork')) //获取单位基本信息 @@ -54,9 +64,7 @@ export class CreateTestScoreComponent implements OnInit { let that = this for (let y = 0, length = this.unitId.length; y < length; y++){ let element = this.unitId[y] - element.score = 0 - element.basicInfoScore = 0 - element.basicInfoItemScore = 0 + let result1 = await new Promise((resolve, reject) => { this.http.get(`/api/Companies/${element.id}`).subscribe((data:any)=>{ let unitData = { @@ -85,7 +93,7 @@ export class CreateTestScoreComponent implements OnInit { name: '单位地址',key: element.id+'单位地址',isLeaf:true,value:data.address }) : null - element.basicInfoNodes = [] + element.basicInfoNodes.push(unitData) resolve(1) @@ -191,9 +199,7 @@ export class CreateTestScoreComponent implements OnInit { let that = this for (let y = 0, length = this.unitId.length; y < length; y++){ let element = this.unitId[y] - element.aroundScore = 0 - element.aroundItemScore = 0 - element.aroundNodes = [] + //获得当前单位的单位毗邻 let id = {companyId:element.id} let result1 = await new Promise((resolve, reject) => { @@ -275,9 +281,7 @@ export class CreateTestScoreComponent implements OnInit { for (let y = 0, length = this.unitId.length; y < length; y++){ console.log("xiba") let element = this.unitId[y] - element.keySiteScore = 0 - element.keySiteItemScore = 0 - element.keySiteNodes = [] + //获得单位重点部位 let id = {companyId:element.id} @@ -354,9 +358,7 @@ export class CreateTestScoreComponent implements OnInit { let that = this for (let y = 0, length = this.unitId.length; y < length; y++){ let element = this.unitId[y] - element.funDivScore = 0 - element.funDivItemScore = 0 - element.funDivNodes = [] + let id = {companyId:element.id} //单位功能分区 let result1 = await new Promise((resolve, reject) => { @@ -432,9 +434,7 @@ export class CreateTestScoreComponent implements OnInit { getFireFac(){ let that = this this.unitId.forEach((element,index) =>{ - element.fireFacScore = 0 - element.fireFacItemScore = 0 - element.fireFacNodes = [] + let companyId = element.id //获取单位级别消防设施 this.http.get(`/api/Companies/${companyId}`).subscribe((data:any)=>{ @@ -550,20 +550,29 @@ export class CreateTestScoreComponent implements OnInit { calculateScore(key){ //key代表第几个建筑 //计算整个单位的总分 - + // console.log(this.unitId[key].basicInfoScore) + // console.log(this.unitId[key].aroundScore) + // console.log(this.unitId[key].keySiteScore) + // console.log(this.unitId[key].funDivScore) + // console.log(this.unitId[key].fireFacScore) this.unitId[key].score = this.unitId[key].basicInfoScore + this.unitId[key].aroundScore + this.unitId[key].keySiteScore + this.unitId[key].funDivScore + this.unitId[key].fireFacScore - - //计算整个试卷的总分 + //计算整个试卷的总分 - let examScore = 0 - this.unitId.forEach(element => { - examScore += element.score - }) - let examScore2 = 0 - this.planDatas.forEach(element => { - examScore2 += Number(element.score) - }) - this.examScore = examScore + examScore2 + let examScore = 0 + this.unitId.forEach(element => { + examScore += element.score + }) + let examScore2 = 0 + this.unitId.forEach(element => { + let x = 0 + if(element.planList){ + element.planList.forEach(i => { + x += i.score + }) + } + examScore2 += Number(x) + }) + this.examScore = examScore + examScore2 } //tree的选择事件 @@ -721,19 +730,33 @@ export class CreateTestScoreComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { - console.log('The dialog was closed'); + if(result){ + if(this.unitId[this.selectedUnitIndex].planList){ + this.unitId[this.selectedUnitIndex].planList.push(result) + }else{ + this.unitId[this.selectedUnitIndex].planList = [] + this.unitId[this.selectedUnitIndex].planList.push(result) + } + } }); } //每条预案分数增加在试卷分数 planItemScore(item){ //计算整个试卷的总分 + console.log(item) let examScore = 0 this.unitId.forEach(element => { examScore += element.score }) let examScore2 = 0 - this.planDatas.forEach(element => { - examScore2 += Number(element.score) + this.unitId.forEach(element => { + let x = 0 + if(element.planList){ + element.planList.forEach(i => { + x += i.score + }) + } + examScore2 += Number(x) }) this.examScore = examScore + examScore2 } @@ -1029,7 +1052,7 @@ export class CreateTestScoreComponent implements OnInit { }); dialogRef.afterClosed().subscribe(result => { - console.log('The dialog was closed'); + }); } @@ -1069,7 +1092,13 @@ export class AddPlanDialog { }); dialogRef.afterClosed().subscribe(result => { - this.dialogRef.close(); + if(result){ + console.log(1111111,result) + this.dialogRef.close(result); + }else{ + this.dialogRef.close(); + } + }); } } @@ -1118,7 +1147,7 @@ export class AddPlanTwoDialog { confirm(){ if(this.planType){//如果选择的是已存在预案 if(this.selectedRadioData){ - this.dialogRef.close(); + this.dialogRef.close(this.selectedRadioData); sessionStorage.setItem('companyName',this.data.companyData.companyData.name) sessionStorage.setItem('planId',this.selectedRadioData.id) sessionStorage.setItem('buildingTypeId',this.data.companyData.companyData.buildingTypes[0].id) From ac55bd9f10ef3de033e99d5a9640e6c796d1e35e Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 15 Dec 2020 15:57:17 +0800 Subject: [PATCH 02/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-test-score.component.html | 8 ++-- .../create-test-score.component.ts | 38 +++++++++++-------- .../collection-tools.component.html | 4 +- src/app/ui/collection-tools/panel.scss | 2 +- src/styles.scss | 8 +++- 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/app/examiner/create-test-score/create-test-score.component.html b/src/app/examiner/create-test-score/create-test-score.component.html index 7299db5..4a5b95b 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.html +++ b/src/app/examiner/create-test-score/create-test-score.component.html @@ -36,7 +36,7 @@
-
+
@@ -257,7 +257,7 @@
-
+
add_circle_outline添加预案
@@ -282,8 +282,8 @@ - 编辑 - 删除 + 编辑 + 删除 diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts index 07bf7ad..0b073ba 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.ts +++ b/src/app/examiner/create-test-score/create-test-score.component.ts @@ -20,7 +20,10 @@ export class CreateTestScoreComponent implements OnInit { constructor(private router:Router,public dialog: MatDialog,private http: HttpClient,public snackBar: MatSnackBar) { } selectedTab:number = 1 //选中的选项卡 selectTab(index){ - this.selectedTab = index + setTimeout(() => { + this.selectedTab = index + }, 0); + } ngOnInit(): void { for (let y = 0, length = this.unitId.length; y < length; y++){ @@ -279,7 +282,6 @@ export class CreateTestScoreComponent implements OnInit { async getKeySite(){ let that = this for (let y = 0, length = this.unitId.length; y < length; y++){ - console.log("xiba") let element = this.unitId[y] //获得单位重点部位 @@ -531,13 +533,6 @@ export class CreateTestScoreComponent implements OnInit { stopPropagation($event){ $event.stopPropagation() } - //模拟预案数据 - planDatas:any = [ - {name:'5楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0}, - {name:'6楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0}, - {name:'7楼电路故障灾情扑救',or:'上海总队',time:'2020-09-24',isOpen:'未公开',level:'总队',score:0} - ] - defaultCheckedKeys = []; //指定选中复选框的树节点 key值 defaultExpandedKeys = []; //展开指定的树节点 key值 defaultSelectedKeys = []; //指定选中的树节点 key值 @@ -550,11 +545,6 @@ export class CreateTestScoreComponent implements OnInit { calculateScore(key){ //key代表第几个建筑 //计算整个单位的总分 - // console.log(this.unitId[key].basicInfoScore) - // console.log(this.unitId[key].aroundScore) - // console.log(this.unitId[key].keySiteScore) - // console.log(this.unitId[key].funDivScore) - // console.log(this.unitId[key].fireFacScore) this.unitId[key].score = this.unitId[key].basicInfoScore + this.unitId[key].aroundScore + this.unitId[key].keySiteScore + this.unitId[key].funDivScore + this.unitId[key].fireFacScore //计算整个试卷的总分 @@ -760,7 +750,25 @@ export class CreateTestScoreComponent implements OnInit { }) this.examScore = examScore + examScore2 } - + //编辑每条预案试卷 + edit(item){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('暂不能编辑','确定',config); + } + //删除每条预案试卷 + deletePlan(item){ + this.unitId[this.selectedUnitIndex].planList.forEach((element,key)=>{ + if(item == element){ + this.unitId[this.selectedUnitIndex].planList.splice(key,1) + } + }) + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('删除成功','确定',config); + } //保存 save(){ let copyDatas = JSON.parse(JSON.stringify(this.unitId)) diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 32493aa..4760694 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -104,7 +104,7 @@ - + {{node.name}} @@ -113,7 +113,7 @@ check_circle_outline - + - 上传中... - -
- - - -
- - 下载中... - -
-
- -
-
-
- 返回根目录 -   - 返回上一级 - | - 全部文件 - → - {{selectedDataBank}} -
- -
- 已全部加载，共 {{fileNum}} 个 -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - 文件名 - - - - - - - - - - - - - - - - - - {{element.key | name}} - - - {{element.key | name2}} - - -   3D   - - 大小 {{element.size | size}} 修改日期 {{element.lastModified | date:'yyyy-MM-dd HH:mm:ss'}}
- -
- 您还没上传过文件哦～ -
-
- -
- account_balance 战术授课进入 -
- -
- account_balance 战术学习进入 -
- -
- -
- - - diff --git a/src/app/ui/all-file/all-file.component.scss b/src/app/ui/all-file/all-file.component.scss deleted file mode 100644 index 04d8486..0000000 --- a/src/app/ui/all-file/all-file.component.scss +++ /dev/null @@ -1,265 +0,0 @@ -// @import "//at.alicdn.com/t/font_1863119_sy1f800ck9h.css"; -.topbox{ - height: 33px; - position: relative; - padding: 11px 10px; - .leftbox{ - float: left; - display: flex; - .upload{ - margin-left:16px; - background-color: #09AAFF; - border-radius: 4px; - cursor: pointer; - .btn{ - position: relative; - color: white; - font-size: 13px; - mat-icon{ - position: absolute; - top: 5px; - left: 10px; - } - span{ - position: absolute; - left: 41px; - top: 9px; - } - input{ - width: 88px; - height: 33px; - opacity: 0; - } - } - .openbtn{ - background-color: white; - width: 86px; - text-align: center; - font-size: 12px; - border-radius: 0px 0px 4px 4px; - border: 1px solid #09AAFF; - div{ - position: relative; - height: 30px; - line-height: 30px; - color: #09AAFF; - input{ - width: 86px; - height: 30px; - opacity: 0; - position: absolute; - left: 0; - top: 0; - } - } - div:hover{ - background-color: whitesmoke; - } - } - } - .newFile{ - cursor: pointer; - background-color: #fff; - color: #09AAFF; - border: 1px solid #C3EAFF; - border-radius: 4px; - margin-left: 12px; - height: 33px; - line-height: 33px; - font-size: 13px; - position: relative; - width: 130px; - height: 33px; - float: left; - mat-icon{ - position: absolute; - top: 5px; - left: 10px; - } - span{ - position: absolute; - left: 41px; - } - } - .delete{ - color: rgba(245, 59, 59); - border: 0.5px solid rgba(245, 59, 59); - // background-color: red; - // color: white; - } - } - .rightbox{ - float: right; - width: 21%; - .inputbox{ - float: right; - width: 21%; - min-width: 165px; - max-width: 315px; - height: 30px; - // margin: 12px 8px 12px 0; - position: relative; - right: 100px; - border-radius: 33px; - padding-left: 15px; - padding-right: 54px; - background: #f1f2f4; - border-radius: 33px; - input{ - width: 100%; - height: 30px; - background: 0 0; - border: 0; - outline: 0; - line-height: 29px!important; - position: relative; - font-size: 12px; - } - .search{ - cursor: pointer; - position: absolute; - right: 5px; - top: 3px; - color: grey; - } - .cancel{ - cursor: pointer; - position: absolute; - right: 22px; - top: 5px; - color: #808080; - } - .cancel:hover{ - mat-icon{ - color: #808090; -; - } - - } - } - } - //进度条 - .progressBox{ - position: absolute; - display: inline-block; - width: 550px; - left: 480px; - } - .progress{ - position: absolute; - width: 350px; - top: 18px; - left: 160px; - } -} - - - - -.titlebox{ - height: 30px; - line-height: 30px; - padding-left: 18px; - padding-right: 18px; - span{ - font-size: 12px; - } - .titleleft{ - float: left; - .goBack{ - color: #09aaff; - } - .goBack:hover{ - cursor: pointer; - text-decoration: underline; - } - } - .titleright{ - float: right; - } -} -.mainbox{ -// overflow-y: auto; - table{ - td{ - img{ - position: relative; - width: 26px; - height: 26px; - top: 6px; - margin-right: 3px; - } - .filename:hover{ - cursor: pointer; - color: #09aaff; - } - } - } -} - -.btn{ - width: 100%; - text-align: center; - button{ - margin: 0 5px; - } -} -.font3d{ - font-size: 13px; - background-color: #2cbe4e; - display: inline-block; - font-weight: 600; - line-height: 20px; - color: #fff; - text-align: center; - white-space: nowrap; - border-radius: 3px; - box-sizing: border-box; -} - -//上传文件夹弹窗 -.fixedBox { - position: fixed; - bottom: 3%; - right: 3%; - width: 500px; -} -.nofiles{ - background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent; - padding-top: 150px; - width: 488px; - position: absolute; - left: 50%; - top: 50%; - text-align: center; - margin: -78px 0 0 -244px; -} -.openSystem{ - position: relative; - a{ - color: rgba(0, 0, 0, 0.87); - font-size: 14px; - display: block; - width: 100%; - height: 48px; - line-height: 48px; - border-bottom: 1px solid rgba(0, 0, 0, 0.12); - padding-left: 4%; - background-color: white; - img{ - position: relative; - width: 26px; - height: 26px; - top: 6px; - margin-right: 8px; - } - span{ - position: absolute; - right: 31.3%; - line-height: 48px; - font-size: 14px; - } - } - - -} \ No newline at end of file diff --git a/src/app/ui/all-file/all-file.component.spec.ts b/src/app/ui/all-file/all-file.component.spec.ts deleted file mode 100644 index b688763..0000000 --- a/src/app/ui/all-file/all-file.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { AllFileComponent } from './all-file.component'; - -describe('AllFileComponent', () => { - let component: AllFileComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AllFileComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(AllFileComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/all-file/all-file.component.ts b/src/app/ui/all-file/all-file.component.ts deleted file mode 100644 index de666fd..0000000 --- a/src/app/ui/all-file/all-file.component.ts +++ /dev/null @@ -1,918 +0,0 @@ -import { Component, OnInit,ViewChild ,Inject,NgZone } from '@angular/core'; -import { SelectionModel } from '@angular/cdk/collections'; -import {MatSort} from '@angular/material/sort'; -import {MatTableDataSource} from '@angular/material/table'; -import { HttpClient,HttpHeaders } from '@angular/common/http'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { IsLoginService } from '../../is-login.service'; -import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import {UploadFilesComponent} from '../upload-files/upload-files.component'; -import { ComponentServiceService } from '../../component-service.service'; -import { DomSanitizer } from "@angular/platform-browser"; -@Component({ - selector: 'app-all-file', - templateUrl: './all-file.component.html', - styleUrls: ['./all-file.component.scss'], -}) -export class AllFileComponent { - displayedColumns: string[] = ['select', 'name', 'weight', 'time']; - dataSource:any = new MatTableDataSource; - - constructor(private sanitizer: DomSanitizer,public emitService: ComponentServiceService,private http: HttpClient,public snackBar: MatSnackBar,public downloadFile:IsLoginService,public dialog: MatDialog,private zone: NgZone) { } - isCancel:boolean = false //搜索框的X是否显示 - searchData:any = "搜索您的文件" //搜索框内容 - isClickFile:boolean = false //是否点击过文件 - isOpenUpload:boolean = false //是否移入上传按钮 - isDelete:boolean = false //是否删除按钮 - isNoFileTitle:boolean = false //无文件时提示 - - - isAdmin:boolean = false //是否是管理员 - - selectedDataBank:string = '' //当前需要显示的资料库 - fileNum:any = 0 //当前资料库文件数量 - - selection = new SelectionModel(true, []); - @ViewChild(MatSort) sort: MatSort; - @ViewChild( 'child',{static: false} ) child:UploadFilesComponent //上传文件夹子组件 - - oldDataSource:any; //原始表格数据 - //表头排序 - sortData (e) { - let data = this.oldDataSource.concat(); - data.forEach(element => { - if(element.key.indexOf(".") != -1){ - let typeArr = element.key.split('.') - element.type = typeArr[typeArr.length - 1] - element.newTime = new Date(element.lastModified).getTime() - } - - }); - - if( e.direction=='asc' ) { //从小到大排序 - data.sort( function(a,b) { - return a.newTime - b.newTime - } ) - this.dataSource = new MatTableDataSource(data); - } else if ( e.direction=='desc' ) {//从大到小排序 - data.sort( function(a,b) { - return b.newTime - a.newTime - } ) - this.dataSource = new MatTableDataSource(data); - } else { //原始数据 - this.dataSource = new MatTableDataSource(this.oldDataSource); - } - } - - - roleType:any - aHrefUnsafe:any //战术授课a标签 去除unsafe标志 - ngOnInit(): void { - this.roleType = sessionStorage.getItem('roleType') - this.dataSource.sort = this.sort; - this.getALLFileList("支队级-主官") - - // 接收发射过来的数据 - this.emitService.eventEmit.subscribe((value: any) => { - this.getALLFileList(value) - this.selection.clear(); - }); - - if(sessionStorage.getItem("roleType") == "0"){ - this.isAdmin = true - } - } - aHrefUnsafeLearnFun(){ - this.roleType = sessionStorage.getItem('roleType') - let username = sessionStorage.getItem('username') - let expires = sessionStorage.getItem('expires') - let realName = sessionStorage.getItem('realName') - let roleType = sessionStorage.getItem('roleType') - let token = sessionStorage.getItem('token') - let refreshToken = sessionStorage.getItem('refreshToken') - let aHref = `ax://startup?username=${username}&token=${token}&refreshToken=${refreshToken}&expires=${expires}&realname=${realName}&roleType=${roleType}` - this.aHrefUnsafe = this.sanitizer.bypassSecurityTrustUrl(aHref); - return this.aHrefUnsafe - } - - //获得当前资料库的文件列表 - getALLFileList(name){ - this.selectedDataBank = name - let paramsdata = { - prefix : "allFiles/" + this.selectedDataBank + "/", - delimiter : "/" - } - this.http.get(`/api/Objects/drives`,{ - params:paramsdata - }).subscribe((data:any) => { - this.selection.clear() - data.contents.forEach((item)=>{ - let typeArr = item.key.split('.') - item.type = typeArr[typeArr.length - 1] - }) - if(name.split('/')[1] == "装备"){ - data.contents.unshift( - { key: "装备车辆/高喷车", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "gaopenche" - }, - { key: "装备车辆/登高平台车", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "denggao" - }, - { key: "装备车辆/机器人", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "jiqiren" - }, - { key: "装备车辆/空气呼吸器", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "konghuqi" - } - ) - } - if(name.split('/')[1] == "消防设施"){ - data.contents.unshift( - { key: "设备设施/外浮顶罐", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "waifu" - }, - { key: "设备设施/内浮顶罐", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "neifu" - }, - { key: "设备设施/拱顶罐", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "gong" - }, - { key: "设备设施/球罐", - lastModified: null, - eTag: null, - size: 0, - isDir: false, - type: "qiu" - } - ) - } - this.oldDataSource = data.contents //保存表格数据 - - this.dataSource = new MatTableDataSource(data.contents); - - this.fileNum = data.contents.length - if(data.contents.length == 0){ - this.isNoFileTitle = true - }else{ - this.isNoFileTitle = false - } - }) - } - - //判断是否全部选中 - isAllSelected() { - const numSelected = this.selection.selected.length; - const numRows = this.dataSource.data.length; - return numSelected === numRows; - } - - //控制全选按钮 - masterToggle() { - this.isAllSelected() ? this.selection.clear() : this.dataSource.data.forEach(row => this.selection.select(row)); - this.isAllSelected() ? this.isDelete = true : this.isDelete = false; - } - - //搜索框获得焦点事件 - searchfocus(e){ - this.isCancel = true - if(e.target.value == "搜索您的文件"){ - e.target.value = "" - } - } - - //搜索框失去焦点事件 - searchblur(e){ - if(e.target.value == ""){ - e.target.value = "搜索您的文件" - this.isCancel = false - } - } - - //搜索框点击X事件 - cancelbtn(){ - this.getALLFileList(this.selectedDataBank) - this.searchData = "搜索您的文件" - this.isCancel = false - } - - allFiles:any //搜索出来的全部文件 - checkedAllFiles:any = [] - //点击搜索 - search(){ - if(this.searchData != "搜索您的文件"){ - this.http.get("/api/Objects/drives",{ - params:{ - prefix : "allFiles", - delimiter : "" - } - }).subscribe((data:any)=>{ - this.allFiles = data.contents - this.allFiles.forEach(item=>{ - if(item.key.indexOf(this.searchData) != -1){ - this.checkedAllFiles.push(item) - } - }) - // console.log(888888,data.contents) - }, - err=>{ - - }) - } - } - - goback:any //记录上一级目录 - //点击列表每一条的名字 - clickName(e,item){ - e.stopPropagation() - if(item.type == "jpg" || item.type == "png" || item.type == "bmp"|| item.type == "gif" || item.type == "jpeg"&& !item.isDir){ - const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 - data: {url:item.key,type:"img"} - }); - - this.downloadFile.handleData(item.key,"查看") - }else if(item.type == "mp4" || item.type == "MP4" && !item.isDir){ - const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 - width: '1400px', - height:'800px', - data: {url:item.key,type:"video"} - }); - dialogRef.afterClosed().subscribe(); - this.downloadFile.handleData(item.key,"查看") - }else if(item.type == "mp3" || item.type == "MP3"&& !item.isDir){ - const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 - width: '400px', - height:'108px', - data: {url:item.key,type:"mp3"} - }); - dialogRef.afterClosed().subscribe(); - this.downloadFile.handleData(item.key,"查看") - }else if(item.type == "pdf" && item.size < 20971520){ - window.open("/api/Objects/drives/" + item.key) - this.downloadFile.handleData(item.key,"查看") - }else if(item.type == "pdf" && item.size > 20971520){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('暂不支持在线预览大于20M的pdf文件，请下载查看','确定',config) - }else if(item.type == "gaopenche"){ - - window.open("3dWidgets/GaoPenChe") - - }else if(item.type == "denggao"){ - - window.open("3dWidgets/denggaoche") - - }else if(item.type == "jiqiren"){ - - window.open("3dWidgets/jiqiren") - - }else if(item.type == "konghuqi"){ - - window.open("3dWidgets/konghuqi") - - }else if(item.type == "waifu"){ - - window.open("3dWidgets/waifudingguan") - - }else if(item.type == "neifu"){ - - window.open("3dWidgets/neifudingguan") - - }else if(item.type == "gong"){ - - window.open("3dWidgets/gongdingguan") - - }else if(item.type == "qiu"){ - - window.open("3dWidgets/qiuguan") - - }else if (item.isDir) { - //将allFiles后面的内容截取出来 - this.selectedDataBank = item.key.substring(9, item.key.length - 1) - this.getALLFileList(this.selectedDataBank) - }else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('该文件类型暂不支持在线查看，请下载查看','确定',config) - } - } - - //记录战术授课 - openteacher(){ - let key = `allFiles/${this.selectedDataBank}/战术授课/` - this.downloadFile.handleData(key,"进入") - } - //记录战术学习 - openlearn(){ - let key = `allFiles/${this.selectedDataBank}/战术学习/` - this.downloadFile.handleData(key,"进入") - } - //返回上一级目录 - backTominTop(){ - let topnum = this.gettoplist(this.selectedDataBank) - this.getALLFileList(topnum) - } - - //上级目录产生函数 - gettoplist(item){ - let list = item - let listArr = list.split("/") - let listresult = "" - for(let i = 0;i < listArr.length - 1;i++){ - listresult += listArr[i] + "/" - } - let listresult2 = listresult.substring(0, listresult.length - 1) - return listresult2 - } - - - //上传按钮鼠标移入 - uploadBtnEnter(){ - this.isOpenUpload = true - } - - //上传按钮鼠标移出 - uploadBtnLeave(){ - this.isOpenUpload = false - } - - //点击每条的checkbox - clickCheckBox(e){ - e.stopPropagation(); - setTimeout(() => { - if(this.selection.selected.length != 0){ - this.isDelete = true - } else{ - this.isDelete = false - } - }, 0); - } - - //点击每条的li - clickCheckBoxLi(e,row){ - this.selection.toggle(row) - setTimeout(() => { - if(this.selection.selected.length != 0){ - this.isDelete = true - } else{ - this.isDelete = false - } - }, 0); - } - - file:any //需要上传的文件 - //input file 选择文件 - selectFile (e) { - this.file = e.target.files[0] || null //上传的文件 - this.http.get(`/api/ObjectMetadata/drives/${this.selectedDataBank}/${this.file.name}`).subscribe( - data=>{ - var r = confirm(`已有同名文件，继续将替换该文件，是否替换？`); - if (r == true) { - this.startUploading() - } - }, - err => { - this.startUploading() - } - ) - } - - fileArr:any - //上传文件夹 - async selectFiles (e) { - this.fileArr = e.target.files || null //上传的文件 - this.uploadisLoading2 = true - this.child.handleData() //子组件处理数据格式 - let _this = this - for (var i = 0;i < this.fileArr.length; i++) { - let f = this.fileArr[i]; - let lastIndex = f.webkitRelativePath.lastIndexOf("/") - let url = f.webkitRelativePath.substring(0, lastIndex) - let adddress = this.selectedDataBank + "/" + url - let filesnum = _this.fileArr.length - - let result = await new Promise ((result,reject)=>{ - this.startUploading2(f,adddress,result,reject,filesnum,this.selectedDataBank) - }) - } - } - - //上传文件 - objectName2:any //上传对象名 - uploadisLoading2:boolean = false //上传进度条显示 - uploadProgress2:any - uploadId2:any; //上传分块上传事件编号 - filesTag2:any = [] //每上传成功一个文件就往里面加一个标识 - //e是上传的文件 selectedDataBank是需要上传的地址 包括 XXX资料库 + 文件夹路径 - startUploading2 (e,selectedDataBank,result,reject,filesnum,selectedDataBank2) { - let file = e || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - this.uploadisLoading2 = true - this.uploadProgress2 = 0 + "/" + filesnum - this.child.uploading(file) //子组件 当前文件正在上传 - - if (file && fileSize<=shardSize) { //上传文件<=5MB时 - - let formData = new FormData() - formData.append("file",file) - this.http.post(`/api/Objects/drives/allFiles/${selectedDataBank2}`,formData).subscribe((data:any)=>{ - this.objectName2 = data.objectName - this.filesTag2.push("data") - - this.zone.run(() => { - 　　setTimeout(() => this.uploadProgress2 = this.filesTag2.length + "/" + filesnum, 0); - }); - - result("成功了") - this.child.endUpload(file) //子组件 当前文件上传成功 - - if(this.filesTag2.length == filesnum){ - this.filesTag2 = [] //清空计数文件夹 - this.uploadProgress2 = filesnum + "/" + filesnum - this.uploadisLoading2 = false - this.child.delete() //清空上传文件夹子组件数据 - - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('文件夹全部上传完毕','确定',config) - // 当全部循环完毕重新加载列表 - this.getALLFileList(selectedDataBank2) - } - }) - } else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传 - let data = {fileName: file.name} - this.uploadisLoading2 = true - - this.http.post(`/api/NewMultipartUpload/drives/allFiles/${selectedDataBank}`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传 - this.objectName2 = data.objectName - this.uploadId2 = data.uploadId - this.subsectionUploading2(e,result,reject,filesnum,selectedDataBank2) - }) - } - - } - - PartNumberETag2:any=[]; //每次返回需要保存的信息 - //开始分段上传 - async subsectionUploading2 (e,result,reject,filesnum,selectedDataBank2) { - let file = e || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 - let _result = result - for (let i = 0;i < allSlice;i++) { //循环分段上传 - let start = i * shardSize //切割文件开始位置 - let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 - let formData = new FormData() - formData.append("file",file.slice(start, end)) - - //同步写法实现异步调用 - let result = await new Promise((resolve, reject) => { - // await 需要后面返回一个 promise 对象 - this.http.post(`/api/MultipartUpload/drives/${this.objectName2}?uploadId=${this.uploadId2}&partNumber=${i+1}`,formData).subscribe((data:any)=>{ - let msg = { - "partNumber":data.partNumber || null, - "eTag": data.eTag || null} - resolve(msg) // 调用 promise 内置方法处理成功 - }) - }); - this.PartNumberETag2.push(result) - if (this.PartNumberETag2.length === allSlice) { - this.endUploading2(e,_result,reject,filesnum,selectedDataBank2) - } - }//for循环 - } - - //完成分块上传 - endUploading2 (e,result,reject,filesnum,selectedDataBank2) { - let data = this.PartNumberETag2 - let paramsData = {uploadId:this.uploadId2} - - this.http.post(`/api/CompleteMultipartUpload/drives/${this.objectName2}`,data,{params:paramsData}).subscribe(data=>{ - - this.filesTag2.push("data") - this.zone.run(() => { - 　　setTimeout(() => this.uploadProgress2 = this.filesTag2.length + "/" + filesnum, 0); - }); - - result("成功了") - this.child.endUpload(e) //子组件 当前文件上传成功 - - if(this.filesTag2.length == filesnum){ - - this.uploadProgress2 = filesnum + "/" + filesnum - this.uploadisLoading2 = false - - this.filesTag2 = [] //清空计数文件夹 - this.child.delete() //清空上传文件夹子组件数据 - this.getALLFileList(selectedDataBank2) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('文件夹全部上传完毕','确定',config) - - } - - this.PartNumberETag2 =[] //清空保存返回的信息 - }) - } - - //取消分块上传 - cancel2 () { - this.http.delete(`/api/MultipartUpload/drives/${this.objectName2}?uploadId=${this.uploadId2}`).subscribe(data=>{ - this.uploadisLoading2= false - this.fileArr = {} - this.PartNumberETag2 =[] //清空保存返回的信息 - this.filesTag2 = [] //清空计数文件夹 - this.child.delete() //清空上传文件夹子组件数据 - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('取消上传成功!','确定',config); - }) - } - - //新建文件夹 - createFolder(){ - const dialogRef = this.dialog.open(FolderDialog); - dialogRef.afterClosed().subscribe((data)=>{ - if(data){ - //创建空文件夹 - this.http.post(`/api/Objects/drives/allFiles/${this.selectedDataBank}/${data.name}/`,{}).subscribe(data=>{ - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('新建文件夹成功','确定',config) - }) - } - }); - } - - //返回顶级目录 - backToTop () { - if (this.selectedDataBank.includes('/')) { - let arr = this.selectedDataBank.split('/') - this.selectedDataBank = arr[0] - this.getALLFileList(arr[0]) - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('目前已是一级目录','确定',config) - } - } - - //上传文件 - objectName:any //上传对象名 - uploadisLoading:boolean = false //上传进度条显示 - uploadProgress:any = 0 - uploadId:any; //上传分块上传事件编号 - startUploading () { - let file = this.file || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - - if (file && fileSize<=shardSize) { //上传文件<=5MB时 - let formData = new FormData() - formData.append("file",file) - this.http.post(`/api/Objects/drives/allFiles/${this.selectedDataBank}`,formData).subscribe((data:any)=>{ - this.objectName = data.objectName - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('上传成功','确定',config) - }) - } else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传 - let data = {fileName: file.name} - this.uploadisLoading = true - this.http.post(`/api/NewMultipartUpload/drives/allFiles/${this.selectedDataBank}`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传 - this.objectName = data.objectName - this.uploadId = data.uploadId - this.subsectionUploading() - }) - } - - } - - PartNumberETag:any=[]; //每次返回需要保存的信息 - //开始分段上传 - async subsectionUploading () { - let file = this.file || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 - - for (let i = 0;i < allSlice;i++) { //循环分段上传 - let start = i * shardSize //切割文件开始位置 - let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 - let formData = new FormData() - formData.append("file",file.slice(start, end)) - - //同步写法实现异步调用 - let result = await new Promise((resolve, reject) => { - // await 需要后面返回一个 promise 对象 - this.http.post(`/api/MultipartUpload/drives/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i+1}`,formData).subscribe((data:any)=>{ - let msg = { - "partNumber":data.partNumber || null, - "eTag": data.eTag || null} - resolve(msg) // 调用 promise 内置方法处理成功 - // console.log(2) - }) - }); - this.PartNumberETag.push(result) - this.uploadProgress = Number((i/allSlice).toFixed(2))*100 - - if (this.PartNumberETag.length === allSlice) { - this.uploadProgress = 100 - this.endUploading()} - }//for循环 - - } - - //完成分块上传 - endUploading () { - let data = this.PartNumberETag; - let paramsData = {uploadId:this.uploadId}; - this.http.post(`/api/CompleteMultipartUpload/drives/${this.objectName}`,data,{params:paramsData}).subscribe(data=>{ - // console.log(3) - this.getALLFileList(this.selectedDataBank); - this.uploadProgress = 0; - this.uploadisLoading = false; - this.PartNumberETag =[]; //清空保存返回的信息 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000; - this.snackBar.open('上传成功','确定',config); - }) - } - - //取消分块上传 - cancel () { - this.http.delete(`/api/MultipartUpload/drives/${this.objectName}?uploadId=${this.uploadId}`).subscribe(data=>{ - this.uploadProgress = 0; - this.uploadisLoading = false; - this.PartNumberETag = []; //清空保存返回的信息 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000; - this.snackBar.open('取消上传成功!','确定',config); - }) - } - - isTrueDelete:any = ['基础知识','装备','技战术','消防设施','资料库']; //匹配内置一级目录 是否被选择删除 - // 删除文件 - deleteFiles(){ - if (this.selection.selected.length != 0) { - let isDelete = confirm('您确定要删除选中文件吗') - let arr = [] - if (isDelete) { - let arrList = [] //匹配到 禁止删除的 目录 - this.selection.selected.forEach((element)=>{ - let data = element.key.split("/"); - - this.isTrueDelete.forEach(elements => { - if (elements==data[data.length-2] && data.length-2==2 && !data[data.length-1]) { - arrList.push('true') - } - }); - }) - if (arrList.length) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('内置文件夹不允许删除','确定',config); - } else { - this.selection.selected.forEach( async (element,index) => { - - let result = await new Promise((result,reject)=>{ - if(element.isDir){ //如果是文件夹 - let paramsdata:any = { - prefix : element.key, - recursive : true - } - this.http.delete(`/api/Objects/drives`,{ - params:paramsdata - }).subscribe(data=>{ - arr.push("删除成功了") - if (arr.length == this.selection.selected.length) { - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除文件成功','确定',config); - this.selection.clear() - this.isDelete = false - } - result(data) - }) - }else{ - this.http.delete(`/api/Objects/drives/${element.key}`).subscribe(data=>{ - arr.push("删除成功了") - if (arr.length == this.selection.selected.length) { - this.getALLFileList(this.selectedDataBank) - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除文件成功','确定',config); - this.selection.clear() - this.isDelete = false - } - result(data) - }) - } - - }) - - }); - - } // if arrList - - } - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择要删除的文件','确定',config); - } - } - - - // deleteFiles(){ - // if (this.selection.selected.length == 1) { - // let isDelete = confirm('您确定要删除吗') - // let arr = [] - // if (isDelete) { - // let item = this.selection.selected[0] - // if(item.isDir){//如果是文件夹 - // let paramsdata:any = { - // prefix : item.key, - // recursive : true - // } - // this.http.delete(`/api/Objects/drives`,{ - // params:paramsdata - // }).subscribe(data=>{ - // this.getALLFileList(this.selectedDataBank) - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('删除文件夹成功','确定',config); - // this.selection.clear() - // this.isDelete = false - // }) - // } - // else{ - // this.http.delete(`/api/Objects/drives/${item.key}`).subscribe(data=>{ - // this.getALLFileList(this.selectedDataBank) - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('删除文件成功','确定',config); - // this.selection.clear() - // this.isDelete = false - // }) - // } - // } - // } - // if (this.selection.selected.length == 0) { - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('请选择要删除的文件','确定',config); - // } - // if (this.selection.selected.length > 1) { - // const config = new MatSnackBarConfig(); - // config.verticalPosition = 'top'; - // config.duration = 3000 - // this.snackBar.open('暂不支持批量删除','确定',config); - // } - // } - - //下载↓ - selectDownloadFile:any; //选择下载的文件 - download:any; //下载文件元数据 - downloadisLoading:boolean = false; //进度条loading加载 - downloadProgress:number = 0; //进度条进度 - downLoadFile(){ - if (this.selection.selected.length === 1) { - this.selectDownloadFile = this.selection.selected[0] - if(this.selectDownloadFile.isDir){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('文件夹不支持下载','确定',config) - }else{ - this.http.get('/api/ObjectMetadata/drives/' + this.selectDownloadFile.key).subscribe(data=>{ - // console.log(123,data) - this.download = data - this.downloadFile.download(this.download) - }) - } - - } else if (this.selection.selected.length>1) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('暂时不支持批量下载','确定',config) - } else if (this.selection.selected.length == 0) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择要下载的文件','确定',config) - } - - } -} - - -//查看图片大图和视频 -@Component({ - selector: 'viewdetails', - templateUrl: './viewdetails.html', - styleUrls: ['./all-file.component.scss'] -}) -export class ViewDetails { - // myControl = new FormControl(); - //注入MatDialogRef，可以用来关闭对话框 - //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌 - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - Url:string - onNoClick(): void { - this.dialogRef.close(); - } - ngOnInit(): void { - this.Url = "/api/Objects/drives/" + this.data.url - } - closeDialog(){ - this.dialogRef.close(); - } - -} - - - -@Component({ - selector: 'folderdalog', - templateUrl: './folderdalog.html', - styleUrls: ['./all-file.component.scss'] -}) -export class FolderDialog { - - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - - newFolderName:string - - onNoClick(): void { - this.dialogRef.close(); - } - - ngOnInit(): void { - var myDate = new Date(); - var year = myDate.getFullYear(); - var month = myDate.getMonth(); - var day = myDate.getDate(); - var hour = myDate.getHours(); //获取当前小时数(0-23) - var minutes = myDate.getMinutes(); //获取当前分钟数(0-59) - var seconds = myDate.getSeconds(); //获取当前秒数(0-59) - var data = year + '' + month + day + hour + minutes + seconds - this.newFolderName = "新建文件夹_" + data; - } - - onSubmit(value){ - this.dialogRef.close(value); - } - -} \ No newline at end of file diff --git a/src/app/ui/all-file/folderdalog.html b/src/app/ui/all-file/folderdalog.html deleted file mode 100644 index 0716920..0000000 --- a/src/app/ui/all-file/folderdalog.html +++ /dev/null @@ -1,14 +0,0 @@ -
- - - - -
- - -
-
\ No newline at end of file diff --git a/src/app/ui/all-file/viewdetails.html b/src/app/ui/all-file/viewdetails.html deleted file mode 100644 index 5c25b7f..0000000 --- a/src/app/ui/all-file/viewdetails.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
- clear -
-
- - - - - -
-
\ No newline at end of file diff --git a/src/app/ui/create-exam/create-exam.component.html b/src/app/ui/create-exam/create-exam.component.html deleted file mode 100644 index a1b23b5..0000000 --- a/src/app/ui/create-exam/create-exam.component.html +++ /dev/null @@ -1,54 +0,0 @@ -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
试卷名称{{element.name}}考核中队{{element.organization}}开考时间{{element.startTime}}结束时间{{element.overTime}}考试状态 - - {{element.testState | testState}} - - 操作 - 编辑 - 详情 - 删除 -
- -
-
\ No newline at end of file diff --git a/src/app/ui/create-exam/create-exam.component.scss b/src/app/ui/create-exam/create-exam.component.scss deleted file mode 100644 index 41f3368..0000000 --- a/src/app/ui/create-exam/create-exam.component.scss +++ /dev/null @@ -1,52 +0,0 @@ -.box{ - width:100%; - height: 100%; - margin: 0 auto; - .createBtn{ - height: 60px; - line-height: 60px; - margin-bottom: 6px; - margin-left: 20px; - } - .tablebox{ - table{ - width: 100%; - } - - } -} -.mat-header-cell{ - text-align: center; -} -.mat-cell{ - text-align: center; - span{ - color: #0000BF; - margin: 0 3px; - cursor: pointer; - } - span:hover{ - text-decoration:underline - } - .grey{ - color: grey; - pointer-events: none; - } - .green{ - color: #70b603; - } - .red{ - color: #d9001b; - } -} - -.dialog{ - .title{ - h1{ - font-size: 25px; - font-weight: 900; - text-align: center; - } - - } -} \ No newline at end of file diff --git a/src/app/ui/create-exam/create-exam.component.spec.ts b/src/app/ui/create-exam/create-exam.component.spec.ts deleted file mode 100644 index ee0505e..0000000 --- a/src/app/ui/create-exam/create-exam.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { CreateExamComponent } from './create-exam.component'; - -describe('CreateExamComponent', () => { - let component: CreateExamComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ CreateExamComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(CreateExamComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/create-exam/create-exam.component.ts b/src/app/ui/create-exam/create-exam.component.ts deleted file mode 100644 index 388b4d2..0000000 --- a/src/app/ui/create-exam/create-exam.component.ts +++ /dev/null @@ -1,76 +0,0 @@ -import { Component, OnInit,Inject } from '@angular/core'; -import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import {FormControl} from '@angular/forms'; -const ELEMENT_DATA: any[] = [ - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'1'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'1'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'2'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'3'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'3'}, - {name: "富华酒店", organization: '浦东支队', startTime: "2020-09-19 10:00", overTime: '2020-09-19 12:00',testState:'3'}, -]; -@Component({ - selector: 'app-create-exam', - templateUrl: './create-exam.component.html', - styleUrls: ['./create-exam.component.scss'] -}) -export class CreateExamComponent implements OnInit { - - constructor(public dialog: MatDialog,public snackBar: MatSnackBar) { } - displayedColumns: string[] = ['name', 'organization', 'startTime', 'overTime', 'testState', 'operation']; - dataSource = ELEMENT_DATA; - ngOnInit(): void { - } - //新增考题弹出框 - createTest(){ - const dialogRef = this.dialog.open(CreateDialog, { - data: {} - }); - dialogRef.afterClosed().subscribe( - data=>{ - if(data){ - - } - } - ); - } -} - -// import getISOWeek from 'date-fns/getISOWeek'; -//创建组织 -@Component({ - selector: 'CreateDialog', - templateUrl: './createDialog.html', - styleUrls: ['./create-exam.component.scss'] -}) -export class CreateDialog { - myControl = new FormControl(); - constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data, - public snackBar: MatSnackBar) {} - - onNoClick(): void { - this.dialogRef.close(); - } - - onSubmit(value){ - } - date = null; - - onChange(result: Date[]): void { - console.log('onChange: ', result); - } - // getWeek(result: Date[]): void { - // console.log('week: ', result.map(getISOWeek)); - // } -} - - - - diff --git a/src/app/ui/create-exam/createDialog.html b/src/app/ui/create-exam/createDialog.html deleted file mode 100644 index e62e969..0000000 --- a/src/app/ui/create-exam/createDialog.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
-

试卷新增

-
-
- -
- 试卷名称 - -
- - -
- 考核中队 - -
-
- 考试时间 - -
- - -
- - -
- -
-
- diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.html b/src/app/ui/eharts-statistics/eharts-statistics.component.html deleted file mode 100644 index e2d13d1..0000000 --- a/src/app/ui/eharts-statistics/eharts-statistics.component.html +++ /dev/null @@ -1,40 +0,0 @@ -
- -
-
-
- -
- - -
- - - - -
- - -
-
- -
-
- -
-
- 暂无学习记录～ -
-
diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.scss b/src/app/ui/eharts-statistics/eharts-statistics.component.scss deleted file mode 100644 index b87f2e0..0000000 --- a/src/app/ui/eharts-statistics/eharts-statistics.component.scss +++ /dev/null @@ -1,50 +0,0 @@ -.content{ - width: 100%; - height: 93%; - display: flex; - flex-direction: column; -} - -.header { - padding: 10px; - box-sizing: border-box; - border-bottom: 1px solid #999; - .queryBox { - box-sizing: border-box; - padding: 5px 15px; - display: flex; - flex-direction: row; - flex-wrap: wrap; - align-items:center; - justify-content:center; - .queryField { - margin: 0 15px; - font-size: 14px; - input { - width: 180px; - height: 22px; - line-height: 22px; - } - } - .btnbox{ - float: right; - } - - } //queryBox -} - -.center { - flex: 1; - box-sizing: border-box; - padding: 10px; -} -.nofiles{ - background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent; - padding-top: 150px; - width: 488px; - position: absolute; - left: 50%; - top: 50%; - text-align: center; - margin: -96px 0 0 -244px; -} \ No newline at end of file diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.spec.ts b/src/app/ui/eharts-statistics/eharts-statistics.component.spec.ts deleted file mode 100644 index 31a3d7a..0000000 --- a/src/app/ui/eharts-statistics/eharts-statistics.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EhartsStatisticsComponent } from './eharts-statistics.component'; - -describe('EhartsStatisticsComponent', () => { - let component: EhartsStatisticsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EhartsStatisticsComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EhartsStatisticsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.ts b/src/app/ui/eharts-statistics/eharts-statistics.component.ts deleted file mode 100644 index 1c67a6c..0000000 --- a/src/app/ui/eharts-statistics/eharts-statistics.component.ts +++ /dev/null @@ -1,228 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; -import {MatDatepickerInputEvent} from '@angular/material/datepicker'; -import { HttpClient } from '@angular/common/http'; -import { FormControl } from '@angular/forms'; -import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; -import { ActivatedRoute, Router } from '@angular/router'; -declare var echarts : any; - -@Component({ - selector: 'app-eharts-statistics', - templateUrl: './eharts-statistics.component.html', - styleUrls: ['./eharts-statistics.component.scss'], -}) -export class EhartsStatisticsComponent implements OnInit { - - constructor(private adapter: DateAdapter,private http:HttpClient,public snackBar: MatSnackBar,private route:ActivatedRoute,private router:Router) { } - - ngOnInit(): void { - this.idCard = this.route.snapshot.queryParams.id || '' - this.idName = this.route.snapshot.queryParams.name || '' - this.adapter.setLocale('CH') - this.getList() - } - - ngAfterViewInit(): void { - - } - - startTime:any; //查询开始时间 - endTime:any; //查询结束时间 - oneMonthDate:number = 30*24*60*60*1000; //一个月的时间戳 - - echartsData:any = []; //图表数据 - - idCard:string; //用户身份证 - idName:string; //用户姓名 - - //初始化 + 重置 - getList () { - this.startTime = new FormControl( new Date((new Date(new Date().getTime()-this.oneMonthDate)).toLocaleDateString()) ) - this.endTime = new FormControl( new Date() ) - let msg = { - Name: this.idCard, - // StartTime: new Date(new Date().getTime()-this.oneMonthDate).toLocaleDateString(), - // EndTime: new Date().toLocaleDateString(), - } - this.http.get('/api/StudyRecords/Statistics',{params:msg}).subscribe((data:any)=>{ - this.echartsData = data - if (data.length) { - this.handleData(data) - } else { //数据为空时销毁图表 - let chartHynyxf = echarts.init(document.getElementById('center'), 'skinUpp'); - chartHynyxf.dispose(); - } - }) - } - - //查询 - query () { - let msg = { - Name: this.idCard, - StartTime: this.getTime(this.startTime.value), //开始时间 - EndTime: this.getTime(this.endTime.value), //结束时间 - } - this.http.get('/api/StudyRecords/Statistics',{params:msg}).subscribe((data:any)=>{ - this.echartsData = data - if (data.length) { - this.handleData(data) - } else { //数据为空时销毁图表 - let chartHynyxf = echarts.init(document.getElementById('center'), 'skinUpp'); - chartHynyxf.dispose(); - } - }) - } - - //查询全部详情 - queryAll () { - this.router.navigate(['/home/learningrecorddetails'],{queryParams:{'Catalog': '','id':this.idCard}}); - } - - //返回上一页 - goBack () { - history.go(-1) - } - - //处理时间 传入 new Date()格式 - getTime(date){ - let year = date.getFullYear(); //年 - let month = date.getMonth() + 1; //月 - let day = date.getDate(); //日 - let hour = date.getHours() //时 - let min = date.getMinutes(); //分 - let seconds = date.getSeconds(); //秒 - return year+'-'+month+'-'+ day + " "+ hour +':'+ min +':'+ seconds; - } - - //选择开始时间 - startEvent (e: MatDatepickerInputEvent) { - let nowTime = new Date() - if (nowTime < e.value) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('选择时间不能大于现在时间段','确定',config); - this.startTime = new FormControl( new Date(new Date().toLocaleDateString()) ) - } else { - this.startTime = new FormControl(e.value) - } - } - - //选择结束时间 - endEvent (e: MatDatepickerInputEvent) { - let oneDay:number = 86399000; //一天的毫秒数 - let selectDay = (e.value).toLocaleDateString() //选择的年月日 - let newDay = (new Date()).toLocaleDateString() //现在的年月日 - let nowTime = new Date() //现在的时间 - - if (nowTime < e.value && selectDay!=newDay) { //选择时间段大于现在时间段时 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('选择时间不能大于现在时间段','确定',config); - this.endTime = new FormControl( new Date() ) - } else if (nowTime > e.value && selectDay!=newDay) { //正常情况下 时间+1天 - this.endTime = new FormControl( new Date(e.value.getTime()+oneDay) ) - } else if ( selectDay == newDay ) { //选择时间段是今天时 - this.endTime = new FormControl( new Date() ) - } - } - - //处理图表数据 - handleData (data) { - let postNames = [] //y轴坐标 - let catalogs = [] //学习目标 - let counts = [] //统计次数 - let newData = data.sort( function (a,b) { - return b.count - a.count - } ) - newData.forEach(element => { - postNames.push(element.postName ? element.postName : '暂无数据') - catalogs.push(element.catalog ? element.catalog : '暂无数据') - counts.push(element.count ? element.count : 0) - }); - this.echartsInit(postNames,catalogs,counts) - } - - //图表初始化 - echartsInit (postNames,catalogs,counts) { - let that = this - let chartHynyxf = echarts.init(document.getElementById('center'), 'skinUpp'); - let option = { - title: { - text: that.idName, - left:45, - top:20 - }, - tooltip: { - trigger: 'axis', - axisPointer: {type: 'shadow'} - }, - grid: { - left: '3%', - right: '4%', - bottom: '3%', - containLabel: true - }, - xAxis: { - show: false, - type: 'value', - boundaryGap: [0, 0.01] - }, - yAxis: { - inverse: true, - "axisLine":{ //y轴 - "show":false - }, - "axisTick":{ //y轴刻度线 - "show":false, - }, - "splitLine": { //网格线 - "show": false - }, - type: 'category', - data: postNames, - max: 15 - }, - series: [ - { - type: 'bar', - data: counts, - barMinWidth: 10, // 最小宽度 - barMaxWidth: 30, // 最大宽度 - barCategoryGap: 5, - itemStyle:{ - normal:{ - color:'#40B4E8', - barBorderRadius:[10, 10, 10, 10], - label: { - formatter: function (e) { - return `${catalogs[e.dataIndex]}`+` (统计次数: ${e.value})` - }, - show: true, - position: 'insideLeft', - textStyle: { color: '#555'}, - fontSize: 14, - fontWeight: 550 - }, - }, - } //itemStyle - }, - - ] //series - - }; - - chartHynyxf.setOption(option); - - //柱状图点击事件 - chartHynyxf.on('click', function(e) { - that.router.navigate(['/home/learningrecorddetails'],{queryParams:{'Catalog':catalogs[e.dataIndex],'id':that.idCard,'PostName':e.name}}); - }); - - } - - - -} diff --git a/src/app/ui/enterpriseuser/addenterpriseuser.component.html b/src/app/ui/enterpriseuser/addenterpriseuser.component.html deleted file mode 100644 index 3c624ef..0000000 --- a/src/app/ui/enterpriseuser/addenterpriseuser.component.html +++ /dev/null @@ -1,49 +0,0 @@ -

创建用户

- -
- -
- - - - 请输入正确身份证号 - - -
- -
- - - -
- -
- - -
- {{item.name}} -
-
- {{item.name}} -
-
- {{item.name}} -
- - -
- - -
-

{{errmsg}}

-
- -
- - -
- -
\ No newline at end of file diff --git a/src/app/ui/enterpriseuser/addenterpriseuser.component.ts b/src/app/ui/enterpriseuser/addenterpriseuser.component.ts deleted file mode 100644 index e7aab20..0000000 --- a/src/app/ui/enterpriseuser/addenterpriseuser.component.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import {MatDialogRef} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; - -@Component({ - selector: 'addenterpriseuser', - templateUrl: './addenterpriseuser.component.html', - styleUrls: ['./enterpriseuser.component.scss'] - }) -export class AddEnterpriserUser { - - toppings = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,public snackBar: MatSnackBar) {} - errmsg:any; //捕获错误信息 - detachmentPosts: any = []//支队职务列表 - brigadePosts: any = []//大队职务列表 - RescueStationPosts: any = []//救援站职务列表 - ngOnInit(): void { - this.getAllPosts() - } - - //获得所有职务 - getAllPosts(){ - this.http.get("/api/Posts").subscribe( (data:any) =>{ - data.forEach(item => { - if(item.name.indexOf("支队级") != -1){ - this.detachmentPosts.push(item) - }else if(item.name.indexOf("大队级") != -1){ - this.brigadePosts.push(item) - }else{ - this.RescueStationPosts.push(item) - } - }); - }) - } - - - //提交创建表单 - onSubmit (e) { - let date = new Date() - let postsArr = this.toppings.value - let postsObj = [] - postsArr.forEach((item) => { - postsObj.push({id:item, name:""}) - }) - let body = { - name : e.idNumber, - realName : e.realName, - roleType : 2, - enabled : true, - creationTime : date, - posts : postsObj - } - this.http.post("/api/Users",body).subscribe( data => { - this.dialogRef.close(data); - },err => { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open(err,'确定',config); - }) - - } - -} \ No newline at end of file diff --git a/src/app/ui/enterpriseuser/editenterpriseuser.html b/src/app/ui/enterpriseuser/editenterpriseuser.html deleted file mode 100644 index 964e833..0000000 --- a/src/app/ui/enterpriseuser/editenterpriseuser.html +++ /dev/null @@ -1,46 +0,0 @@ -

编辑用户

- -
- -
- - - -
- -
- - - -
- -
- - -
- {{item.name}} -
-
- {{item.name}} -
-
- {{item.name}} -
- - -
- - -
-

{{errmsg}}

-
- -
- - -
- -
\ No newline at end of file diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.html b/src/app/ui/enterpriseuser/enterpriseuser.component.html deleted file mode 100644 index ca37553..0000000 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.html +++ /dev/null @@ -1,77 +0,0 @@ -
-
-
-
- -
- - -
-
- - -
-
- - -
-
- - -
-
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
用户姓名{{element.realName}}身份证号{{element.name}}消防救援站{{element.organizationName}}手机号{{element.phone}}创建时间{{element.creationTime | date:'yyyy-MM-dd'}}操作 - 重置密码 - 编辑 - 禁用 - 禁用 - 删除 -
- - - -
diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.scss b/src/app/ui/enterpriseuser/enterpriseuser.component.scss deleted file mode 100644 index 71c0551..0000000 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.scss +++ /dev/null @@ -1,54 +0,0 @@ -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:center; - .queryField { - margin: 0 25px; - font-size: 14px; - input { - width: 160px; - height: 34px; - line-height: 34px; - border-radius: 5px; - padding-left: 5px; - outline: none; - border: 1px solid rgb(226, 211, 211); - } - button { color: #fff; } - } - } //queryBox -} - -.operationSpan{ - margin: 0 10px; - .spanbtn { - font-weight: 550; - cursor: pointer; - } - .green{ color: #04ced1; } - .red{ color: #FF8678 } - .gray{ color: gray; } -} diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts b/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts deleted file mode 100644 index 044b696..0000000 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { EnterpriseuserComponent } from './enterpriseuser.component'; - -describe('EnterpriseuserComponent', () => { - let component: EnterpriseuserComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EnterpriseuserComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(EnterpriseuserComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.ts b/src/app/ui/enterpriseuser/enterpriseuser.component.ts deleted file mode 100644 index 6967c81..0000000 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.ts +++ /dev/null @@ -1,273 +0,0 @@ -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 { AddEnterpriserUser } from './addenterpriseuser.component' -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import {FormControl} from '@angular/forms'; -import { Router,ActivatedRoute } from '@angular/router' - -@Component({ - selector: 'app-enterpriseuser', - templateUrl: './enterpriseuser.component.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class EnterpriseuserComponent implements OnInit { - - constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private router:Router,private route:ActivatedRoute) { } - - ngOnInit() { - this.initData() - } - - displayedColumns: string[] = [ 'name','identitycard', 'post', 'tel', 'time', 'operation',]; - dataSource:any; //所有企业用户 - - name:any //姓名 - identityCard:any //身份证 - fireTeam:any; //消防救援站 - - //分页 - @ViewChild(MatPaginator, {static: true}) - pageEvent: PageEvent; - paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 - pageNumber:number = 1; //第几页 - - //分页切换 - chagePage (e) { - this.pageNumber = e.pageIndex+1 - let data= { - Name: this.identityCard || '', - RealName: this.name || '', - RoleType: '2', - PageNumber: String(this.pageNumber), - } - this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //页面初始化 + 查询 + 重置 - initData () { - let data= { - Name: this.identityCard || '', - RealName: this.name || '', - RoleType: '2', - } - this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.pageEvent.pageIndex = 0 - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //更新当前页数据 - getAllUsers () { - let data= { - Name: this.identityCard || '', - RealName: this.name || '', - RoleType: '2', - PageNumber: String(this.pageNumber), - } - this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //清空搜索 - empty () { - this.identityCard = '' - this.name = '' - this.initData() - } - - //创建用户 - open(){ - let dialogRef = this.dialog.open(AddEnterpriserUser, {//调用open方法打开对话框并且携带参数过去 - width: '250px', - }); - dialogRef.afterClosed().subscribe(data=>{ - if (data) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('创建成功!','确定',config); - this.getAllUsers() - } - }); - } - - //编辑企业用户 - edit (e) { - let dialogRef = this.dialog.open(editenterpriseuser,{ - width: '250px', - data:e - }); - dialogRef.afterClosed().subscribe(data=>{ - if (data) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('修改成功!','确定',config); - this.getAllUsers() - } - }); - } - - //重置密码 - reset (e) { - this.http.put(`/api/ExamUsers/${e.name}/ResetPassword`,{}).subscribe( - data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('重置密码成功!','确定',config); - },err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('重置密码失败!','确定',config); - }) - } - - //启用 - enabled (e) { - let date = new Date() - let body = { - name : e.name, - realName : e.realName, - roleType : e.roleType, - enabled : true, - creationTime : date, - posts : e.posts - } - this.http.put(`/api/ExamUsers/${e.name}`,body).subscribe(data => { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000; - this.snackBar.open('启用成功!','确定',config); - this.getAllUsers(); - }) - } - - //禁用 - noEnabled (e) { - let date = new Date() - let body = { - name : e.name, - realName : e.realName, - roleType : e.roleType, - enabled : false, - creationTime : date, - posts : e.posts - } - this.http.put(`/api/ExamUsers/${e.name}`,body).subscribe(data => { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000; - this.snackBar.open('禁用成功!','确定',config); - this.getAllUsers(); - }) - } - - //删除 - delete (e) { - let isTrue = confirm('您确定要删除吗') - if (isTrue) { - this.http.delete(`/api/ExamUsers/${e.name}`).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除成功!','确定',config); - this.getAllUsers() - }) - } - } - - - -} - - - -//编辑企业用户 -@Component({ - selector: 'app-editenterpriseuser', - templateUrl: './editenterpriseuser.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class editenterpriseuser { - - toppings:any = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - errmsg:any; //捕获错误信息 - detachmentPosts: any = []//支队职务列表 - brigadePosts: any = []//大队职务列表 - RescueStationPosts: any = []//救援站职务列表 - - IdNumber:any //身份证号 - realName:any //真实姓名 - ngOnInit(): void { - this.toppings.value = [] - this.IdNumber = this.data.name - this.realName = this.data.realName - this.data.posts.forEach((item) => { - this.toppings.value.push(item.id) - }) - } - - //获得所有职务 - getAllPosts(){ - - } - - - //提交创建表单 - onSubmit (e) { - let date = new Date() - let postsArr = this.toppings.value - let postsObj = [] - postsArr.forEach((item) => { - postsObj.push({id:item, name:""}) - }) - let body = { - name : this.data.name, - realName : e.realName, - roleType : 2, - enabled : this.data.enabled, - creationTime : date, - posts : postsObj - } - this.http.put(`/api/ExamUsers/${this.data.name}`,body).subscribe(data => { - this.dialogRef.close("修改成功"); - }) - } - -} - - - -//查看企业用户 -@Component({ - selector: 'app-seeenterpriseuser', - templateUrl: './seeenterpriseuser.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class seeenterpriseuser { - - constructor(public http: HttpClient,public dialog: MatDialog, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit() {} - -} \ No newline at end of file diff --git a/src/app/ui/enterpriseuser/seeenterpriseuser.html b/src/app/ui/enterpriseuser/seeenterpriseuser.html deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/join-exam/join-exam.component.html b/src/app/ui/join-exam/join-exam.component.html deleted file mode 100644 index cea0332..0000000 --- a/src/app/ui/join-exam/join-exam.component.html +++ /dev/null @@ -1 +0,0 @@ -

参加考试!

diff --git a/src/app/ui/join-exam/join-exam.component.scss b/src/app/ui/join-exam/join-exam.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/join-exam/join-exam.component.spec.ts b/src/app/ui/join-exam/join-exam.component.spec.ts deleted file mode 100644 index 2251bd3..0000000 --- a/src/app/ui/join-exam/join-exam.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { JoinExamComponent } from './join-exam.component'; - -describe('JoinExamComponent', () => { - let component: JoinExamComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ JoinExamComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(JoinExamComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/join-exam/join-exam.component.ts b/src/app/ui/join-exam/join-exam.component.ts deleted file mode 100644 index c810b48..0000000 --- a/src/app/ui/join-exam/join-exam.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-join-exam', - templateUrl: './join-exam.component.html', - styleUrls: ['./join-exam.component.scss'] -}) -export class JoinExamComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/ui/learning-record-details/learning-record-details.component.html b/src/app/ui/learning-record-details/learning-record-details.component.html deleted file mode 100644 index a45b7b6..0000000 --- a/src/app/ui/learning-record-details/learning-record-details.component.html +++ /dev/null @@ -1,49 +0,0 @@ - -
-
-
- -
-
- -
-
- - -
-
- -
-
    -
  • -

    {{item.time}}

    - - {{item.time2}} - {{item.operation}} : {{item.target | name3}} - - -
    • -
- - -
-
- 该时间段未查询到学习记录～ -
-
diff --git a/src/app/ui/learning-record-details/learning-record-details.component.scss b/src/app/ui/learning-record-details/learning-record-details.component.scss deleted file mode 100644 index e2cb681..0000000 --- a/src/app/ui/learning-record-details/learning-record-details.component.scss +++ /dev/null @@ -1,57 +0,0 @@ -.topbox{ - display: flex; - width: 100%; - height:7%; - line-height: 66px; - // border-bottom: 1px solid gray; - justify-content: space-around; - .datasearch{ - display: flex; - div{ - margin: 0 10px; - span{ - margin-right: 5px; - } - mat-form-field{ - input{ - padding-left: 3px; - } - } - - } - } - .btnbox{ - button{ - margin: 0 10px; - } - } -} -.listbox{ - margin-top: 18px; - margin-left: 26%; - height: 84%; - overflow-y: auto; - .timeTitle{ - font-weight: 800; - font-size: 18px; - } - .listitem{ - margin-left: 80px; - font-size: 16px; - line-height: 30px; - } -} -.mat-paginator { - background-color: hsla(0,0%,100%,0); - padding-right: 10%; -} -.nofiles{ - background: url("../../../assets/images/nofiles.png") no-repeat scroll center 0 transparent; - padding-top: 150px; - width: 488px; - position: absolute; - left: 50%; - top: 50%; - text-align: center; - margin: -88px 0 0 -244px; -} \ No newline at end of file diff --git a/src/app/ui/learning-record-details/learning-record-details.component.ts b/src/app/ui/learning-record-details/learning-record-details.component.ts deleted file mode 100644 index f7673c6..0000000 --- a/src/app/ui/learning-record-details/learning-record-details.component.ts +++ /dev/null @@ -1,188 +0,0 @@ -import { Component, OnInit ,ViewChild} from '@angular/core'; -import {DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE} from '@angular/material/core'; -import {MatDatepicker} from '@angular/material/datepicker'; -import {FormControl} from '@angular/forms'; -import {HttpClient} from '@angular/common/http'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { MatPaginator } from '@angular/material/paginator'; -import { PageEvent } from '@angular/material/paginator'; -import { Router,ActivatedRoute } from '@angular/router' -@Component({ - selector: 'app-learning-record-details', - templateUrl: './learning-record-details.component.html', - styleUrls: ['./learning-record-details.component.scss'] -}) -export class LearningRecordDetailsComponent implements OnInit { - startdate:any //开始时间 - enddate:any //结束时间 - constructor(private adapter: DateAdapter,private http:HttpClient,public snackBar: MatSnackBar,private router:Router,private route:ActivatedRoute) { } - - lastdate:any //上个月日期 - - startTime:any //开始时间查询条件 - endTime:any //结束时间查询条件 - - Catalog:any = this.route.snapshot.queryParams.Catalog || "" //目录 - - PageNumber:any = 1//当前页数 - id:any = this.route.snapshot.queryParams.id//身份证 - PostName:any = this.route.snapshot.queryParams.PostName || "" //传过来的职务名称 - - recordList:any = false//渲染的100条列表 - oneMonthDate:number = 30*24*60*60*1000; //一个月的时间戳 - - - noRecord:boolean - //分页 - @ViewChild(MatPaginator, {static: true}) - pageEvent: PageEvent; - paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 - // pageSizeOptions: number[] = [10] //设置每页条数 - pageNumber:number = 1; //第几页 - - ngOnInit(): void { - this.adapter.setLocale('CH'); - - let nowdate = new Date().toLocaleDateString() //本月日期 2020/07/11 形式 - this.lastdate = new Date(new Date().getTime()-this.oneMonthDate).toLocaleDateString() //上个月日期 2020/06/11 形式 - - this.startdate = new FormControl(new Date(this.lastdate)); //日历开始时间显示 - this.enddate = new FormControl(new Date()); //日历结束时间显示 - - this.startTime = this.getTIme(new Date(this.lastdate)) - this.endTime = this.getTIme(new Date()) - - this.getAllStudyRecords() - } - - - //分页切换 - chagePage (e) { - this.pageNumber = e.pageIndex+1 - let date:any = new Date() - let data = { - Name : this.id, - StartTime : this.startTime, - EndTime : this.endTime, - Catalog : this.Catalog, - PageNumber : String(this.pageNumber), - PageSize:"100", - PostName : this.PostName - } - this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => { - this.recordList = data.items - if(data.items.length == 0){ - this.noRecord = true - }else{ - this.noRecord = false - } - this.recordList.forEach((item) => { - item.time = item.creationTime.substring(0,10) - item.time2 = item.creationTime.substring(11,16) - }) - this.length = data.totalCount - this.pageSize = data.pageSize - }) - } - - //传入 new Date()格式 将日期变为 年月日时分秒 - getTIme(date){ - let year = date.getFullYear(); //年 - let month = date.getMonth() + 1; //月 - let day = date.getDate(); //日 - let hour = date.getHours() //时 - let min = date.getMinutes(); //分 - let seconds = date.getSeconds(); //秒 - return year+'-'+month+'-'+ day + " "+ hour +':'+ min +':'+ seconds; - } - - //初始获得所有学习记录 - getAllStudyRecords(){ - let date:any = new Date() - let data = { - Name : this.id, - Catalog : this.Catalog || "", - PageNumber : this.PageNumber, - PageSize:"100", - PostName:this.PostName - } - this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => { - this.recordList = data.items - if(data.items.length == 0){ - this.noRecord = true - }else{ - this.noRecord = false - } - this.recordList.forEach((item) => { - item.time = item.creationTime.substring(0,10) - item.time2 = item.creationTime.substring(11,16) - }) - this.length = data.totalCount - this.pageSize = data.pageSize - this.pageEvent.pageIndex = 0 - }) - } - - //返回上一页 - backtop(){ - history.go(-1) - } - //带查询时间获得所有学习记录 - getAllStudyRecords2(){ - let date:any = new Date() - let data = { - Name : this.id, - StartTime : this.startTime, - EndTime : this.endTime, - Catalog : this.Catalog || "", - PageNumber : this.PageNumber, - PageSize:"100", - PostName:this.PostName - } - this.http.get("/api/StudyRecords",{params:data}).subscribe((data:any) => { - this.recordList = data.items - if(data.items.length == 0){ - this.noRecord = true - }else{ - this.noRecord = false - } - this.recordList.forEach((item) => { - item.time = item.creationTime.substring(0,10) - item.time2 = item.creationTime.substring(11,16) - }) - this.length = data.totalCount - this.pageSize = data.pageSize - this.pageEvent.pageIndex = 0 - }) - } - - // - //查询 - onSubmit(){ - if(this.startdate.value > this.enddate.value){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('起始时间大于结束时间','确定',config); - } - if(this.enddate.value.toLocaleDateString() == new Date().toLocaleDateString() || this.enddate.value > new Date()){ - this.enddate.value = new Date() - } - if(this.enddate.value < new Date() && this.enddate.value.toLocaleDateString() != new Date().toLocaleDateString()){ - this.enddate.value = new Date(this.enddate.value.getTime() + 24*60*60*1000) - } - this.startTime = this.getTIme(this.startdate.value) - this.endTime = this.getTIme(this.enddate.value) - this.getAllStudyRecords2() - } - //重置 - reset(){ - this.startdate = new FormControl(new Date(this.lastdate)); //日历开始时间显示 - this.enddate = new FormControl(new Date()); //日历结束时间显示 - this.startTime = this.getTIme(this.startdate.value) - this.endTime = this.getTIme(this.enddate.value) - this.getAllStudyRecords() - } -} diff --git a/src/app/ui/look-over-test/look-over-test.component.html b/src/app/ui/look-over-test/look-over-test.component.html deleted file mode 100644 index 005547d..0000000 --- a/src/app/ui/look-over-test/look-over-test.component.html +++ /dev/null @@ -1 +0,0 @@ -

阅卷

diff --git a/src/app/ui/look-over-test/look-over-test.component.scss b/src/app/ui/look-over-test/look-over-test.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/look-over-test/look-over-test.component.spec.ts b/src/app/ui/look-over-test/look-over-test.component.spec.ts deleted file mode 100644 index 4f8e6f1..0000000 --- a/src/app/ui/look-over-test/look-over-test.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { LookOverTestComponent } from './look-over-test.component'; - -describe('LookOverTestComponent', () => { - let component: LookOverTestComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ LookOverTestComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(LookOverTestComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/look-over-test/look-over-test.component.ts b/src/app/ui/look-over-test/look-over-test.component.ts deleted file mode 100644 index c8f533d..0000000 --- a/src/app/ui/look-over-test/look-over-test.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-look-over-test', - templateUrl: './look-over-test.component.html', - styleUrls: ['./look-over-test.component.scss'] -}) -export class LookOverTestComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/ui/statistic-analysis/statistic-analysis.component.html b/src/app/ui/statistic-analysis/statistic-analysis.component.html deleted file mode 100644 index a7d82c5..0000000 --- a/src/app/ui/statistic-analysis/statistic-analysis.component.html +++ /dev/null @@ -1 +0,0 @@ -

统计分析

diff --git a/src/app/ui/statistic-analysis/statistic-analysis.component.scss b/src/app/ui/statistic-analysis/statistic-analysis.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/statistic-analysis/statistic-analysis.component.spec.ts b/src/app/ui/statistic-analysis/statistic-analysis.component.spec.ts deleted file mode 100644 index d6c86c5..0000000 --- a/src/app/ui/statistic-analysis/statistic-analysis.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { StatisticAnalysisComponent } from './statistic-analysis.component'; - -describe('StatisticAnalysisComponent', () => { - let component: StatisticAnalysisComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ StatisticAnalysisComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(StatisticAnalysisComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/statistic-analysis/statistic-analysis.component.ts b/src/app/ui/statistic-analysis/statistic-analysis.component.ts deleted file mode 100644 index c17eb42..0000000 --- a/src/app/ui/statistic-analysis/statistic-analysis.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-statistic-analysis', - templateUrl: './statistic-analysis.component.html', - styleUrls: ['./statistic-analysis.component.scss'] -}) -export class StatisticAnalysisComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/ui/teacherManagement/addenterpriseuser.component.html b/src/app/ui/teacherManagement/addenterpriseuser.component.html deleted file mode 100644 index 36be501..0000000 --- a/src/app/ui/teacherManagement/addenterpriseuser.component.html +++ /dev/null @@ -1,49 +0,0 @@ -

创建教员

- -
- -
- - - - 帐号格式为字母+数字 - - -
- -
- - - -
- -
- - -
- {{item.name}} -
-
- {{item.name}} -
-
- {{item.name}} -
- - -
- - -
-

{{errmsg}}

-
- -
- - -
- -
\ No newline at end of file diff --git a/src/app/ui/teacherManagement/addenterpriseuser.component.ts b/src/app/ui/teacherManagement/addenterpriseuser.component.ts deleted file mode 100644 index c4d6c72..0000000 --- a/src/app/ui/teacherManagement/addenterpriseuser.component.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { Component, OnInit, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http'; -import {MatDialogRef} from '@angular/material/dialog'; -import {FormControl} from '@angular/forms'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; - -@Component({ - selector: 'addenterpriseuser', - templateUrl: './addenterpriseuser.component.html', - styleUrls: ['./enterpriseuser.component.scss'] - }) -export class AddTeacher { - - toppings = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,public snackBar: MatSnackBar) {} - errmsg:any; //捕获错误信息 - detachmentPosts: any = []//支队职务列表 - brigadePosts: any = []//大队职务列表 - RescueStationPosts: any = []//救援站职务列表 - ngOnInit(): void { - this.getAllPosts() - } - - //获得所有职务 - getAllPosts(){ - this.http.get("/api/Posts").subscribe( (data:any) =>{ - data.forEach(item => { - if(item.name.indexOf("支队级") != -1){ - this.detachmentPosts.push(item) - }else if(item.name.indexOf("大队级") != -1){ - this.brigadePosts.push(item) - }else{ - this.RescueStationPosts.push(item) - } - }); - }) - } - - - //提交创建表单 - onSubmit (e) { - let date = new Date() - let postsArr = this.toppings.value - let postsObj = [] - postsArr.forEach((item) => { - postsObj.push({id:item, name:""}) - }) - let body = { - name : e.idNumber, - realName : e.realName, - roleType : 1, - enabled : true, - creationTime : date, - posts : postsObj - } - this.http.post("/api/Users",body).subscribe( data => { - this.dialogRef.close(data); - },err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open(err,'确定',config); - }) - - } - -} \ No newline at end of file diff --git a/src/app/ui/teacherManagement/editenterpriseuser.html b/src/app/ui/teacherManagement/editenterpriseuser.html deleted file mode 100644 index 013cd42..0000000 --- a/src/app/ui/teacherManagement/editenterpriseuser.html +++ /dev/null @@ -1,46 +0,0 @@ -

编辑教员

- -
- -
- - - -
- -
- - - -
- -
- - -
- {{item.name}} -
-
- {{item.name}} -
-
- {{item.name}} -
- - -
- - -
-

{{errmsg}}

-
- -
- - -
- -
\ No newline at end of file diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.html b/src/app/ui/teacherManagement/enterpriseuser.component.html deleted file mode 100644 index b2f662d..0000000 --- a/src/app/ui/teacherManagement/enterpriseuser.component.html +++ /dev/null @@ -1,72 +0,0 @@ -
-
-
-
- -
- - -
-
- - -
-
- - -
-
- - -
-
- -
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
用户帐号{{element.name}}用户姓名{{element.realName}}消防救援站{{element.organizationName}}创建时间{{element.creationTime | date:'yyyy-MM-dd'}}操作 - 重置密码 - 编辑 - 禁用 - 禁用 - 删除 -
- - - -
diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.scss b/src/app/ui/teacherManagement/enterpriseuser.component.scss deleted file mode 100644 index 71c0551..0000000 --- a/src/app/ui/teacherManagement/enterpriseuser.component.scss +++ /dev/null @@ -1,54 +0,0 @@ -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:center; - .queryField { - margin: 0 25px; - font-size: 14px; - input { - width: 160px; - height: 34px; - line-height: 34px; - border-radius: 5px; - padding-left: 5px; - outline: none; - border: 1px solid rgb(226, 211, 211); - } - button { color: #fff; } - } - } //queryBox -} - -.operationSpan{ - margin: 0 10px; - .spanbtn { - font-weight: 550; - cursor: pointer; - } - .green{ color: #04ced1; } - .red{ color: #FF8678 } - .gray{ color: gray; } -} diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.ts b/src/app/ui/teacherManagement/enterpriseuser.component.ts deleted file mode 100644 index 1da79e2..0000000 --- a/src/app/ui/teacherManagement/enterpriseuser.component.ts +++ /dev/null @@ -1,272 +0,0 @@ -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 { AddTeacher } from './addenterpriseuser.component' -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import {FormControl} from '@angular/forms'; - -@Component({ - selector: 'app-enterpriseuser', - templateUrl: './enterpriseuser.component.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class TeacherManagementComponent implements OnInit { - - constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } - - ngOnInit() { - this.initData() - } - - displayedColumns: string[] = ['identitycard', 'name', 'post', 'time', 'operation',]; - dataSource:any; //所有企业用户 - - name:any //用户姓名 - identityCard:any //用户账号 - fireTeam:any; //消防救援站 - - //分页 - @ViewChild(MatPaginator, {static: true}) - pageEvent: PageEvent; - paginator: MatPaginator; - length:any; //共多少条数据 - pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 - pageNumber:number = 1; //第几页 - - //分页切换 - chagePage (e) { - this.pageNumber = e.pageIndex+1 - let data= { - Name: this.identityCard || '', - RealName: this.name || '', - RoleType: '1', - PageNumber: String(this.pageNumber), - } - this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //页面初始化 + 查询 + 重置 - initData () { - let data= { - Name: this.identityCard || '', - RealName: this.name || '', - RoleType: '1', - } - this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.pageEvent.pageIndex = 0 - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //更新当前页数据 - getAllUsers () { - let data= { - Name: this.identityCard || '', - RealName: this.name || '', - RoleType: '1', - PageNumber: String(this.pageNumber), - } - this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ - this.length = data.totalCount - this.pageSize = data.pageSize - this.dataSource = new MatTableDataSource(data.items) - }) - } - - //清空搜索 - empty () { - this.identityCard = '' - this.name = '' - this.initData() - } - - //创建教员 - open(){ - let dialogRef = this.dialog.open(AddTeacher, {//调用open方法打开对话框并且携带参数过去 - width: '250px', - }); - dialogRef.afterClosed().subscribe(data=>{ - if (data) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('创建成功!','确定',config); - this.getAllUsers() - } - }); - } - - //编辑企业用户 - edit (e) { - let dialogRef = this.dialog.open(editTeacher,{ - width: '250px', - data:e - }); - dialogRef.afterClosed().subscribe(data=>{ - if (data) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('修改成功!','确定',config); - this.getAllUsers() - } - }); - } - - //重置密码 - reset (e) { - this.http.put(`/api/ExamUsers/${e.name}/ResetPassword`,{}).subscribe( - data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('重置密码成功!','确定',config); - },err=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('重置密码失败!','确定',config); - }) - } - - //启用 - enabled (e) { - let date = new Date() - let body = { - name : e.name, - realName : e.realName, - roleType : e.roleType, - enabled : true, - creationTime : date, - posts : e.posts - } - this.http.put(`/api/ExamUsers/${e.name}`,body).subscribe(data => { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000; - this.snackBar.open('启用成功!','确定',config); - this.getAllUsers(); - }) - } - - //禁用 - noEnabled (e) { - let date = new Date() - let body = { - name : e.name, - realName : e.realName, - roleType : e.roleType, - enabled : false, - creationTime : date, - posts : e.posts - } - this.http.put(`/api/ExamUsers/${e.name}`,body).subscribe(data => { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000; - this.snackBar.open('禁用成功!','确定',config); - this.getAllUsers(); - }) - } - - //删除 - delete (e) { - let isTrue = confirm('您确定要删除吗') - if (isTrue) { - this.http.delete(`/api/ExamUsers/${e.name}`).subscribe(data=>{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('删除成功!','确定',config); - this.getAllUsers() - }) - } - } - - - -} - - - -//编辑企业用户 -@Component({ - selector: 'app-editenterpriseuser', - templateUrl: './editenterpriseuser.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class editTeacher { - - toppings:any = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} - errmsg:any; //捕获错误信息 - detachmentPosts: any = []//支队职务列表 - brigadePosts: any = []//大队职务列表 - RescueStationPosts: any = []//救援站职务列表 - - IdNumber:any //身份证号 - realName:any //真实姓名 - ngOnInit(): void { - this.toppings.value = [] - this.IdNumber = this.data.name - this.realName = this.data.realName - this.data.posts.forEach((item) => { - this.toppings.value.push(item.id) - }) - } - - //获得所有职务 - getAllPosts(){ - - } - - - //提交创建表单 - onSubmit (e) { - let date = new Date() - let postsArr = this.toppings.value - let postsObj = [] - postsArr.forEach((item) => { - postsObj.push({id:item, name:""}) - }) - let body = { - name : this.data.name, - realName : e.realName, - roleType : 1, - enabled : this.data.enabled, - creationTime : date, - posts : postsObj - } - this.http.put(`/api/ExamUsers/${this.data.name}`,body).subscribe(data => { - this.dialogRef.close("修改成功"); - }) - } - -} - - - -//查看企业用户 -@Component({ - selector: 'app-seeenterpriseuser', - templateUrl: './seeenterpriseuser.html', - styleUrls: ['./enterpriseuser.component.scss'] -}) -export class seeTeacher { - - constructor(public http: HttpClient,public dialog: MatDialog, - @Inject(MAT_DIALOG_DATA) public data) { } - - ngOnInit() {} - -} \ No newline at end of file diff --git a/src/app/ui/teacherManagement/seeenterpriseuser.html b/src/app/ui/teacherManagement/seeenterpriseuser.html deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/test-records/test-records.component.html b/src/app/ui/test-records/test-records.component.html deleted file mode 100644 index 3d127cf..0000000 --- a/src/app/ui/test-records/test-records.component.html +++ /dev/null @@ -1 +0,0 @@ -

考试记录!

diff --git a/src/app/ui/test-records/test-records.component.scss b/src/app/ui/test-records/test-records.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/ui/test-records/test-records.component.spec.ts b/src/app/ui/test-records/test-records.component.spec.ts deleted file mode 100644 index 9402a33..0000000 --- a/src/app/ui/test-records/test-records.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { TestRecordsComponent } from './test-records.component'; - -describe('TestRecordsComponent', () => { - let component: TestRecordsComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ TestRecordsComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TestRecordsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/test-records/test-records.component.ts b/src/app/ui/test-records/test-records.component.ts deleted file mode 100644 index 42d5a50..0000000 --- a/src/app/ui/test-records/test-records.component.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-test-records', - templateUrl: './test-records.component.html', - styleUrls: ['./test-records.component.scss'] -}) -export class TestRecordsComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - } - -} diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 003f889..811a429 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -1,25 +1,7 @@ import { Routes, RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; -import { AllFileComponent } from './all-file/all-file.component'; -import { EnterpriseuserComponent } from './enterpriseuser/enterpriseuser.component'; -import { TeacherManagementComponent } from './teacherManagement/enterpriseuser.component'; -import {EhartsStatisticsComponent} from './eharts-statistics/eharts-statistics.component' -import { LearningRecordDetailsComponent } from './learning-record-details/learning-record-details.component'; -import { CreateExamComponent } from './create-exam/create-exam.component'; -import { LookOverTestComponent } from './look-over-test/look-over-test.component'; -import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; -import { JoinExamComponent } from './join-exam/join-exam.component'; -import { TestRecordsComponent } from './test-records/test-records.component'; const routes: Routes = [ - { path: '', component:CreateExamComponent }, - { path: 'createexam', component:CreateExamComponent }, - { path: 'looktest', component:LookOverTestComponent }, - { path: 'statisticAnalysis', component:StatisticAnalysisComponent }, - { path: 'joinExam', component:JoinExamComponent }, - { path: 'testRecords', component:TestRecordsComponent }, - { path: 'teachear', component:TeacherManagementComponent }, //管理员 教员页面 - { path: 'examinee', component:EnterpriseuserComponent }, //管理员 考生页面 ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index c2d4739..cb6fa9d 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -45,25 +45,12 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatPaginatorIntl } from '@angular/material/paginator'; import { ChangepasswordComponent } from './changepassword/changepassword.component'; -import { SizePipe , NamePipe,NamePipe2, NamePipe3, testState} from '../pipes/size.pipe'; +import { NamePipe,NamePipe2, NamePipe3, testState} from '../pipes/size.pipe'; import {ConfirmpswDirective} from './changepassword/equal-validator.directive'; import { FileUploadModule } from 'ng2-file-upload' -import { AllFileComponent, ViewDetails, FolderDialog } from './all-file/all-file.component'; import { ChangeuserdataComponent } from './changeuserdata/changeuserdata.component'; import { IsLoginService } from '../is-login.service'; -import { UploadFilesComponent } from './upload-files/upload-files.component'; -import {AddEnterpriserUser} from './enterpriseuser/addenterpriseuser.component'; -import {EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser} from './enterpriseuser/enterpriseuser.component' import { myPaginator } from "./my-paginator" -import { TeacherManagementComponent, editTeacher, seeTeacher } from './teacherManagement/enterpriseuser.component'; -import { AddTeacher } from './teacherManagement/addenterpriseuser.component'; -import { LearningRecordDetailsComponent } from './learning-record-details/learning-record-details.component'; -import {EhartsStatisticsComponent} from './eharts-statistics/eharts-statistics.component'; -import { CreateExamComponent, CreateDialog } from './create-exam/create-exam.component'; -import { LookOverTestComponent } from './look-over-test/look-over-test.component'; -import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'; -import { JoinExamComponent } from './join-exam/join-exam.component'; -import { TestRecordsComponent } from './test-records/test-records.component' import { NzDatePickerModule } from 'ng-zorro-antd/date-picker'; import {CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,} from './collection-tools/collection-tools.component' import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent} from './collection-tools/leftFunctionalDomain' @@ -72,7 +59,7 @@ import {WorkingAreaComponent} from '../working-area/working-area.component' import { NzTreeModule } from 'ng-zorro-antd/tree'; import { examinationQuestions,uploadQuestions } from './collection-tools/examinationQuestions' @NgModule({ - declarations: [FolderDialog,ViewDetails,ChangepasswordComponent,SizePipe,NamePipe,NamePipe2,NamePipe3,ConfirmpswDirective, AllFileComponent, ChangeuserdataComponent, UploadFilesComponent,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,TeacherManagementComponent,editTeacher,AddTeacher,seeTeacher, LearningRecordDetailsComponent, EhartsStatisticsComponent, CreateExamComponent, LookOverTestComponent, StatisticAnalysisComponent, JoinExamComponent, TestRecordsComponent,testState,CreateDialog,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions], + declarations: [ChangepasswordComponent,NamePipe,NamePipe2,NamePipe3,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions], imports: [ NzDatePickerModule, @@ -124,9 +111,6 @@ import { examinationQuestions,uploadQuestions } from './collection-tools/examina FileUploadModule, NzTreeModule ], - exports: [ - AllFileComponent - ], providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ] }) diff --git a/src/app/ui/upload-files/upload-files.component.html b/src/app/ui/upload-files/upload-files.component.html deleted file mode 100644 index 7d66aa2..0000000 --- a/src/app/ui/upload-files/upload-files.component.html +++ /dev/null @@ -1,23 +0,0 @@ -
-
- - - -
- -
- -

- {{item.name}} - {{item.size | size}} - - - - - - × -

- -
- -
diff --git a/src/app/ui/upload-files/upload-files.component.scss b/src/app/ui/upload-files/upload-files.component.scss deleted file mode 100644 index 72df1fe..0000000 --- a/src/app/ui/upload-files/upload-files.component.scss +++ /dev/null @@ -1,72 +0,0 @@ -.content { - width: 100%; - max-height: 250px; - overflow-y: auto; - overflow-x: hidden; - background-color: #fff; - border: 1px solid #e2e2e2; - box-shadow: 0 0 10px #ccc; - border-radius: 10px; - box-sizing: border-box; - padding: 10px; -} -.header { - box-sizing: border-box; - height: 30px; - line-height: 30px; - button { - height: 30px; - line-height: 30px; - } -} - -//每一行数据 -.dataStyle { - height: 30px; - line-height: 30px; - margin: 5px 0; - box-sizing: border-box; - padding: 0 3px; - span{ - display: inline-block; - font-size: 12px; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - line-height: 30px; - } - .dataName { - width: 40%; - margin-right: 10px; - } - .dataSize { - width: 20%; - } - .dataState { - width: 15%; - } -} -.dataStyle:hover { - background-color: #e2e2e2; -} - - - -//滚动条样式 -.content::-webkit-scrollbar { - /*滚动条整体样式*/ - width : 6px; /*高宽分别对应横竖滚动条的尺寸*/ - height: 1px; -} -.content::-webkit-scrollbar-thumb { - /*滚动条里面小方块*/ - border-radius: 10px; - box-shadow : inset 0 0 5px #999; - background : #535353; -} -.content::-webkit-scrollbar-track { - /*滚动条里面轨道*/ - box-shadow : inset 0 0 5px #999; - border-radius: 10px; - background : #ededed; -} \ No newline at end of file diff --git a/src/app/ui/upload-files/upload-files.component.spec.ts b/src/app/ui/upload-files/upload-files.component.spec.ts deleted file mode 100644 index 0d7bb87..0000000 --- a/src/app/ui/upload-files/upload-files.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { UploadFilesComponent } from './upload-files.component'; - -describe('UploadFilesComponent', () => { - let component: UploadFilesComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ UploadFilesComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(UploadFilesComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/ui/upload-files/upload-files.component.ts b/src/app/ui/upload-files/upload-files.component.ts deleted file mode 100644 index a707dec..0000000 --- a/src/app/ui/upload-files/upload-files.component.ts +++ /dev/null @@ -1,67 +0,0 @@ -import { Component, OnInit,Input } from '@angular/core'; - -@Component({ - selector: 'app-upload-files', - templateUrl: './upload-files.component.html', - styleUrls: ['./upload-files.component.scss'] -}) -export class UploadFilesComponent implements OnInit { - - constructor() { } - - ngOnInit(): void { - - } - - @Input( ) thatFile:any //父组件 - - isShow:boolean = true; //弹出框最大/化最小化 - filesData:any = []; //上传文件夹数据 - - //上传文件夹弹窗显隐 - toggle () { - this.isShow = !this.isShow - } - - //处理数据格式 - handleData () { - this.filesData = [] - for (let i=0; i { - if (element.name == e.name) { - element.state = 1 - return - } - }); - } - - //当前上传文件上传成功 - endUpload (e) { - this.filesData.forEach(element => { - if (element.name == e.name) { - element.state = 2 - return - } - }); - } - - //清空数据 - delete () { - this.filesData = [] - } - - //取消上传 - cancel () { - this.thatFile.cancel2() - } - - - -} From 642c5c94f48e5545ce0225dc859d27824aa61907 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 15 Dec 2020 16:28:44 +0800 Subject: [PATCH 04/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 2 +- src/app/examiner/examiner-routing.ts | 3 - src/app/navigation/adddatabank.html | 14 ----- src/app/navigation/editdatabankname.html | 14 ----- src/app/navigation/navigation.component.html | 4 +- src/app/navigation/navigation.component.ts | 64 -------------------- src/app/navigation/navigation.module.ts | 6 +- src/app/pipes/size.pipe.ts | 25 -------- src/app/tabbar/tabbar.component.ts | 10 --- src/app/ui/ui.module.ts | 4 +- 10 files changed, 7 insertions(+), 139 deletions(-) delete mode 100644 src/app/navigation/adddatabank.html delete mode 100644 src/app/navigation/editdatabankname.html diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8dd5e69..bd6ecc8 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -21,7 +21,7 @@ const routes: Routes = [ ] }, { path:'examiner/create-test-score', component:CreateTestScoreComponent,canActivate: [AuthGuard],}, //创建试卷具体分数页面 - { path: 'canvasTool', component:CollectionToolsComponent,canActivate: [AuthGuard], }, //编制工具 + { path:'canvasTool', component:CollectionToolsComponent,canActivate: [AuthGuard], }, //编制工具 { path:'adminLogin', component:LoginComponent}, //管理员登录路由 { path:'login', component:LockscreenComponent}, //教员学员登录路由 diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts index e3b9aef..553b265 100644 --- a/src/app/examiner/examiner-routing.ts +++ b/src/app/examiner/examiner-routing.ts @@ -15,14 +15,11 @@ import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.compon import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component' const routes: Routes = [ - // { path: '', component:CreateExamComponent } { path: 'createexam-index', component:ExaminerIndexComponent }, { path: 'examiner-new-one', component:ExaminerNewOneComponent }, { path: 'mark-papers-index',component:MarkPapersIndexComponent}, { path: 'mark-papers-two',component:MarkPapersTwoComponent}, { path: 'statistic-anaily',component:StatisticAnalysisComponent} - - //{ path: 'createexam-index', component:ExaminerIndexComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/navigation/adddatabank.html b/src/app/navigation/adddatabank.html deleted file mode 100644 index defbcba..0000000 --- a/src/app/navigation/adddatabank.html +++ /dev/null @@ -1,14 +0,0 @@ -
- - - - - -
- - -
- -
diff --git a/src/app/navigation/editdatabankname.html b/src/app/navigation/editdatabankname.html deleted file mode 100644 index 80aaf2a..0000000 --- a/src/app/navigation/editdatabankname.html +++ /dev/null @@ -1,14 +0,0 @@ -
- - - - - -
- - -
- -
diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 2dff347..820a46e 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -7,7 +7,7 @@ * @LastEditTime: 2020-12-15 14:32:13 --> - +
@@ -40,7 +40,7 @@
- +
diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index 6c58c6c..9c3a581 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -18,70 +18,6 @@ export class NavigationComponent implements OnInit { isAdmin:boolean = false ngOnInit() { - // if(sessionStorage.getItem("roleType") == "0"){ - // this.isAdmin = true - // } - } - - darktheme = false;//黑夜主题 - switchTheme (dark) { this.darktheme = dark; } - defaulttheme () { this.darktheme = false } - redtheme () { this.darktheme = true} - -} - -//新增资料库 -@Component({ - selector: 'adddatabank', - templateUrl: './adddatabank.html', - styleUrls: ['./navigation.component.scss'] -}) -export class AddDataBank { - myControl = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - - onNoClick(): void { - this.dialogRef.close(); - } - - onSubmit(value){ - if ( value.name.includes('/') ) { - let config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('名称不允许有特殊字符','确定',config); - } else { - this.dialogRef.close(value); - } } } - -//更改资料库名称 -@Component({ - selector: 'editdatabankname', - templateUrl: './editdatabankname.html', - styleUrls: ['./navigation.component.scss'] -}) -export class EditDataBankName { - myControl = new FormControl(); - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} - - dataBankName:any = this.data.name//要修改的资料库原名称 - - onNoClick(): void { - this.dialogRef.close(); - } - - onSubmit(value){ - if ( value.name.includes('/') ) { - let config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('名称不允许有特殊字符','确定',config); - } else { - this.dialogRef.close(value); - } - } - -} \ No newline at end of file diff --git a/src/app/navigation/navigation.module.ts b/src/app/navigation/navigation.module.ts index a127fcb..9b99dd6 100644 --- a/src/app/navigation/navigation.module.ts +++ b/src/app/navigation/navigation.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { NavigationComponent, AddDataBank, EditDataBankName } from './navigation.component'; +import { NavigationComponent } from './navigation.component'; import { MatIconModule } from '@angular/material/icon'; import { MatSidenavModule } from '@angular/material/sidenav'; import { RouterModule } from '@angular/router'; @@ -54,9 +54,7 @@ import {MatTreeModule} from '@angular/material/tree'; @NgModule({ declarations: [ NavigationComponent, - TabbarComponent, - AddDataBank, - EditDataBankName + TabbarComponent ], imports: [ CommonModule, diff --git a/src/app/pipes/size.pipe.ts b/src/app/pipes/size.pipe.ts index 5cff3f8..7ce6619 100644 --- a/src/app/pipes/size.pipe.ts +++ b/src/app/pipes/size.pipe.ts @@ -1,29 +1,4 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({name: 'name'}) -export class NamePipe implements PipeTransform { - transform(name: string): string { - let nameArr = name.split("/") - return nameArr[nameArr.length - 1] - } -} -@Pipe({name: 'name2'}) -export class NamePipe2 implements PipeTransform { - transform(name: string): string { - let nameArr = name.split("/") - return nameArr[nameArr.length - 2] - } -} -@Pipe({name: 'name3'}) -export class NamePipe3 implements PipeTransform { - transform(name: string): string { - if(name.charAt(name.length-1) == "/"){ - return name.substr(0, name.length - 1).replace(/\//g,'>').substring(9,name.length) - }else{ - return name.replace(/\//g,'>').substring(9,name.length) - } - } -} - @Pipe({name: 'testState'}) export class testState implements PipeTransform { transform(name: string): string { diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts index 633536e..c90b195 100644 --- a/src/app/tabbar/tabbar.component.ts +++ b/src/app/tabbar/tabbar.component.ts @@ -25,16 +25,6 @@ import { MatSnackBarConfig, MatSnackBar } from '@angular/material/snack-bar'; }) export class TabbarComponent implements OnInit { - theme: boolean = true; - @Output() - toggle = new EventEmitter(); - @Output() - toggleDarkTheme = new EventEmitter(); - @Output() - defaulttheme = new EventEmitter(); - @Output() - redtheme = new EventEmitter(); - constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,public token:CacheTokenService,public dialog: MatDialog,public isLogin:IsLoginService,public snackBar: MatSnackBar,) { } ngOnInit() { diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index cb6fa9d..e868da5 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -45,7 +45,7 @@ import { ReactiveFormsModule, FormsModule } from '@angular/forms'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatPaginatorIntl } from '@angular/material/paginator'; import { ChangepasswordComponent } from './changepassword/changepassword.component'; -import { NamePipe,NamePipe2, NamePipe3, testState} from '../pipes/size.pipe'; +import { testState} from '../pipes/size.pipe'; import {ConfirmpswDirective} from './changepassword/equal-validator.directive'; import { FileUploadModule } from 'ng2-file-upload' import { ChangeuserdataComponent } from './changeuserdata/changeuserdata.component'; @@ -59,7 +59,7 @@ import {WorkingAreaComponent} from '../working-area/working-area.component' import { NzTreeModule } from 'ng-zorro-antd/tree'; import { examinationQuestions,uploadQuestions } from './collection-tools/examinationQuestions' @NgModule({ - declarations: [ChangepasswordComponent,NamePipe,NamePipe2,NamePipe3,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions], + declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions], imports: [ NzDatePickerModule, From b989186ed5e24f73c6ccd6f4996b307c0f5765ec Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Tue, 15 Dec 2020 17:28:30 +0800 Subject: [PATCH 05/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=80=83=E5=AE=98,=E8=80=83?= =?UTF-8?q?=E7=94=9F=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.component.ts | 1 + .../examiner-index.component.ts | 3 - .../http-interceptors/cache-token.service.ts | 1 + src/app/navigation/navigation.component.html | 10 +- src/app/navigation/navigation.component.ts | 5 +- .../addenterpriseuser.component.html | 49 ++++ .../addenterpriseuser.component.ts | 67 +++++ .../ui/enterpriseuser/editenterpriseuser.html | 46 +++ .../enterpriseuser.component.html | 77 +++++ .../enterpriseuser.component.scss | 54 ++++ .../enterpriseuser.component.spec.ts | 25 ++ .../enterpriseuser.component.ts | 273 ++++++++++++++++++ .../ui/enterpriseuser/seeenterpriseuser.html | 0 .../addenterpriseuser.component.html | 49 ++++ .../addenterpriseuser.component.ts | 67 +++++ .../teacherManagement/editenterpriseuser.html | 46 +++ .../enterpriseuser.component.html | 72 +++++ .../enterpriseuser.component.scss | 54 ++++ .../enterpriseuser.component.ts | 272 +++++++++++++++++ .../teacherManagement/seeenterpriseuser.html | 0 src/app/ui/ui-routing.module.ts | 4 + src/app/ui/ui.module.ts | 6 +- 22 files changed, 1173 insertions(+), 8 deletions(-) create mode 100644 src/app/ui/enterpriseuser/addenterpriseuser.component.html create mode 100644 src/app/ui/enterpriseuser/addenterpriseuser.component.ts create mode 100644 src/app/ui/enterpriseuser/editenterpriseuser.html create mode 100644 src/app/ui/enterpriseuser/enterpriseuser.component.html create mode 100644 src/app/ui/enterpriseuser/enterpriseuser.component.scss create mode 100644 src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts create mode 100644 src/app/ui/enterpriseuser/enterpriseuser.component.ts create mode 100644 src/app/ui/enterpriseuser/seeenterpriseuser.html create mode 100644 src/app/ui/teacherManagement/addenterpriseuser.component.html create mode 100644 src/app/ui/teacherManagement/addenterpriseuser.component.ts create mode 100644 src/app/ui/teacherManagement/editenterpriseuser.html create mode 100644 src/app/ui/teacherManagement/enterpriseuser.component.html create mode 100644 src/app/ui/teacherManagement/enterpriseuser.component.scss create mode 100644 src/app/ui/teacherManagement/enterpriseuser.component.ts create mode 100644 src/app/ui/teacherManagement/seeenterpriseuser.html diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0a77d73..388e788 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -28,6 +28,7 @@ export class AppComponent { sessionStorage.setItem("roleType",data.roleType); sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); + sessionStorage.setItem("level",data.level); this.token.startUp() }) } else { diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index 076bb9d..74c556c 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -79,9 +79,7 @@ export class ExaminerIndexComponent implements OnInit { this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{ this.tabledataSource=data.items this.length=data.totalCount - console.log(data) }) - //console.log(this.tabledataSource) } //获取消防救援对信息 getHelp(){ @@ -98,7 +96,6 @@ export class ExaminerIndexComponent implements OnInit { SortType:'' } this.http.get("/api/ExamUsers",{params:paramsdata}).subscribe((data:any)=>{ - console.log(data) this.helpName=data.items }) } diff --git a/src/app/http-interceptors/cache-token.service.ts b/src/app/http-interceptors/cache-token.service.ts index c5a8399..917bbd1 100644 --- a/src/app/http-interceptors/cache-token.service.ts +++ b/src/app/http-interceptors/cache-token.service.ts @@ -25,6 +25,7 @@ export class CacheTokenService { sessionStorage.setItem("roleType",data.roleType); sessionStorage.setItem("token",data.token); sessionStorage.setItem("refreshToken",data.refreshToken); + sessionStorage.setItem("level",data.level); }) } else { this.delete() } },18*60*1000) diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index 820a46e..f389b85 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -22,7 +22,7 @@
-
    +
      • @@ -33,6 +33,14 @@
    +
      +
    • + +
      • +
    • + +
      • +
diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index 9c3a581..99c7683 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -16,8 +16,7 @@ export class NavigationComponent implements OnInit { constructor(private router:Router,public emitService: ComponentServiceService,public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public islogin:IsLoginService) { } - isAdmin:boolean = false - ngOnInit() { - } + roleType = sessionStorage.getItem('roleType') + ngOnInit() {} } diff --git a/src/app/ui/enterpriseuser/addenterpriseuser.component.html b/src/app/ui/enterpriseuser/addenterpriseuser.component.html new file mode 100644 index 0000000..3c624ef --- /dev/null +++ b/src/app/ui/enterpriseuser/addenterpriseuser.component.html @@ -0,0 +1,49 @@ +

创建用户

+ +
+ +
+ + + + 请输入正确身份证号 + + +
+ +
+ + + +
+ +
+ + +
+ {{item.name}} +
+
+ {{item.name}} +
+
+ {{item.name}} +
+ + +
+ + +
+

{{errmsg}}

+
+ +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/ui/enterpriseuser/addenterpriseuser.component.ts b/src/app/ui/enterpriseuser/addenterpriseuser.component.ts new file mode 100644 index 0000000..e7aab20 --- /dev/null +++ b/src/app/ui/enterpriseuser/addenterpriseuser.component.ts @@ -0,0 +1,67 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import {MatDialogRef} from '@angular/material/dialog'; +import {FormControl} from '@angular/forms'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; + +@Component({ + selector: 'addenterpriseuser', + templateUrl: './addenterpriseuser.component.html', + styleUrls: ['./enterpriseuser.component.scss'] + }) +export class AddEnterpriserUser { + + toppings = new FormControl(); + constructor(private http: HttpClient,public dialogRef: MatDialogRef,public snackBar: MatSnackBar) {} + errmsg:any; //捕获错误信息 + detachmentPosts: any = []//支队职务列表 + brigadePosts: any = []//大队职务列表 + RescueStationPosts: any = []//救援站职务列表 + ngOnInit(): void { + this.getAllPosts() + } + + //获得所有职务 + getAllPosts(){ + this.http.get("/api/Posts").subscribe( (data:any) =>{ + data.forEach(item => { + if(item.name.indexOf("支队级") != -1){ + this.detachmentPosts.push(item) + }else if(item.name.indexOf("大队级") != -1){ + this.brigadePosts.push(item) + }else{ + this.RescueStationPosts.push(item) + } + }); + }) + } + + + //提交创建表单 + onSubmit (e) { + let date = new Date() + let postsArr = this.toppings.value + let postsObj = [] + postsArr.forEach((item) => { + postsObj.push({id:item, name:""}) + }) + let body = { + name : e.idNumber, + realName : e.realName, + roleType : 2, + enabled : true, + creationTime : date, + posts : postsObj + } + this.http.post("/api/Users",body).subscribe( data => { + this.dialogRef.close(data); + },err => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open(err,'确定',config); + }) + + } + +} \ No newline at end of file diff --git a/src/app/ui/enterpriseuser/editenterpriseuser.html b/src/app/ui/enterpriseuser/editenterpriseuser.html new file mode 100644 index 0000000..964e833 --- /dev/null +++ b/src/app/ui/enterpriseuser/editenterpriseuser.html @@ -0,0 +1,46 @@ +

编辑用户

+ +
+ +
+ + + +
+ +
+ + + +
+ +
+ + +
+ {{item.name}} +
+
+ {{item.name}} +
+
+ {{item.name}} +
+ + +
+ + +
+

{{errmsg}}

+
+ +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.html b/src/app/ui/enterpriseuser/enterpriseuser.component.html new file mode 100644 index 0000000..ca37553 --- /dev/null +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.html @@ -0,0 +1,77 @@ +
+
+
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
用户姓名{{element.realName}}身份证号{{element.name}}消防救援站{{element.organizationName}}手机号{{element.phone}}创建时间{{element.creationTime | date:'yyyy-MM-dd'}}操作 + 重置密码 + 编辑 + 禁用 + 禁用 + 删除 +
+ + + +
diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.scss b/src/app/ui/enterpriseuser/enterpriseuser.component.scss new file mode 100644 index 0000000..71c0551 --- /dev/null +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.scss @@ -0,0 +1,54 @@ +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:center; + .queryField { + margin: 0 25px; + font-size: 14px; + input { + width: 160px; + height: 34px; + line-height: 34px; + border-radius: 5px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); + } + button { color: #fff; } + } + } //queryBox +} + +.operationSpan{ + margin: 0 10px; + .spanbtn { + font-weight: 550; + cursor: pointer; + } + .green{ color: #04ced1; } + .red{ color: #FF8678 } + .gray{ color: gray; } +} diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts b/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts new file mode 100644 index 0000000..044b696 --- /dev/null +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { EnterpriseuserComponent } from './enterpriseuser.component'; + +describe('EnterpriseuserComponent', () => { + let component: EnterpriseuserComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ EnterpriseuserComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(EnterpriseuserComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.ts b/src/app/ui/enterpriseuser/enterpriseuser.component.ts new file mode 100644 index 0000000..6967c81 --- /dev/null +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.ts @@ -0,0 +1,273 @@ +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 { AddEnterpriserUser } from './addenterpriseuser.component' +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import {FormControl} from '@angular/forms'; +import { Router,ActivatedRoute } from '@angular/router' + +@Component({ + selector: 'app-enterpriseuser', + templateUrl: './enterpriseuser.component.html', + styleUrls: ['./enterpriseuser.component.scss'] +}) +export class EnterpriseuserComponent implements OnInit { + + constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private router:Router,private route:ActivatedRoute) { } + + ngOnInit() { + this.initData() + } + + displayedColumns: string[] = [ 'name','identitycard', 'post', 'tel', 'time', 'operation',]; + dataSource:any; //所有企业用户 + + name:any //姓名 + identityCard:any //身份证 + fireTeam:any; //消防救援站 + + //分页 + @ViewChild(MatPaginator, {static: true}) + pageEvent: PageEvent; + paginator: MatPaginator; + length:any; //共多少条数据 + pageSize:any; //每页条数 + pageSizeOptions: number[] = [10] //设置每页条数 + pageNumber:number = 1; //第几页 + + //分页切换 + chagePage (e) { + this.pageNumber = e.pageIndex+1 + let data= { + Name: this.identityCard || '', + RealName: this.name || '', + RoleType: '2', + PageNumber: String(this.pageNumber), + } + this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ + this.length = data.totalCount + this.pageSize = data.pageSize + this.dataSource = new MatTableDataSource(data.items) + }) + } + + //页面初始化 + 查询 + 重置 + initData () { + let data= { + Name: this.identityCard || '', + RealName: this.name || '', + RoleType: '2', + } + this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ + this.length = data.totalCount + this.pageSize = data.pageSize + this.pageEvent.pageIndex = 0 + this.dataSource = new MatTableDataSource(data.items) + }) + } + + //更新当前页数据 + getAllUsers () { + let data= { + Name: this.identityCard || '', + RealName: this.name || '', + RoleType: '2', + PageNumber: String(this.pageNumber), + } + this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ + this.length = data.totalCount + this.pageSize = data.pageSize + this.dataSource = new MatTableDataSource(data.items) + }) + } + + //清空搜索 + empty () { + this.identityCard = '' + this.name = '' + this.initData() + } + + //创建用户 + open(){ + let dialogRef = this.dialog.open(AddEnterpriserUser, {//调用open方法打开对话框并且携带参数过去 + width: '250px', + }); + dialogRef.afterClosed().subscribe(data=>{ + if (data) { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('创建成功!','确定',config); + this.getAllUsers() + } + }); + } + + //编辑企业用户 + edit (e) { + let dialogRef = this.dialog.open(editenterpriseuser,{ + width: '250px', + data:e + }); + dialogRef.afterClosed().subscribe(data=>{ + if (data) { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('修改成功!','确定',config); + this.getAllUsers() + } + }); + } + + //重置密码 + reset (e) { + this.http.put(`/api/ExamUsers/${e.name}/ResetPassword`,{}).subscribe( + data=>{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('重置密码成功!','确定',config); + },err=>{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('重置密码失败!','确定',config); + }) + } + + //启用 + enabled (e) { + let date = new Date() + let body = { + name : e.name, + realName : e.realName, + roleType : e.roleType, + enabled : true, + creationTime : date, + posts : e.posts + } + this.http.put(`/api/ExamUsers/${e.name}`,body).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000; + this.snackBar.open('启用成功!','确定',config); + this.getAllUsers(); + }) + } + + //禁用 + noEnabled (e) { + let date = new Date() + let body = { + name : e.name, + realName : e.realName, + roleType : e.roleType, + enabled : false, + creationTime : date, + posts : e.posts + } + this.http.put(`/api/ExamUsers/${e.name}`,body).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000; + this.snackBar.open('禁用成功!','确定',config); + this.getAllUsers(); + }) + } + + //删除 + delete (e) { + let isTrue = confirm('您确定要删除吗') + if (isTrue) { + this.http.delete(`/api/ExamUsers/${e.name}`).subscribe(data=>{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('删除成功!','确定',config); + this.getAllUsers() + }) + } + } + + + +} + + + +//编辑企业用户 +@Component({ + selector: 'app-editenterpriseuser', + templateUrl: './editenterpriseuser.html', + styleUrls: ['./enterpriseuser.component.scss'] +}) +export class editenterpriseuser { + + toppings:any = new FormControl(); + constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} + errmsg:any; //捕获错误信息 + detachmentPosts: any = []//支队职务列表 + brigadePosts: any = []//大队职务列表 + RescueStationPosts: any = []//救援站职务列表 + + IdNumber:any //身份证号 + realName:any //真实姓名 + ngOnInit(): void { + this.toppings.value = [] + this.IdNumber = this.data.name + this.realName = this.data.realName + this.data.posts.forEach((item) => { + this.toppings.value.push(item.id) + }) + } + + //获得所有职务 + getAllPosts(){ + + } + + + //提交创建表单 + onSubmit (e) { + let date = new Date() + let postsArr = this.toppings.value + let postsObj = [] + postsArr.forEach((item) => { + postsObj.push({id:item, name:""}) + }) + let body = { + name : this.data.name, + realName : e.realName, + roleType : 2, + enabled : this.data.enabled, + creationTime : date, + posts : postsObj + } + this.http.put(`/api/ExamUsers/${this.data.name}`,body).subscribe(data => { + this.dialogRef.close("修改成功"); + }) + } + +} + + + +//查看企业用户 +@Component({ + selector: 'app-seeenterpriseuser', + templateUrl: './seeenterpriseuser.html', + styleUrls: ['./enterpriseuser.component.scss'] +}) +export class seeenterpriseuser { + + constructor(public http: HttpClient,public dialog: MatDialog, + @Inject(MAT_DIALOG_DATA) public data) { } + + ngOnInit() {} + +} \ No newline at end of file diff --git a/src/app/ui/enterpriseuser/seeenterpriseuser.html b/src/app/ui/enterpriseuser/seeenterpriseuser.html new file mode 100644 index 0000000..e69de29 diff --git a/src/app/ui/teacherManagement/addenterpriseuser.component.html b/src/app/ui/teacherManagement/addenterpriseuser.component.html new file mode 100644 index 0000000..36be501 --- /dev/null +++ b/src/app/ui/teacherManagement/addenterpriseuser.component.html @@ -0,0 +1,49 @@ +

创建教员

+ +
+ +
+ + + + 帐号格式为字母+数字 + + +
+ +
+ + + +
+ +
+ + +
+ {{item.name}} +
+
+ {{item.name}} +
+
+ {{item.name}} +
+ + +
+ + +
+

{{errmsg}}

+
+ +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/ui/teacherManagement/addenterpriseuser.component.ts b/src/app/ui/teacherManagement/addenterpriseuser.component.ts new file mode 100644 index 0000000..c4d6c72 --- /dev/null +++ b/src/app/ui/teacherManagement/addenterpriseuser.component.ts @@ -0,0 +1,67 @@ +import { Component, OnInit, Inject } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import {MatDialogRef} from '@angular/material/dialog'; +import {FormControl} from '@angular/forms'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; + +@Component({ + selector: 'addenterpriseuser', + templateUrl: './addenterpriseuser.component.html', + styleUrls: ['./enterpriseuser.component.scss'] + }) +export class AddTeacher { + + toppings = new FormControl(); + constructor(private http: HttpClient,public dialogRef: MatDialogRef,public snackBar: MatSnackBar) {} + errmsg:any; //捕获错误信息 + detachmentPosts: any = []//支队职务列表 + brigadePosts: any = []//大队职务列表 + RescueStationPosts: any = []//救援站职务列表 + ngOnInit(): void { + this.getAllPosts() + } + + //获得所有职务 + getAllPosts(){ + this.http.get("/api/Posts").subscribe( (data:any) =>{ + data.forEach(item => { + if(item.name.indexOf("支队级") != -1){ + this.detachmentPosts.push(item) + }else if(item.name.indexOf("大队级") != -1){ + this.brigadePosts.push(item) + }else{ + this.RescueStationPosts.push(item) + } + }); + }) + } + + + //提交创建表单 + onSubmit (e) { + let date = new Date() + let postsArr = this.toppings.value + let postsObj = [] + postsArr.forEach((item) => { + postsObj.push({id:item, name:""}) + }) + let body = { + name : e.idNumber, + realName : e.realName, + roleType : 1, + enabled : true, + creationTime : date, + posts : postsObj + } + this.http.post("/api/Users",body).subscribe( data => { + this.dialogRef.close(data); + },err=>{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open(err,'确定',config); + }) + + } + +} \ No newline at end of file diff --git a/src/app/ui/teacherManagement/editenterpriseuser.html b/src/app/ui/teacherManagement/editenterpriseuser.html new file mode 100644 index 0000000..013cd42 --- /dev/null +++ b/src/app/ui/teacherManagement/editenterpriseuser.html @@ -0,0 +1,46 @@ +

编辑教员

+ +
+ +
+ + + +
+ +
+ + + +
+ +
+ + +
+ {{item.name}} +
+
+ {{item.name}} +
+
+ {{item.name}} +
+ + +
+ + +
+

{{errmsg}}

+
+ +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.html b/src/app/ui/teacherManagement/enterpriseuser.component.html new file mode 100644 index 0000000..b2f662d --- /dev/null +++ b/src/app/ui/teacherManagement/enterpriseuser.component.html @@ -0,0 +1,72 @@ +
+
+
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
用户帐号{{element.name}}用户姓名{{element.realName}}消防救援站{{element.organizationName}}创建时间{{element.creationTime | date:'yyyy-MM-dd'}}操作 + 重置密码 + 编辑 + 禁用 + 禁用 + 删除 +
+ + + +
diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.scss b/src/app/ui/teacherManagement/enterpriseuser.component.scss new file mode 100644 index 0000000..71c0551 --- /dev/null +++ b/src/app/ui/teacherManagement/enterpriseuser.component.scss @@ -0,0 +1,54 @@ +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:center; + .queryField { + margin: 0 25px; + font-size: 14px; + input { + width: 160px; + height: 34px; + line-height: 34px; + border-radius: 5px; + padding-left: 5px; + outline: none; + border: 1px solid rgb(226, 211, 211); + } + button { color: #fff; } + } + } //queryBox +} + +.operationSpan{ + margin: 0 10px; + .spanbtn { + font-weight: 550; + cursor: pointer; + } + .green{ color: #04ced1; } + .red{ color: #FF8678 } + .gray{ color: gray; } +} diff --git a/src/app/ui/teacherManagement/enterpriseuser.component.ts b/src/app/ui/teacherManagement/enterpriseuser.component.ts new file mode 100644 index 0000000..1da79e2 --- /dev/null +++ b/src/app/ui/teacherManagement/enterpriseuser.component.ts @@ -0,0 +1,272 @@ +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 { AddTeacher } from './addenterpriseuser.component' +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import {FormControl} from '@angular/forms'; + +@Component({ + selector: 'app-enterpriseuser', + templateUrl: './enterpriseuser.component.html', + styleUrls: ['./enterpriseuser.component.scss'] +}) +export class TeacherManagementComponent implements OnInit { + + constructor(public http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar) { } + + ngOnInit() { + this.initData() + } + + displayedColumns: string[] = ['identitycard', 'name', 'post', 'time', 'operation',]; + dataSource:any; //所有企业用户 + + name:any //用户姓名 + identityCard:any //用户账号 + fireTeam:any; //消防救援站 + + //分页 + @ViewChild(MatPaginator, {static: true}) + pageEvent: PageEvent; + paginator: MatPaginator; + length:any; //共多少条数据 + pageSize:any; //每页条数 + pageSizeOptions: number[] = [10] //设置每页条数 + pageNumber:number = 1; //第几页 + + //分页切换 + chagePage (e) { + this.pageNumber = e.pageIndex+1 + let data= { + Name: this.identityCard || '', + RealName: this.name || '', + RoleType: '1', + PageNumber: String(this.pageNumber), + } + this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ + this.length = data.totalCount + this.pageSize = data.pageSize + this.dataSource = new MatTableDataSource(data.items) + }) + } + + //页面初始化 + 查询 + 重置 + initData () { + let data= { + Name: this.identityCard || '', + RealName: this.name || '', + RoleType: '1', + } + this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ + this.length = data.totalCount + this.pageSize = data.pageSize + this.pageEvent.pageIndex = 0 + this.dataSource = new MatTableDataSource(data.items) + }) + } + + //更新当前页数据 + getAllUsers () { + let data= { + Name: this.identityCard || '', + RealName: this.name || '', + RoleType: '1', + PageNumber: String(this.pageNumber), + } + this.http.get('/api/ExamUsers',{params:data}).subscribe((data:any)=>{ + this.length = data.totalCount + this.pageSize = data.pageSize + this.dataSource = new MatTableDataSource(data.items) + }) + } + + //清空搜索 + empty () { + this.identityCard = '' + this.name = '' + this.initData() + } + + //创建教员 + open(){ + let dialogRef = this.dialog.open(AddTeacher, {//调用open方法打开对话框并且携带参数过去 + width: '250px', + }); + dialogRef.afterClosed().subscribe(data=>{ + if (data) { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('创建成功!','确定',config); + this.getAllUsers() + } + }); + } + + //编辑企业用户 + edit (e) { + let dialogRef = this.dialog.open(editTeacher,{ + width: '250px', + data:e + }); + dialogRef.afterClosed().subscribe(data=>{ + if (data) { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('修改成功!','确定',config); + this.getAllUsers() + } + }); + } + + //重置密码 + reset (e) { + this.http.put(`/api/ExamUsers/${e.name}/ResetPassword`,{}).subscribe( + data=>{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('重置密码成功!','确定',config); + },err=>{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('重置密码失败!','确定',config); + }) + } + + //启用 + enabled (e) { + let date = new Date() + let body = { + name : e.name, + realName : e.realName, + roleType : e.roleType, + enabled : true, + creationTime : date, + posts : e.posts + } + this.http.put(`/api/ExamUsers/${e.name}`,body).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000; + this.snackBar.open('启用成功!','确定',config); + this.getAllUsers(); + }) + } + + //禁用 + noEnabled (e) { + let date = new Date() + let body = { + name : e.name, + realName : e.realName, + roleType : e.roleType, + enabled : false, + creationTime : date, + posts : e.posts + } + this.http.put(`/api/ExamUsers/${e.name}`,body).subscribe(data => { + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000; + this.snackBar.open('禁用成功!','确定',config); + this.getAllUsers(); + }) + } + + //删除 + delete (e) { + let isTrue = confirm('您确定要删除吗') + if (isTrue) { + this.http.delete(`/api/ExamUsers/${e.name}`).subscribe(data=>{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('删除成功!','确定',config); + this.getAllUsers() + }) + } + } + + + +} + + + +//编辑企业用户 +@Component({ + selector: 'app-editenterpriseuser', + templateUrl: './editenterpriseuser.html', + styleUrls: ['./enterpriseuser.component.scss'] +}) +export class editTeacher { + + toppings:any = new FormControl(); + constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} + errmsg:any; //捕获错误信息 + detachmentPosts: any = []//支队职务列表 + brigadePosts: any = []//大队职务列表 + RescueStationPosts: any = []//救援站职务列表 + + IdNumber:any //身份证号 + realName:any //真实姓名 + ngOnInit(): void { + this.toppings.value = [] + this.IdNumber = this.data.name + this.realName = this.data.realName + this.data.posts.forEach((item) => { + this.toppings.value.push(item.id) + }) + } + + //获得所有职务 + getAllPosts(){ + + } + + + //提交创建表单 + onSubmit (e) { + let date = new Date() + let postsArr = this.toppings.value + let postsObj = [] + postsArr.forEach((item) => { + postsObj.push({id:item, name:""}) + }) + let body = { + name : this.data.name, + realName : e.realName, + roleType : 1, + enabled : this.data.enabled, + creationTime : date, + posts : postsObj + } + this.http.put(`/api/ExamUsers/${this.data.name}`,body).subscribe(data => { + this.dialogRef.close("修改成功"); + }) + } + +} + + + +//查看企业用户 +@Component({ + selector: 'app-seeenterpriseuser', + templateUrl: './seeenterpriseuser.html', + styleUrls: ['./enterpriseuser.component.scss'] +}) +export class seeTeacher { + + constructor(public http: HttpClient,public dialog: MatDialog, + @Inject(MAT_DIALOG_DATA) public data) { } + + ngOnInit() {} + +} \ No newline at end of file diff --git a/src/app/ui/teacherManagement/seeenterpriseuser.html b/src/app/ui/teacherManagement/seeenterpriseuser.html new file mode 100644 index 0000000..e69de29 diff --git a/src/app/ui/ui-routing.module.ts b/src/app/ui/ui-routing.module.ts index 811a429..d2cefd8 100644 --- a/src/app/ui/ui-routing.module.ts +++ b/src/app/ui/ui-routing.module.ts @@ -1,7 +1,11 @@ import { Routes, RouterModule } from '@angular/router'; import { NgModule } from '@angular/core'; +import { TeacherManagementComponent } from './teacherManagement/enterpriseuser.component'; +import { EnterpriseuserComponent } from './enterpriseuser/enterpriseuser.component'; const routes: Routes = [ + { path: 'teachear', component:TeacherManagementComponent }, //管理员 教员页面 + { path: 'examinee', component:EnterpriseuserComponent }, //管理员 考生页面 ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index e868da5..be7bbbe 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -58,8 +58,12 @@ import {saveOneDialog,saveTwoDialog} from './collection-tools/save' import {WorkingAreaComponent} from '../working-area/working-area.component' import { NzTreeModule } from 'ng-zorro-antd/tree'; import { examinationQuestions,uploadQuestions } from './collection-tools/examinationQuestions' +import {AddEnterpriserUser} from './enterpriseuser/addenterpriseuser.component' +import {EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser} from './enterpriseuser/enterpriseuser.component' +import {AddTeacher} from './teacherManagement/addenterpriseuser.component' +import {TeacherManagementComponent,editTeacher,seeTeacher} from './teacherManagement/enterpriseuser.component' @NgModule({ - declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions], + declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,AddTeacher,TeacherManagementComponent,editTeacher,seeTeacher], imports: [ NzDatePickerModule, From 9256bd20d50fcc24aa01c1977ad1af9de24e5e2b Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 16 Dec 2020 08:53:26 +0800 Subject: [PATCH 06/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/examiner/examiner-index/examiner-index.component.ts | 2 +- src/app/examiner/examiner-routing.ts | 4 ++-- .../examiner/mark-papers-index/mark-papers-index.component.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index 076bb9d..9c69d51 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -141,7 +141,7 @@ export class ExaminerIndexComponent implements OnInit { } //新增考题跳转 newExamination(){ - this.router.navigate(['/home/examiner-new-one']) + this.router.navigate(['/home/createexam-index/examiner-new-one']) } } diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts index 553b265..5b3cda2 100644 --- a/src/app/examiner/examiner-routing.ts +++ b/src/app/examiner/examiner-routing.ts @@ -16,9 +16,9 @@ import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analy const routes: Routes = [ { path: 'createexam-index', component:ExaminerIndexComponent }, - { path: 'examiner-new-one', component:ExaminerNewOneComponent }, + { path: 'createexam-index/examiner-new-one', component:ExaminerNewOneComponent }, { path: 'mark-papers-index',component:MarkPapersIndexComponent}, - { path: 'mark-papers-two',component:MarkPapersTwoComponent}, + { path: 'mark-papers-index/mark-papers-two',component:MarkPapersTwoComponent}, { path: 'statistic-anaily',component:StatisticAnalysisComponent} ] @NgModule({ diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts index 18a21ac..c734389 100644 --- a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts @@ -48,7 +48,7 @@ export class MarkPapersIndexComponent implements OnInit { //点击阅卷跳转 markTwo(e){ console.log(e) - this.router.navigate(['/home/mark-papers-two'],{queryParams:{'level':e}}) + this.router.navigate(['/home/mark-papers-index/mark-papers-two'],{queryParams:{'level':e}}) } } From 6bbfcc1e58092d7cb1958047268082873b964e0f Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Wed, 16 Dec 2020 09:07:32 +0800 Subject: [PATCH 07/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E9=80=80=E5=87=BA?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B8=85=E7=A9=BA=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/http-interceptors/base-interceptor.ts | 1 + src/app/tabbar/tabbar.component.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/http-interceptors/base-interceptor.ts b/src/app/http-interceptors/base-interceptor.ts index 4f22d6a..4cabcd7 100644 --- a/src/app/http-interceptors/base-interceptor.ts +++ b/src/app/http-interceptors/base-interceptor.ts @@ -46,6 +46,7 @@ export class BaseInterceptor implements HttpInterceptor { // 用户认证失败返回登录页 if (error.status === 401||error.status === 614) { sessionStorage.clear() + localStorage.clear() this.router.navigate(['/login']) const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts index c90b195..4f187d3 100644 --- a/src/app/tabbar/tabbar.component.ts +++ b/src/app/tabbar/tabbar.component.ts @@ -40,6 +40,7 @@ export class TabbarComponent implements OnInit { if(out) { this.http.post('/api/ExamAccounts/SignOut',{}).subscribe(data=>{ sessionStorage.clear() + localStorage.clear() this.token.delete() this.router.navigate(['/login']) const config = new MatSnackBarConfig(); @@ -47,7 +48,6 @@ export class TabbarComponent implements OnInit { config.duration = 3000 this.snackBar.open('退出成功','确定',config); }) - localStorage.removeItem("checkedWork") } //if } From f0b4a903ef5bc248d37d40d5e00a42445bce8db3 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 16 Dec 2020 09:09:41 +0800 Subject: [PATCH 08/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=E6=9D=82=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/collection-tools/examinationQuestions.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/ui/collection-tools/examinationQuestions.html b/src/app/ui/collection-tools/examinationQuestions.html index aa5e6f3..c0d1369 100644 --- a/src/app/ui/collection-tools/examinationQuestions.html +++ b/src/app/ui/collection-tools/examinationQuestions.html @@ -2,9 +2,9 @@
消防设施考题设定
- + - + {{node.name}} @@ -13,7 +13,7 @@ - + @@ -19,16 +18,19 @@
-
open_with建筑总平面图
-
总平面图
-
+
+ open_with + +
+
{{item.name}}
-
-
-
+
+
+
总平面图
+
{{item.name}}
@@ -102,7 +104,7 @@
- + @@ -110,7 +112,7 @@ {{node.name}} ({{node.children.length}}) - check_circle_outline + visibility @@ -125,7 +127,7 @@ {{node.name}} ({{node.children.length}}) - check_circle_outline + visibility diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index ee90d8f..be59497 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -43,17 +43,10 @@ } } .headerRight { - width: 450px; + width: 350px; overflow: hidden; box-sizing: border-box; padding-left: 10px; - .fraction { font-size: 14px; } - .fraction input { - width: 40px; - height: 24px; - margin: 0 2px; - border-radius: 5px; - } button { font-size: 14px; color: #07CDCF; @@ -175,6 +168,7 @@ //中间建筑/楼层 .centerTotal { + max-width: 199px; flex: 49%; background-color: #fff; box-shadow: 0px 0px 5px 3px rgb(165, 163, 163); @@ -357,7 +351,6 @@ input { border: none; outline: none; background-color: #d6dddf; box-sizing: bord div:focus { outline: none; } - //没有图片时显示无图片背景图 .noImgCss{ background: url(../../../assets/images/noImg.png) no-repeat center center; diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 758ee55..cd4e9d3 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -59,6 +59,8 @@ export class CollectionToolsComponent implements OnInit { allBuildings //该单位所有建筑 beforeOneCheckedBuilding:any = {name:"总平面图"}; //当前点击选择的建筑 + beforeOneCheckedBuildingIsShow:boolean = false; //建筑是否显示 + togglebeforeOneCheckedBuilding () { this.beforeOneCheckedBuildingIsShow = !this.beforeOneCheckedBuildingIsShow } checkedBuildingIndex:number = -1 //当前点击选择的建筑index isEditPat:boolean = true //当前是否是编辑模式 @@ -150,9 +152,6 @@ export class CollectionToolsComponent implements OnInit { } pattern:boolean = false//默认为基本信息编辑 - yyy(){ - console.log(this.canvasData.selectPanelPoint) - } //基本信息编辑模式 baseInfo(){ if (!this.pattern) { @@ -629,9 +628,8 @@ export class CollectionToolsComponent implements OnInit { isSixbtn = true //控制想定作业编辑按钮 isxxx = true //控制查看编辑模式的编辑模式按钮 examMsg = { //单位,考试信息 - conpanyName: sessionStorage.getItem('companyName'), //单位名称 + conpanyName: sessionStorage.getItem('companyName') || '暂无数据', //单位名称 keynote: '', //考试要点 - grade: '', //分数 } ngOnInit(): void { @@ -657,8 +655,6 @@ export class CollectionToolsComponent implements OnInit { } - - ngAfterViewInit(): void { this.getSitePlan() //获取总平面图/楼层 @@ -1015,14 +1011,6 @@ export class CollectionToolsComponent implements OnInit { }) } - //拖拽tree - drop(e){ - console.log(1111,e) - } - drop2(e){ - console.log(222,e) - } - //创建建筑 createBuilding(){ let data = { @@ -1325,8 +1313,9 @@ export class CollectionToolsComponent implements OnInit { } //封装 刷新 tree 数据 - async renovateTreeData (isRefresh:boolean = true) { + async renovateTreeData (isRefresh:boolean = true) { this.allFireElements[this.allFireElements.length-1].children = [] + this.beforeOneCheckedBuildingIsShow = false isRefresh? await this.canvas.refresh() : null this.canvas.setNameVisible(this.basicInfo,0) this.canvas.setNameVisible(this.wantToWork,1) diff --git a/src/app/ui/collection-tools/examinationQuestions.html b/src/app/ui/collection-tools/examinationQuestions.html index c0d1369..02cc183 100644 --- a/src/app/ui/collection-tools/examinationQuestions.html +++ b/src/app/ui/collection-tools/examinationQuestions.html @@ -29,5 +29,8 @@
-
+
+ + +
\ No newline at end of file diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts index d441b0b..03a2a91 100644 --- a/src/app/ui/collection-tools/examinationQuestions.ts +++ b/src/app/ui/collection-tools/examinationQuestions.ts @@ -39,6 +39,11 @@ export class examinationQuestions { this.treeControl.expandAll() } + //提交 + submit () { + console.log(this.data) + } + } @Component({ @@ -76,18 +81,7 @@ export class uploadQuestions { //上传 submit () { - if (this.data.question.grade && this.data.question.keynote) { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('上传成功','确定',config); - this.dialogRef.close() - } else { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请填写必填项','确定',config); - } + console.log(this.data.question) } } \ No newline at end of file diff --git a/src/app/ui/collection-tools/uploadQuestions.html b/src/app/ui/collection-tools/uploadQuestions.html index 6e0988b..5f192fa 100644 --- a/src/app/ui/collection-tools/uploadQuestions.html +++ b/src/app/ui/collection-tools/uploadQuestions.html @@ -1,9 +1,5 @@
上传
-
设置分数
-
- -
考试要点
From 8b4e2bc60132080f2cc8c6aa17d332b97627400c Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 17 Dec 2020 11:37:46 +0800 Subject: [PATCH 10/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8F=90=E9=86=92=EF=BC=8C=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=82=A8=E7=BD=90=E5=90=8D=E7=A7=B0=EF=BC=8C=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-test-score/addPlanTwo.html | 5 +- .../create-test-score.component.html | 8 +- .../create-test-score.component.ts | 589 ++++++++++-------- .../create-test-score/lookTreeNode.html | 2 +- 4 files changed, 339 insertions(+), 265 deletions(-) diff --git a/src/app/examiner/create-test-score/addPlanTwo.html b/src/app/examiner/create-test-score/addPlanTwo.html index 63fdd29..e509b01 100644 --- a/src/app/examiner/create-test-score/addPlanTwo.html +++ b/src/app/examiner/create-test-score/addPlanTwo.html @@ -3,7 +3,7 @@
添加预案
-
+
@@ -47,6 +47,9 @@
+
+ 该单位暂无审核通过的二维预案 +
diff --git a/src/app/examiner/create-test-score/create-test-score.component.html b/src/app/examiner/create-test-score/create-test-score.component.html index 4a5b95b..a87ec3d 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.html +++ b/src/app/examiner/create-test-score/create-test-score.component.html @@ -49,12 +49,14 @@ 基本信息 - 总分值: 分, 单项 {{unit.basicInfoItemScore ? unit.basicInfoItemScore : 0}} 分 + + (已选择 {{unit.basicInfoSelectedNum}} 项) @@ -97,6 +99,7 @@ 单项 {{unit.aroundItemScore ? unit.aroundItemScore : 0}} 分 + (已选择 {{unit.aroundSelectedNum}} 项) @@ -139,6 +142,7 @@ 单项 {{unit.keySiteItemScore ? unit.keySiteItemScore : 0}} 分 + (已选择 {{unit.keySiteSelectedNum}} 项) @@ -181,6 +185,7 @@ 单项 {{unit.funDivItemScore ? unit.funDivItemScore : 0}} 分 + (已选择 {{unit.funDivSelectedNum}} 项) @@ -223,6 +228,7 @@ 单项 {{unit.fireFacItemScore ? unit.fireFacItemScore : 0}} 分 + (已选择 {{unit.fireFacSelectedNum}} 项) diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts index 0b073ba..a9ef808 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.ts +++ b/src/app/examiner/create-test-score/create-test-score.component.ts @@ -127,6 +127,7 @@ export class CreateTestScoreComponent implements OnInit { buildingsData.name = data[i].name buildingsData.buildingType = data[i].buildingTypes[0].name buildingsData[0].buildingBasicGroups.forEach((y,m) => { + let propertyInfosArr = [] let tabledata if(y.type == 1){//如果是表格类 @@ -158,14 +159,38 @@ export class CreateTestScoreComponent implements OnInit { }) y.tabledata = dest tabledata = dest - y.tabledata[0].data.forEach((x,key) => { - if(x.propertyValue){ - x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) - x.isLeaf = true - x.name = x.propertyValue - propertyInfosArr.push(x) + if(y.tabledata[0].propertyName == '罐区'){ + + if(y.tabledata[1].propertyName != '储罐编号'){ + let index + y.tabledata.forEach((element,key) => { + if(element.propertyName == '储罐编号'){ + index = key + } + }) + y.tabledata[1] = y.tabledata.splice(index, 1, y.tabledata[1])[0]; } - }) + + y.tabledata[0].data.forEach((x,key) => { + + if(x.propertyValue){ + x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) + x.isLeaf = true + x.name = x.propertyValue + '-' + y.tabledata[1].data[key].propertyValue + propertyInfosArr.push(x) + } + }) + }else{ + y.tabledata[0].data.forEach((x,key) => { + if(x.propertyValue){ + x.key = (Math.random()*10000000).toString(16).substr(0,4)+(new Date()).getTime()+Math.random().toString().substr(2,5) + x.isLeaf = true + x.name = x.propertyValue + propertyInfosArr.push(x) + } + }) + } + }else{ y.propertyInfos.forEach((x,key) => { if(x.propertyValue){ @@ -581,6 +606,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].basicInfoItemScore = 0 } + this.unitId[key].basicInfoSelectedNum = selectedNum.length } if(event.node.origin.type == '四周毗邻' || (event.node.parentNode && event.node.parentNode.origin.type == '四周毗邻')){ let selectedNum = [] @@ -594,6 +620,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].aroundItemScore = 0 } + this.unitId[key].aroundSelectedNum = selectedNum.length } if(event.node.origin.type == '重点部位' || (event.node.parentNode && event.node.parentNode.origin.type == '重点部位')){ let selectedNum = [] @@ -607,6 +634,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].keySiteItemScore = 0 } + this.unitId[key].keySiteSelectedNum = selectedNum.length } if(event.node.origin.type == '功能分区' || (event.node.parentNode && event.node.parentNode.origin.type == '功能分区')){ let selectedNum = [] @@ -620,6 +648,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].funDivItemScore = 0 } + this.unitId[key].funDivSelectedNum = selectedNum.length } if(event.node.origin.type == '消防设施' || (event.node.parentNode && event.node.parentNode.origin.type == '消防设施')){ let selectedNum = [] @@ -633,6 +662,7 @@ export class CreateTestScoreComponent implements OnInit { }else{ this.unitId[key].fireFacItemScore = 0 } + this.unitId[key].fireFacSelectedNum = selectedNum.length } } @@ -730,6 +760,7 @@ export class CreateTestScoreComponent implements OnInit { } }); } + //每条预案分数增加在试卷分数 planItemScore(item){ //计算整个试卷的总分 @@ -750,6 +781,7 @@ export class CreateTestScoreComponent implements OnInit { }) this.examScore = examScore + examScore2 } + //编辑每条预案试卷 edit(item){ const config = new MatSnackBarConfig(); @@ -757,6 +789,7 @@ export class CreateTestScoreComponent implements OnInit { config.duration = 3000 this.snackBar.open('暂不能编辑','确定',config); } + //删除每条预案试卷 deletePlan(item){ this.unitId[this.selectedUnitIndex].planList.forEach((element,key)=>{ @@ -771,271 +804,268 @@ export class CreateTestScoreComponent implements OnInit { } //保存 save(){ - let copyDatas = JSON.parse(JSON.stringify(this.unitId)) - - //循环每个建筑处理数据筛选出选中数据 - copyDatas.forEach(item => { - //建筑的基本信息模块处理 - item.basicInfoNodes.forEach((i,key) => { - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - // console.log(i) - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - // newArr.length == 0 ? item.basicInfoNodes.splice(key,1) : i.children = newArr - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.basicInfoNodes = item.basicInfoNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } - //将children处理成指定形式 - if(i.name =='单位信息'){ - let newChildren = [] - i.children.forEach((element,index) => { - let newChildrenItem:any= {} - newChildrenItem.name = element.name//题目名称 - newChildrenItem.result = element.value//题目答案 - newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 - newChildrenItem.propertyType = 0//输入框类型 - newChildren.push(newChildrenItem) - }) - i.children = newChildren - }else if(!i.tabledata){ - let newChildren = [] - i.children.forEach((element,index) => { - let newChildrenItem:any= {} - newChildrenItem.name = element.propertyName//题目名称 - newChildrenItem.result = element.propertyValue//题目答案 - newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 - newChildrenItem.propertyType = element.propertyType//输入框类型 - newChildren.push(newChildrenItem) - }) - i.children = newChildren - }else if(i.tabledata){//如果是表格类 - let newChildren = [] - i.children.forEach((element,index) => { - let newChildrenItem:any= {} - newChildrenItem.name = element.propertyValue//题目名称 - newChildrenItem.result = element.tag//代表第几行 - newChildrenItem.physicalUnit = ''//计量单位 - newChildrenItem.propertyType = ''//输入框类型 - newChildren.push(newChildrenItem) - }) - i.children = newChildren - i.tabledata.forEach(element => { - let newData = [] - element.data.forEach(ele => { - let newObj:any = {} - newObj.name = ele.propertyName//题目名称 - newObj.result = ele.propertyValue//代表第几行 - newObj.physicalUnit = ele.physicalUnit//计量单位 - newObj.propertyType = ele.propertyType//输入框类型 - newObj.tag = ele.tag//第几行 - newData.push(newObj) - }) - element.data = newData - }) - } - delete i.selected - - }) - //建筑的四周毗邻模块处理 - item.aroundNodes.forEach((i,key) => { - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.aroundNodes = item.aroundNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } - let newChildren = [] - i.children.forEach((element,index) => { - let newChildrenItem:any= {} - newChildrenItem.name = element.title//题目名称 - newChildrenItem.result = element.name//题目答案 - newChildrenItem.physicalUnit = ''//计量单位 - newChildrenItem.propertyType = 0//输入框类型 - newChildren.push(newChildrenItem) - }) - i.children = newChildren - delete i.selected - }) - console.log(111,item) - //建筑的重点部位模块处理 - item.keySiteNodes ? item.keySiteNodes.forEach((i,key) => { - i.selected ? i.selected = null : null - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.keySiteNodes = item.keySiteNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } - i.tabledata = [{propertyName: "重点部位名称",data:[]}, - {propertyName: "重点部位所在位置",data:[]}, - {propertyName: "建筑结构",data:[]}, - {propertyName: "使用性质",data:[]}, - {propertyName: "主要危险性",data:[]}] + let copyDatas = JSON.parse(JSON.stringify(this.unitId)) + //循环每个建筑处理数据筛选出选中数据 + copyDatas.forEach(item => { + //建筑的基本信息模块处理 + item.basicInfoNodes.forEach((i,key) => { + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + // console.log(i) + let newArr = [] i.children.forEach(element => { - i.tabledata[0].data.push({ - name: "重点部位名称", - physicalUnit: '', - propertyType: 0, - result: element.name, - tag: "" - }) - i.tabledata[1].data.push({ - name: "重点部位所在位置", - physicalUnit: '', - propertyType: 0, - result: element.position, - tag: "" - }) - i.tabledata[2].data.push({ - name: "建筑结构", - physicalUnit: '', - propertyType: 0, - result: element.structure, - tag: "" - }) - i.tabledata[3].data.push({ - name: "使用性质", - physicalUnit: '', - propertyType: 0, - result: element.nature, - tag: "" - }) - i.tabledata[4].data.push({ - name: "主要危险性", - physicalUnit: '', - propertyType: 0, - result: element.hazards, - tag: "" - }) + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + // newArr.length == 0 ? item.basicInfoNodes.splice(key,1) : i.children = newArr + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.basicInfoNodes = item.basicInfoNodes.filter(items => { + if (!discard.includes(items)) return items; }) + } + //将children处理成指定形式 + if(i.name =='单位信息'){ let newChildren = [] i.children.forEach((element,index) => { let newChildrenItem:any= {} - // newChildrenItem.name = element.name//重点部位题目名称 - // newChildrenItem.position = element.position//重点部位所在位置 - // newChildrenItem.structure = element.structure//重点部位建筑结构 - // newChildrenItem.nature = element.nature//重点部位使用性质 - // newChildrenItem.hazards = element.hazards//重点部位主要危险性 newChildrenItem.name = element.name//题目名称 - newChildrenItem.result = element.position + element.structure + element.nature + element.hazards//题目答案 + newChildrenItem.result = element.value//题目答案 newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 newChildrenItem.propertyType = 0//输入框类型 newChildren.push(newChildrenItem) }) i.children = newChildren - delete i.selected - - - }) : null - //建筑的功能分区模块处理 - item.funDivNodes ? item.funDivNodes.forEach((i,key) => { - - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.funDivNodes = item.funDivNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } - - i.tabledata = [{propertyName: "区域",data:[]}, - {propertyName: "面积",data:[]}, - {propertyName: "基本情况",data:[]}] - i.children.forEach(element => { - i.tabledata[0].data.push({ - name: "区域", - physicalUnit: '', - propertyType: 0, - result: element.region, - tag: "" - }) - i.tabledata[1].data.push({ - name: "面积", - physicalUnit: '', - propertyType: 0, - result: element.area, - tag: "" - }) - i.tabledata[2].data.push({ - name: "基本情况", - physicalUnit: '', - propertyType: 0, - result: element.details, - tag: "" - }) - }) + }else if(!i.tabledata){ let newChildren = [] i.children.forEach((element,index) => { let newChildrenItem:any= {} - // newChildrenItem.name = element.region//功能分区题目名称 - // newChildrenItem.area = element.area//功能分区面积 - // newChildrenItem.details = element.details//功能分区基本情况 - newChildrenItem.name = element.region//题目名称 - newChildrenItem.result = element.area + element.details//题目答案 + newChildrenItem.name = element.propertyName//题目名称 + newChildrenItem.result = element.propertyValue//题目答案 newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 - newChildrenItem.propertyType = 0//输入框类型 + newChildrenItem.propertyType = element.propertyType//输入框类型 newChildren.push(newChildrenItem) }) i.children = newChildren - delete i.selected - }) : null - //建筑的数据核验模块处理 - item.fireFacNodes ? item.fireFacNodes.forEach((i,key) => { - i.selected ? i.selected = null : null - //如果顶级节点未选中则需要筛除没有选中的数据 - if(!i.checked){ - let newArr = [] - i.children.forEach(element => { - element.checked ? newArr.push(element) : null - }) - let discard = []//即将废弃的数组 - newArr.length == 0 ? discard.push(i) : i.children = newArr - item.fireFacNodes = item.fireFacNodes.filter(items => { - if (!discard.includes(items)) return items; - }) - } + }else if(i.tabledata){//如果是表格类 let newChildren = [] i.children.forEach((element,index) => { let newChildrenItem:any= {} - newChildrenItem.name = element.name//题目名称 - newChildrenItem.result = element.total//题目答案 + newChildrenItem.name = element.propertyValue//题目名称 + newChildrenItem.result = element.tag//代表第几行 newChildrenItem.physicalUnit = ''//计量单位 - newChildrenItem.propertyType = 0//输入框类型 + newChildrenItem.propertyType = ''//输入框类型 newChildren.push(newChildrenItem) }) i.children = newChildren - delete i.selected - }) : null - }) + i.tabledata.forEach(element => { + let newData = [] + element.data.forEach(ele => { + let newObj:any = {} + newObj.name = ele.propertyName//题目名称 + newObj.result = ele.propertyValue//代表第几行 + newObj.physicalUnit = ele.physicalUnit//计量单位 + newObj.propertyType = ele.propertyType//输入框类型 + newObj.tag = ele.tag//第几行 + newData.push(newObj) + }) + element.data = newData + }) + } + delete i.selected - //循环每个建筑处理数据 - console.log(copyDatas) - - let paperDataInfo = [] - copyDatas.forEach((item,key) =>{ + }) + //建筑的四周毗邻模块处理 + item.aroundNodes.forEach((i,key) => { + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + let newArr = [] + i.children.forEach(element => { + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.aroundNodes = item.aroundNodes.filter(items => { + if (!discard.includes(items)) return items; + }) + } + let newChildren = [] + i.children.forEach((element,index) => { + let newChildrenItem:any= {} + newChildrenItem.name = element.title//题目名称 + newChildrenItem.result = element.name//题目答案 + newChildrenItem.physicalUnit = ''//计量单位 + newChildrenItem.propertyType = 0//输入框类型 + newChildren.push(newChildrenItem) + }) + i.children = newChildren + delete i.selected + }) + console.log(111,item) + //建筑的重点部位模块处理 + item.keySiteNodes ? item.keySiteNodes.forEach((i,key) => { + i.selected ? i.selected = null : null + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + let newArr = [] + i.children.forEach(element => { + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.keySiteNodes = item.keySiteNodes.filter(items => { + if (!discard.includes(items)) return items; + }) + } + i.tabledata = [{propertyName: "重点部位名称",data:[]}, + {propertyName: "重点部位所在位置",data:[]}, + {propertyName: "建筑结构",data:[]}, + {propertyName: "使用性质",data:[]}, + {propertyName: "主要危险性",data:[]}] + i.children.forEach(element => { + i.tabledata[0].data.push({ + name: "重点部位名称", + physicalUnit: '', + propertyType: 0, + result: element.name, + tag: "" + }) + i.tabledata[1].data.push({ + name: "重点部位所在位置", + physicalUnit: '', + propertyType: 0, + result: element.position, + tag: "" + }) + i.tabledata[2].data.push({ + name: "建筑结构", + physicalUnit: '', + propertyType: 0, + result: element.structure, + tag: "" + }) + i.tabledata[3].data.push({ + name: "使用性质", + physicalUnit: '', + propertyType: 0, + result: element.nature, + tag: "" + }) + i.tabledata[4].data.push({ + name: "主要危险性", + physicalUnit: '', + propertyType: 0, + result: element.hazards, + tag: "" + }) + }) + let newChildren = [] + i.children.forEach((element,index) => { + let newChildrenItem:any= {} + // newChildrenItem.name = element.name//重点部位题目名称 + // newChildrenItem.position = element.position//重点部位所在位置 + // newChildrenItem.structure = element.structure//重点部位建筑结构 + // newChildrenItem.nature = element.nature//重点部位使用性质 + // newChildrenItem.hazards = element.hazards//重点部位主要危险性 + newChildrenItem.name = element.name//题目名称 + newChildrenItem.result = element.position + element.structure + element.nature + element.hazards//题目答案 + newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 + newChildrenItem.propertyType = 0//输入框类型 + newChildren.push(newChildrenItem) + }) + i.children = newChildren + delete i.selected + + + }) : null + //建筑的功能分区模块处理 + item.funDivNodes ? item.funDivNodes.forEach((i,key) => { + + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + let newArr = [] + i.children.forEach(element => { + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.funDivNodes = item.funDivNodes.filter(items => { + if (!discard.includes(items)) return items; + }) + } + + i.tabledata = [{propertyName: "区域",data:[]}, + {propertyName: "面积",data:[]}, + {propertyName: "基本情况",data:[]}] + i.children.forEach(element => { + i.tabledata[0].data.push({ + name: "区域", + physicalUnit: '', + propertyType: 0, + result: element.region, + tag: "" + }) + i.tabledata[1].data.push({ + name: "面积", + physicalUnit: '', + propertyType: 0, + result: element.area, + tag: "" + }) + i.tabledata[2].data.push({ + name: "基本情况", + physicalUnit: '', + propertyType: 0, + result: element.details, + tag: "" + }) + }) + let newChildren = [] + i.children.forEach((element,index) => { + let newChildrenItem:any= {} + // newChildrenItem.name = element.region//功能分区题目名称 + // newChildrenItem.area = element.area//功能分区面积 + // newChildrenItem.details = element.details//功能分区基本情况 + newChildrenItem.name = element.region//题目名称 + newChildrenItem.result = element.area + element.details//题目答案 + newChildrenItem.physicalUnit = element.physicalUnit || ''//计量单位 + newChildrenItem.propertyType = 0//输入框类型 + newChildren.push(newChildrenItem) + }) + i.children = newChildren + delete i.selected + }) : null + //建筑的数据核验模块处理 + item.fireFacNodes ? item.fireFacNodes.forEach((i,key) => { + i.selected ? i.selected = null : null + //如果顶级节点未选中则需要筛除没有选中的数据 + if(!i.checked){ + let newArr = [] + i.children.forEach(element => { + element.checked ? newArr.push(element) : null + }) + let discard = []//即将废弃的数组 + newArr.length == 0 ? discard.push(i) : i.children = newArr + item.fireFacNodes = item.fireFacNodes.filter(items => { + if (!discard.includes(items)) return items; + }) + } + let newChildren = [] + i.children.forEach((element,index) => { + let newChildrenItem:any= {} + newChildrenItem.name = element.name//题目名称 + newChildrenItem.result = element.total//题目答案 + newChildrenItem.physicalUnit = ''//计量单位 + newChildrenItem.propertyType = 0//输入框类型 + newChildren.push(newChildrenItem) + }) + i.children = newChildren + delete i.selected + }) : null + }) + + //将筛选出来的数据变为服务器提交数据 + let paperDataInfo = [] + copyDatas.forEach((item,key) =>{ paperDataInfo[key] = {} paperDataInfo[key].id = null paperDataInfo[key].paperId = null @@ -1050,19 +1080,48 @@ export class CreateTestScoreComponent implements OnInit { paperDataInfo[key].functionalDivisionScore = item.funDivScore paperDataInfo[key].facilityData = item.fireFacNodes ? JSON.stringify(item.fireFacNodes) : '[]' paperDataInfo[key].facilityScore = item.fireFacScore - }) - - console.log(paperDataInfo) - - const dialogRef = this.dialog.open(FinishDialog, { - width: '650px', - data: paperDataInfo - }); + }) - dialogRef.afterClosed().subscribe(result => { - + // console.log(123456,paperDataInfo) + //判断是否存在总分填写后没有勾选 或者勾选了没有填写总分的情况 + paperDataInfo.forEach(element => { + //判断存在总分填写后没有勾选题目 + if( (element.basicInfoScore != 0 && JSON.parse(element.basicInfoData).length == 0) || + (element.adjoinScore != 0 && JSON.parse(element.adjoinData).length == 0) || + (element.importLocationScore != 0 && JSON.parse(element.importLocationData).length == 0) || + (element.functionalDivisionScore != 0 && JSON.parse(element.functionalDivisionData).length == 0) || + (element.facilityScore != 0 && JSON.parse(element.facilityData).length == 0) ){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('存在填写过总分,但未勾选题目的分组','确定',config); + return + }else + //勾选了题目存在没有填写总分 + if( + (element.basicInfoScore == 0 && JSON.parse(element.basicInfoData).length != 0) || + (element.adjoinScore == 0 && JSON.parse(element.adjoinData).length != 0) || + (element.importLocationScore == 0 && JSON.parse(element.importLocationData).length != 0) || + (element.functionalDivisionScore == 0 && JSON.parse(element.functionalDivisionData).length != 0) || + (element.facilityScore == 0 && JSON.parse(element.facilityData).length != 0) ){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('存在勾选过题目,但未填写总分的分组','确定',config); + return + }else{ + const dialogRef = this.dialog.open(FinishDialog, { + width: '650px', + data: paperDataInfo + }); + dialogRef.afterClosed().subscribe(result => { + + }); + } - }); + + }) + } //上一步 goBack(){ @@ -1142,7 +1201,8 @@ export class AddPlanTwoDialog { companyId:this.data.companyData.companyData.id }}).subscribe((data:any) => { data.items.forEach(item => { - item.planType == 1 ? planArr.push(item) : null + //二维预案并且审核通过 + (item.planType == 1 && item.auditStatus == 2) ? planArr.push(item) : null }) this.dataSource = planArr }) @@ -1162,10 +1222,15 @@ export class AddPlanTwoDialog { sessionStorage.setItem('companyId',this.data.companyData.companyData.id) window.open('/canvasTool') }else{ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('请选择要添加的预案','确定',config); + if(this.dataSource.length == 0){ + this.dialogRef.close(); + }else{ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('请选择要添加的预案','确定',config); + } + } }else{//如果选择的是自定义预案 diff --git a/src/app/examiner/create-test-score/lookTreeNode.html b/src/app/examiner/create-test-score/lookTreeNode.html index f05b3eb..fb85e7e 100644 --- a/src/app/examiner/create-test-score/lookTreeNode.html +++ b/src/app/examiner/create-test-score/lookTreeNode.html @@ -14,7 +14,7 @@ {{item.propertyName}} - {{i.data[key]. propertyValue}} + {{i.data[key]. propertyValue ? i.data[key]. propertyValue : '无'}} From 8c3e6cced1a42c2643ac2352ae24ffbda4ec40da Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Thu, 17 Dec 2020 14:15:11 +0800 Subject: [PATCH 11/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=BC=95=E5=85=A5?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9F=A5=E7=9C=8B=E6=8F=92=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B4=A0=E6=9D=90icon=E7=82=B9=E5=87=BBbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- angular.json | 3 ++- package.json | 10 ++++----- .../collection-tools.component.html | 5 +++-- .../collection-tools.component.scss | 3 +++ .../collection-tools.component.ts | 22 +++++++++++++------ 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/angular.json b/angular.json index b7c2067..07cf0ab 100644 --- a/angular.json +++ b/angular.json @@ -29,7 +29,8 @@ "src/assets" ], "styles": [ - "src/styles.scss" + "src/styles.scss", + "node_modules/viewerjs/dist/viewer.css" ], "scripts": [ "node_modules/echarts/dist/echarts.js", diff --git a/package.json b/package.json index 77587c1..d86f914 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "@angular/router": "~9.0.0", "@types/cesium": "^1.59.5", "angular-calendar": "^0.28.2", + "bson-objectid": "^1.3.1", "cesium": "^1.64.0", "e-ngx-cesium": "^6.3.2", "echarts": "^4.6.0", @@ -32,13 +33,12 @@ "ng2-file-upload": "^1.4.0", "ngx-echarts": "^4.2.2", "ngx-perfect-scrollbar": "^8.0.0", - "rxjs": "~6.5.4", - "tslib": "^1.10.0", - "viewerjs": "^1.6.2", - "swiper": "^5.3.7", "pixi-filters": "^3.1.1", "pixi.js": "^5.3.2", - "bson-objectid": "^1.3.1", + "rxjs": "~6.5.4", + "swiper": "^5.3.7", + "tslib": "^1.10.0", + "viewerjs": "^1.9.0", "zone.js": "~0.10.2" }, "devDependencies": { diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index f5daa5e..30e94a0 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -103,8 +103,9 @@
+ - + @@ -126,7 +127,7 @@ {{node.name}} - ({{node.children.length}}) + ({{node.children.length}}) visibility diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index be59497..ad57cdc 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -1,4 +1,7 @@ @import './panel.scss'; +::-webkit-scrollbar { + display: none; /* Chrome Safari */ +} .content { width: 100%; height: 100%; diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index cd4e9d3..815a037 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -1134,15 +1134,15 @@ export class CollectionToolsComponent implements OnInit { //处理 tree 数据结构 handleTreeData (storeyData) { - + //storeyData为当前楼层拥有的消防设施 this.storeyData = storeyData let data = this.allFireElements //所有消防要素模板 let treeData = [] //tree型 处理完成后的数据 + data.forEach(element => { element.isTemplate = true //添加模板标识 element.isLook = true //添加是否可见标识 - element.name!='其他'? element.children = [] : null - + element.name != '其他' ? element.children = [] : null if(storeyData){ for(let key in storeyData.data){ storeyData.data[key].isLookPattern = true @@ -1161,8 +1161,6 @@ export class CollectionToolsComponent implements OnInit { } }) } - // - element.children.push(storeyData.data[key]) } } @@ -1172,7 +1170,9 @@ export class CollectionToolsComponent implements OnInit { data.forEach(element => { if (!element.parentId) { treeData.push(element) } }); + this.dataSource.data = treeData + this.treeControl.expandAll() } @@ -1203,7 +1203,7 @@ export class CollectionToolsComponent implements OnInit { this.canvas.setHighlight(iconHighLightArr) } - //点击数节点的显示隐藏icon + //点击树节点的显示隐藏icon clickLookItem(node){ //修改真实素材islook属性 @@ -1214,9 +1214,16 @@ export class CollectionToolsComponent implements OnInit { } //所有消防要素模板变化islook值 + if(node.isTemplate && node.name == "其他"){ + this.allFireElements.forEach(item=>{ + if(item.name == "其他"){ + item.isLook = !item.isLook + } + }) + } if(node.isTemplate){ this.allFireElements.forEach(item=>{ - if(item.id == node.id || item.name == "其他"){ + if(item.id == node.id){ item.isLook = !item.isLook } }) @@ -1270,6 +1277,7 @@ export class CollectionToolsComponent implements OnInit { iconVisibleArr.push(node.id) } this.canvas.setIconVisible(iconVisibleArr,!node.isLook) + } //计算 可视区域内宽度, 是否缩放背景图 From 0db3a4639c97c313eb666421bc7d76db3f8f5769 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Fri, 18 Dec 2020 09:59:41 +0800 Subject: [PATCH 12/24] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E9=80=92=E5=BD=92?= =?UTF-8?q?=E8=BF=87=E6=BB=A4tree=E5=9E=8B=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collection-tools.component.html | 8 ++-- .../collection-tools.component.ts | 38 ++++++++++++++++++- src/app/working-area/model/singlePointIcon.ts | 2 +- .../working-area/working-area.component.ts | 2 +- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 30e94a0..f15e4cf 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -38,7 +38,7 @@
-
+