From 129c1aa3a6360e5e50be36e05d8211752c8b7e53 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 10 Dec 2020 11:34:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]ng-zorro=E6=97=B6?=
=?UTF-8?q?=E9=97=B4=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 73 +++++++++++++++++--
package.json | 2 +-
.../ui/create-exam/create-exam.component.ts | 8 +-
.../eharts-statistics.component.html | 7 +-
.../learning-record-details.component.html | 4 +-
src/app/ui/ui.module.ts | 7 +-
src/styles.scss | 2 +-
7 files changed, 84 insertions(+), 19 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index d88c972..b5831d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -463,6 +463,30 @@
"resolved": "https://registry.npm.taobao.org/@angular/router/download/@angular/router-9.0.0.tgz",
"integrity": "sha1-EXhPyM6cszFMfsEIP/m+fGERgcI="
},
+ "@ant-design/colors": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz?cache=0&sync_timestamp=1596611396536&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcolors%2Fdownload%2F%40ant-design%2Fcolors-3.2.2.tgz",
+ "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=",
+ "requires": {
+ "tinycolor2": "^1.4.1"
+ }
+ },
+ "@ant-design/icons-angular": {
+ "version": "10.0.1",
+ "resolved": "https://registry.npm.taobao.org/@ant-design/icons-angular/download/@ant-design/icons-angular-10.0.1.tgz?cache=0&sync_timestamp=1601105390624&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons-angular%2Fdownload%2F%40ant-design%2Ficons-angular-10.0.1.tgz",
+ "integrity": "sha1-0Rc/YpU1wegqBSiP2VuOBbwnLWE=",
+ "requires": {
+ "@ant-design/colors": "^3.1.0",
+ "tslib": "^2.0.0"
+ },
+ "dependencies": {
+ "tslib": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-2.0.2.tgz?cache=0&sync_timestamp=1601998793819&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-2.0.2.tgz",
+ "integrity": "sha1-RiKVYxGF20SyGx6jYVtjzRwDgkI="
+ }
+ }
+ },
"@babel/code-frame": {
"version": "7.5.5",
"resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.5.5.tgz",
@@ -6531,11 +6555,6 @@
"assert-plus": "^1.0.0"
}
},
- "date-fns": {
- "version": "2.9.0",
- "resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-2.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.9.0.tgz",
- "integrity": "sha1-0LF1pcN+1fF7l+InK7wfpa7Gd9I="
- },
"date-format": {
"version": "2.1.0",
"resolved": "https://registry.npm.taobao.org/date-format/download/date-format-2.1.0.tgz?cache=0&sync_timestamp=1572559173297&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-format%2Fdownload%2Fdate-format-2.1.0.tgz",
@@ -11395,6 +11414,45 @@
"integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=",
"dev": true
},
+ "ng-zorro-antd": {
+ "version": "10.0.0",
+ "resolved": "https://registry.npm.taobao.org/ng-zorro-antd/download/ng-zorro-antd-10.0.0.tgz?cache=0&sync_timestamp=1601298489342&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fng-zorro-antd%2Fdownload%2Fng-zorro-antd-10.0.0.tgz",
+ "integrity": "sha1-tLw3rZwAqcWbFvN6ccf+cadXOA4=",
+ "requires": {
+ "@angular/cdk": "^10.0.0",
+ "@ant-design/icons-angular": "^10.0.0",
+ "date-fns": "^2.10.0",
+ "resize-observer-polyfill": "^1.5.1",
+ "tslib": "^2.0.0"
+ },
+ "dependencies": {
+ "@angular/cdk": {
+ "version": "10.2.4",
+ "resolved": "https://registry.npm.taobao.org/@angular/cdk/download/@angular/cdk-10.2.4.tgz?cache=0&sync_timestamp=1601937314503&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40angular%2Fcdk%2Fdownload%2F%40angular%2Fcdk-10.2.4.tgz",
+ "integrity": "sha1-ZWCVZIrwBef6AsTMaIZb5L9Z/BA=",
+ "requires": {
+ "parse5": "^5.0.0",
+ "tslib": "^2.0.0"
+ }
+ },
+ "date-fns": {
+ "version": "2.16.1",
+ "resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-2.16.1.tgz?cache=0&sync_timestamp=1598884189690&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.16.1.tgz",
+ "integrity": "sha1-BXdXksPzMx2oEq8lPhqTWFHTg0s="
+ },
+ "parse5": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npm.taobao.org/parse5/download/parse5-5.1.1.tgz",
+ "integrity": "sha1-9o5OW6GFKsLK3AD0VV//bCq7YXg=",
+ "optional": true
+ },
+ "tslib": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-2.0.2.tgz?cache=0&sync_timestamp=1601998793819&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-2.0.2.tgz",
+ "integrity": "sha1-RiKVYxGF20SyGx6jYVtjzRwDgkI="
+ }
+ }
+ },
"ng2-file-upload": {
"version": "1.4.0",
"resolved": "https://registry.npm.taobao.org/ng2-file-upload/download/ng2-file-upload-1.4.0.tgz",
@@ -15213,6 +15271,11 @@
"integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
"dev": true
},
+ "tinycolor2": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz?cache=0&sync_timestamp=1601056446986&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftinycolor2%2Fdownload%2Ftinycolor2-1.4.2.tgz",
+ "integrity": "sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM="
+ },
"tinyqueue": {
"version": "1.2.3",
"resolved": "https://registry.npm.taobao.org/tinyqueue/download/tinyqueue-1.2.3.tgz",
diff --git a/package.json b/package.json
index ad99b89..a5c6b81 100644
--- a/package.json
+++ b/package.json
@@ -25,10 +25,10 @@
"@types/cesium": "^1.59.5",
"angular-calendar": "^0.28.2",
"cesium": "^1.64.0",
- "date-fns": "^2.9.0",
"e-ngx-cesium": "^6.3.2",
"echarts": "^4.6.0",
"firebase": "^7.6.2",
+ "ng-zorro-antd": "^10.0.0",
"ng2-file-upload": "^1.4.0",
"ngx-echarts": "^4.2.2",
"ngx-perfect-scrollbar": "^8.0.0",
diff --git a/src/app/ui/create-exam/create-exam.component.ts b/src/app/ui/create-exam/create-exam.component.ts
index bf5114e..388b4d2 100644
--- a/src/app/ui/create-exam/create-exam.component.ts
+++ b/src/app/ui/create-exam/create-exam.component.ts
@@ -41,7 +41,7 @@ export class CreateExamComponent implements OnInit {
}
}
-import getISOWeek from 'date-fns/getISOWeek';
+// import getISOWeek from 'date-fns/getISOWeek';
//创建组织
@Component({
selector: 'CreateDialog',
@@ -66,9 +66,9 @@ export class CreateDialog {
onChange(result: Date[]): void {
console.log('onChange: ', result);
}
- getWeek(result: Date[]): void {
- console.log('week: ', result.map(getISOWeek));
- }
+ // getWeek(result: Date[]): void {
+ // console.log('week: ', result.map(getISOWeek));
+ // }
}
diff --git a/src/app/ui/eharts-statistics/eharts-statistics.component.html b/src/app/ui/eharts-statistics/eharts-statistics.component.html
index a8f0263..e2d13d1 100644
--- a/src/app/ui/eharts-statistics/eharts-statistics.component.html
+++ b/src/app/ui/eharts-statistics/eharts-statistics.component.html
@@ -9,7 +9,7 @@
-
-
+
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
index 460a05e..a45b7b6 100644
--- a/src/app/ui/learning-record-details/learning-record-details.component.html
+++ b/src/app/ui/learning-record-details/learning-record-details.component.html
@@ -5,7 +5,7 @@
-
+
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index 0b5e8db..d2ff06f 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -17,7 +17,7 @@ import {MatCardModule} from '@angular/material/card';
import {MatCheckboxModule} from '@angular/material/checkbox';
import {MatChipsModule} from '@angular/material/chips';
import {MatStepperModule} from '@angular/material/stepper';
-import {MatDatepickerModule} from '@angular/material/datepicker';
+// import {MatDatepickerModule} from '@angular/material/datepicker';
import {MatDialogModule} from '@angular/material/dialog';
import {MatDividerModule} from '@angular/material/divider';
import {MatExpansionModule} from '@angular/material/expansion';
@@ -67,11 +67,12 @@ 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';
@NgModule({
declarations: [FolderDialog,ViewDetails,PersonaldataComponent, ChangepasswordComponent,SizePipe,NamePipe,NamePipe2,NamePipe3,ConfirmpswDirective, AllFileComponent, ChangeuserdataComponent, LoginComponent, UploadFilesComponent,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,TeacherManagementComponent,editTeacher,AddTeacher,seeTeacher, LearningRecordDetailsComponent, EhartsStatisticsComponent, CreateExamComponent, LookOverTestComponent, StatisticAnalysisComponent, JoinExamComponent, TestRecordsComponent,testState,CreateDialog],
imports: [
+ NzDatePickerModule,
CommonModule,
UiRoutingModule,
A11yModule,
@@ -88,7 +89,7 @@ import { TestRecordsComponent } from './test-records/test-records.component'
MatCheckboxModule,
MatChipsModule,
MatStepperModule,
- MatDatepickerModule,
+ // MatDatepickerModule,
MatDialogModule,
MatDividerModule,
MatExpansionModule,
diff --git a/src/styles.scss b/src/styles.scss
index bef4481..ab2c0a7 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,6 +1,6 @@
@import './app/theme.scss';
-
+@import "~ng-zorro-antd/date-picker/style/index.min.css"; /* 引入组件样式 */
html,body{
width: 100%;
height: 100%;
From 304bced4d64a5ecfec16c34e9b7dcbfcf9a849dd Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 10 Dec 2020 12:11:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E6=96=B0=E5=BB=BA]=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E8=80=83=E5=AE=98=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/examiner/examiner-routing.ts | 12 ++++
src/app/examiner/examiner.module.ts | 103 +++++++++++++++++++++++++++
2 files changed, 115 insertions(+)
create mode 100644 src/app/examiner/examiner-routing.ts
create mode 100644 src/app/examiner/examiner.module.ts
diff --git a/src/app/examiner/examiner-routing.ts b/src/app/examiner/examiner-routing.ts
new file mode 100644
index 0000000..df76be0
--- /dev/null
+++ b/src/app/examiner/examiner-routing.ts
@@ -0,0 +1,12 @@
+import { Routes, RouterModule } from '@angular/router';
+import { NgModule } from '@angular/core';
+
+const routes: Routes = [
+ // { path: '', component:CreateExamComponent }
+
+]
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule]
+})
+export class examinerRoutingModule {}
diff --git a/src/app/examiner/examiner.module.ts b/src/app/examiner/examiner.module.ts
new file mode 100644
index 0000000..ee2f7dc
--- /dev/null
+++ b/src/app/examiner/examiner.module.ts
@@ -0,0 +1,103 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { examinerRoutingModule } from './examiner-routing';
+
+import {A11yModule} from '@angular/cdk/a11y';
+import {DragDropModule} from '@angular/cdk/drag-drop';
+import {PortalModule} from '@angular/cdk/portal';
+import {ScrollingModule} from '@angular/cdk/scrolling';
+import {CdkStepperModule} from '@angular/cdk/stepper';
+import {CdkTableModule} from '@angular/cdk/table';
+import {CdkTreeModule} from '@angular/cdk/tree';
+import {MatAutocompleteModule} from '@angular/material/autocomplete';
+import {MatBadgeModule} from '@angular/material/badge';
+import {MatBottomSheetModule} from '@angular/material/bottom-sheet';
+import {MatButtonModule} from '@angular/material/button';
+import {MatButtonToggleModule} from '@angular/material/button-toggle';
+import {MatCardModule} from '@angular/material/card';
+import {MatCheckboxModule} from '@angular/material/checkbox';
+import {MatChipsModule} from '@angular/material/chips';
+import {MatStepperModule} from '@angular/material/stepper';
+// import {MatDatepickerModule} from '@angular/material/datepicker';
+import {MatDialogModule} from '@angular/material/dialog';
+import {MatDividerModule} from '@angular/material/divider';
+import {MatExpansionModule} from '@angular/material/expansion';
+import {MatGridListModule} from '@angular/material/grid-list';
+import {MatIconModule} from '@angular/material/icon';
+import {MatInputModule} from '@angular/material/input';
+import {MatListModule} from '@angular/material/list';
+import {MatMenuModule} from '@angular/material/menu';
+import {MatNativeDateModule, MatRippleModule, MatOption} from '@angular/material/core';
+import {MatPaginatorModule} from '@angular/material/paginator';
+import {MatProgressBarModule} from '@angular/material/progress-bar';
+import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {MatRadioModule} from '@angular/material/radio';
+import {MatSelectModule} from '@angular/material/select';
+import {MatSidenavModule} from '@angular/material/sidenav';
+import {MatSliderModule} from '@angular/material/slider';
+import {MatSlideToggleModule} from '@angular/material/slide-toggle';
+import {MatSnackBarModule} from '@angular/material/snack-bar';
+import {MatSortModule} from '@angular/material/sort';
+import {MatTableModule} from '@angular/material/table';
+import {MatTabsModule} from '@angular/material/tabs';
+import {MatToolbarModule} from '@angular/material/toolbar';
+import {MatTooltipModule} from '@angular/material/tooltip';
+import {MatTreeModule} from '@angular/material/tree';
+import { ReactiveFormsModule, FormsModule } from '@angular/forms';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatPaginatorIntl } from '@angular/material/paginator';
+import { myPaginator } from '../ui/my-paginator';
+
+@NgModule({
+ declarations: [],
+ imports: [
+ CommonModule,
+ examinerRoutingModule,
+ A11yModule,
+ CdkStepperModule,
+ CdkTableModule,
+ CdkTreeModule,
+ DragDropModule,
+ MatAutocompleteModule,
+ MatBadgeModule,
+ MatBottomSheetModule,
+ MatButtonModule,
+ MatButtonToggleModule,
+ MatCardModule,
+ MatCheckboxModule,
+ MatChipsModule,
+ MatStepperModule,
+ // MatDatepickerModule,
+ MatDialogModule,
+ MatDividerModule,
+ MatExpansionModule,
+ MatGridListModule,
+ MatIconModule,
+ MatInputModule,
+ MatListModule,
+ MatMenuModule,
+ MatNativeDateModule,
+ MatPaginatorModule,
+ MatProgressBarModule,
+ MatProgressSpinnerModule,
+ MatRadioModule,
+ MatRippleModule,
+ MatSelectModule,
+ MatSidenavModule,
+ MatSliderModule,
+ MatSlideToggleModule,
+ MatSnackBarModule,
+ MatSortModule,
+ MatTableModule,
+ MatTabsModule,
+ MatToolbarModule,
+ MatTooltipModule,
+ MatTreeModule,
+ PortalModule,
+ ScrollingModule,
+ ReactiveFormsModule,
+ FormsModule
+ ],
+ providers: [ { provide: MatPaginatorIntl, useValue: myPaginator() } ]
+})
+export class ExaminerModule { }