diff --git a/angular.json b/angular.json index b44cd73..9f80c8d 100644 --- a/angular.json +++ b/angular.json @@ -36,13 +36,13 @@ "node_modules/echarts/dist/echarts.js", "src/assets/mTokenK1/mToken_K1.js", "./node_modules/swiper/js/swiper.min.js", - "src/assets/chartstheme/chongqing.js", "src/assets/chartstheme/westeros.js", "src/assets/chartstheme/walden.js", "src/assets/chartstheme/westeros.js", "src/assets/chartstheme/echarts-skin.js", - "src/assets/qrcode/qrcode.min.js" + "src/assets/qrcode/qrcode.min.js", + "./node_modules/crypto-js/crypto-js.js" ] }, "configurations": { diff --git a/src/app/data-collection/fire-force/fire-force.component.ts b/src/app/data-collection/fire-force/fire-force.component.ts index 599645d..02b6199 100644 --- a/src/app/data-collection/fire-force/fire-force.component.ts +++ b/src/app/data-collection/fire-force/fire-force.component.ts @@ -9,7 +9,7 @@ import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree' import { NzTreeNode } from 'ng-zorro-antd/tree'; import { TreeService } from 'src/app/http-interceptors/tree.service'; import Viewer from 'viewerjs' -import CryptoJS from 'crypto-js/crypto-js' +declare var CryptoJS declare var AMap: any; @Component({ diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.ts b/src/app/data-collection/linkage-forces/linkage-forces.component.ts index 4d8d41c..41b9dc8 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.ts +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.ts @@ -10,7 +10,7 @@ import { NzTreeNode } from 'ng-zorro-antd/tree'; import { TreeService } from 'src/app/http-interceptors/tree.service'; import Viewer from 'viewerjs' import Swiper from 'swiper'; -import CryptoJS from 'crypto-js/crypto-js' +declare var CryptoJS declare var AMap: any; @Component({ selector: 'app-linkage-forces', diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts index 93550be..de9ea80 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -11,7 +11,7 @@ import { FormControl } from '@angular/forms'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { HttpClient } from '@angular/common/http' import { DomSanitizer } from '@angular/platform-browser'; -import CryptoJS from 'crypto-js/crypto-js' +declare var CryptoJS @Component({ selector: 'app-plan-record', diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index 847e82d..6089526 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -10,7 +10,7 @@ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { HttpClient } from '@angular/common/http' -import CryptoJS from 'crypto-js/crypto-js' +declare var CryptoJS import { DomSanitizer } from '@angular/platform-browser'; declare var echarts: any; diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index dfcb011..fa75acc 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -13,7 +13,7 @@ import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import { async } from '@angular/core/testing'; import { Viewer } from 'photo-sphere-viewer'; import {STEPPER_GLOBAL_OPTIONS} from '@angular/cdk/stepper'; -import CryptoJS from 'crypto-js/crypto-js' +declare var CryptoJS @Component({ selector: 'app-entry-plan-look', templateUrl: './entry-plan-look.component.html', diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index 286cc16..9436fb0 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -9,11 +9,7 @@ import { PageEvent } from '@angular/material/paginator'; import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { TreeService } from '../../http-interceptors/tree.service' -import CryptoJS from 'crypto-js/crypto-js' -//import Base64 from 'crypto-js/enc-base64'; - - - +declare var CryptoJS @Component({ selector: 'app-meet-plan', templateUrl: './meet-plan.component.html', diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index 8922a76..94b6957 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -20,7 +20,7 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { TreeService } from '../../http-interceptors/tree.service' import { ConstantPool } from '@angular/compiler'; import { MatTableDataSource } from '@angular/material/table'; -import CryptoJS from 'crypto-js/crypto-js' +declare var CryptoJS @Component({ diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 0212d39..047d499 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -9,7 +9,7 @@ import { PageEvent } from '@angular/material/paginator'; import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { TreeService } from '../../http-interceptors/tree.service' -import CryptoJS from 'crypto-js/crypto-js' +declare var CryptoJS @Component({ selector: 'app-pass-plan', templateUrl: './pass-plan.component.html', diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index 76dfee7..fd135e3 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -17,7 +17,7 @@ import { PageEvent } from '@angular/material/paginator'; import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { TreeService } from '../../http-interceptors/tree.service' -import CryptoJS from 'crypto-js/crypto-js' +declare var CryptoJS @Component({ selector: 'app-type-plan',