diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index ead61d3..6c58c6c 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -5,7 +5,6 @@ import { FormControl } from '@angular/forms'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { IsLoginService } from '../is-login.service' -import { AllFileComponent } from '../ui/all-file/all-file.component'; import { ComponentServiceService } from '../component-service.service'; import { Router,ActivatedRoute } from '@angular/router' @Component({ diff --git a/src/app/pipes/size.pipe.ts b/src/app/pipes/size.pipe.ts index 5a58dcc..5cff3f8 100644 --- a/src/app/pipes/size.pipe.ts +++ b/src/app/pipes/size.pipe.ts @@ -1,24 +1,4 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({name: 'size'}) -export class SizePipe implements PipeTransform { - transform(byte: number): string { - if(byte < 1048576 && byte != 0){//如果小于1M - let size = byte / 1024 - return size.toFixed(1) + 'KB' - } - if(byte >= 1048576 && byte < 1073741824){//如果大于1M 小于1G - let size = byte / 1048576 - return size.toFixed(1) + 'MB' - } - if(byte >= 1073741824){//如果大于1G - let size = byte / 1073741824 - return size.toFixed(1) + 'GB' - } - if(byte < 1048576 && byte == 0){//如果是文件夹 - return '--' - } - } -} @Pipe({name: 'name'}) export class NamePipe implements PipeTransform { transform(name: string): string { diff --git a/src/app/ui/all-file/all-file.component.html b/src/app/ui/all-file/all-file.component.html deleted file mode 100644 index 346fb37..0000000 --- a/src/app/ui/all-file/all-file.component.html +++ /dev/null @@ -1,159 +0,0 @@ - -
-
-
-
- backup 上传 - -
-
-
- 上传文件 - -
-
- 上传文件夹 - -
-
-
-
- create_new_folder 新建文件夹 -
- -
- save_alt 下载 -
- -
- delete 删除 -
- -
- - 上传中... - -
- - - -
- - 下载中... - -
-
- -
-
-
- 返回根目录 -   - 返回上一级 - | - 全部文件 - → - {{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() - } - - - -}