升级到ng13

.gitignore

@@ -44,3 +44,4 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+/.angular/cache

angular.json

@@ -8,7 +8,7 @@
       "schematics": {
         "@schematics/angular:component": {
           "style": "scss",
-          "spec": false
+          "skipTests": true
         }
       },
       "root": "",
@@ -23,7 +23,6 @@
             "main": "src/main.ts",
             "polyfills": "src/polyfills.ts",
             "tsConfig": "tsconfig.app.json",
-            "aot": true,
             "assets": [
               "src/favicon.ico",
               "src/assets",
@@ -53,7 +52,13 @@
               "./node_modules/swiper/js/swiper.min.js",
               "node_modules/@aspnet/signalr/dist/browser/signalr.min.js",
               "node_modules/abp-web-resources/Abp/Framework/scripts/abp.js"
-            ]
+            ],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -66,7 +71,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
@@ -84,7 +88,8 @@
                 }
               ]
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",

e2e/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

package.json

@@ -1,84 +1,88 @@
 {
-  "name": "anxin119",
-  "version": "0.0.0",
-  "scripts": {
-    "ng": "ng",
-    "start": "ng serve --proxy-config  proxy.config.json  --open --port 4200 ",
-    "build": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod",
-    "test": "ng test",
-    "lint": "ng lint",
-    "e2e": "ng e2e"
-  },
-  "private": true,
-  "dependencies": {
-    "@angular/animations": "^9.0.0",
-    "@angular/cdk": "^9.2.4",
-    "@angular/common": "~9.0.0",
-    "@angular/compiler": "~9.0.0",
-    "@angular/core": "~9.0.0",
-    "@angular/fire": "^5.3.0",
-    "@angular/forms": "~9.0.0",
-    "@angular/material": "^9.0.0",
-    "@angular/platform-browser": "~9.0.0",
-    "@angular/platform-browser-dynamic": "~9.0.0",
-    "@angular/router": "~9.0.0",
-    "@aspnet/signalr": "^1.1.4",
-    "@babylonjs/core": "4.2.1",
-    "@babylonjs/gui": "4.2.1",
-    "@babylonjs/inspector": "4.2.1",
-    "@babylonjs/loaders": "4.2.1",
-    "@babylonjs/materials": "4.2.1",
-    "@types/cesium": "^1.59.5",
-    "@types/earcut": "^2.1.1",
-    "@types/react-dom": "^17.0.10",
-    "@types/swiper": "^5.2.1",
-    "abp-ng2-module": "^6.4.0",
-    "abp-web-resources": "^5.4.0",
-    "angular-calendar": "^0.28.2",
-    "babylonjs": "4.2.1",
-    "bson-objectid": "^1.3.1",
-    "cesium": "^1.64.0",
-    "class-transformer": "^0.4.0",
-    "e-ngx-cesium": "^6.3.2",
-    "earcut": "^2.2.3",
-    "echarts": "^4.9.0",
-    "firebase": "^7.6.2",
-    "grpc": "^1.24.2",
-    "install": "^0.13.0",
-    "js-base64": "^3.7.2",
-    "linqjs": "^1.0.2",
-    "moment": "^2.29.1",
-    "ng-zorro-antd": "^9.3.0",
-    "ngx-cookie-service": "^3.0.2",
-    "ngx-countdown": "^11.0.0",
-    "ngx-echarts": "^4.2.2",
-    "ngx-perfect-scrollbar": "^8.0.0",
-    "reflect-metadata": "^0.1.13",
-    "rxjs": "~6.5.4",
-    "swiper": "^5.3.6",
-    "tslib": "^1.10.0",
-    "viewerjs": "^1.6.2",
-    "zone.js": "~0.10.2"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "~0.900.1",
-    "@angular/cli": "~9.0.1",
-    "@angular/compiler-cli": "~9.0.0",
-    "@angular/language-service": "~9.0.0",
-    "@types/jasmine": "~3.3.8",
-    "@types/jasminewd2": "~2.0.3",
-    "@types/node": "^12.11.1",
-    "codelyzer": "^5.1.2",
-    "jasmine-core": "~3.4.0",
-    "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~4.1.0",
-    "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.0",
-    "protractor": "~5.4.0",
-    "ts-node": "~7.0.0",
-    "tslint": "~5.15.0",
-    "typescript": "~3.7.5"
-  }
+    "name": "anxin119",
+    "version": "0.0.0",
+    "scripts": {
+        "ng": "ng",
+        "start": "ng serve --proxy-config  proxy.config.json  --open --port 4200 ",
+        "build": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --configuration production",
+        "test": "ng test",
+        "lint": "ng lint",
+        "e2e": "ng e2e"
+    },
+    "private": true,
+    "dependencies": {
+        "@angular/animations": "^13.3.11",
+        "@angular/cdk": "~13.3.9",
+        "@angular/common": "~13.3.11",
+        "@angular/compiler": "~13.3.11",
+        "@angular/core": "~13.3.11",
+        "@angular/fire": "^5.3.0",
+        "@angular/forms": "~13.3.11",
+        "@angular/material": "9",
+        "@angular/platform-browser": "~13.3.11",
+        "@angular/platform-browser-dynamic": "~13.3.11",
+        "@angular/router": "~13.3.11",
+        "@aspnet/signalr": "^1.1.4",
+        "@babylonjs/core": "5.27.0",
+        "@babylonjs/gui": "^5.27.0",
+        "@babylonjs/gui-editor": "^5.27.0",
+        "@babylonjs/inspector": "^5.27.0",
+        "@babylonjs/loaders": "^5.27.0",
+        "@babylonjs/materials": "^5.27.0",
+        "@babylonjs/serializers": "^5.28.0",
+        "@types/cesium": "^1.59.5",
+        "@types/earcut": "^2.1.1",
+        "@types/react": "^18.0.21",
+        "@types/react-dom": "^17.0.10",
+        "@types/swiper": "^5.2.1",
+        "abp-ng2-module": "^6.4.0",
+        "abp-web-resources": "^5.4.0",
+        "angular-calendar": "^0.28.2",
+        "babylonjs": "4.2.1",
+        "babylonjs-gltf2interface": "^5.28.0",
+        "bson-objectid": "^1.3.1",
+        "cesium": "^1.64.0",
+        "class-transformer": "^0.4.0",
+        "e-ngx-cesium": "^6.3.2",
+        "earcut": "^2.2.3",
+        "echarts": "^4.9.0",
+        "firebase": "^7.6.2",
+        "grpc": "^1.24.2",
+        "install": "^0.13.0",
+        "js-base64": "^3.7.2",
+        "linqjs": "^1.0.2",
+        "moment": "^2.29.1",
+        "ng-zorro-antd": "13",
+        "ngx-cookie-service": "^3.0.2",
+        "ngx-countdown": "^11.0.0",
+        "ngx-echarts": "^4.2.2",
+        "ngx-perfect-scrollbar": "^8.0.0",
+        "reflect-metadata": "^0.1.13",
+        "rxjs": "~6.5.4",
+        "swiper": "^5.3.6",
+        "tslib": "^2.0.0",
+        "viewerjs": "^1.6.2",
+        "zone.js": "~0.11.4"
+    },
+    "devDependencies": {
+        "@angular-devkit/build-angular": "~13.3.9",
+        "@angular/cli": "~13.3.9",
+        "@angular/compiler-cli": "~13.3.11",
+        "@angular/language-service": "~13.3.11",
+        "@types/jasmine": "~3.6.0",
+        "@types/jasminewd2": "~2.0.3",
+        "@types/node": "^12.11.1",
+        "codelyzer": "^6.0.0",
+        "jasmine-core": "~3.6.0",
+        "jasmine-spec-reporter": "~5.0.0",
+        "karma": "~6.4.1",
+        "karma-chrome-launcher": "~3.1.0",
+        "karma-coverage-istanbul-reporter": "~3.0.2",
+        "karma-jasmine": "~4.0.0",
+        "karma-jasmine-html-reporter": "^1.5.0",
+        "protractor": "~7.0.0",
+        "ts-node": "~7.0.0",
+        "tslint": "~6.1.0",
+        "typescript": "~4.5.2"
+    }
 }

src/app/app-routing.module.ts

@@ -27,7 +27,7 @@ const routes: Routes = [
 ];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes)],
+  imports: [RouterModule.forRoot(routes, { relativeLinkResolution: 'legacy' })],
   exports: [RouterModule]
 })
 export class AppRoutingModule { }

src/app/babylon/tool/myArcRotateCameraPointersInput.ts

@@ -146,7 +146,7 @@ export class MyArcRotateCameraPointersInput extends BaseCameraPointersInput {
     /**
      * Called on pointer POINTERMOVE event if only a single touch is active.
      */
-    protected onTouch(point: Nullable<PointerTouch>,
+    public onTouch(point: Nullable<PointerTouch>,
         offsetX: number,
         offsetY: number): void {
         if (this.panningSensibility !== 0 &&
@@ -172,7 +172,7 @@ export class MyArcRotateCameraPointersInput extends BaseCameraPointersInput {
     /**
      * Called on pointer POINTERDOUBLETAP event.
      */
-    protected onDoubleTap(type: string) {
+    public onDoubleTap(type: string) {
         if (this.camera.useInputToRestoreState) {
             this.camera.restoreState();
         }
@@ -181,7 +181,7 @@ export class MyArcRotateCameraPointersInput extends BaseCameraPointersInput {
     /**
      * Called on pointer POINTERMOVE event if multiple touches are active.
      */
-    protected onMultiTouch(pointA: Nullable<PointerTouch>,
+    public onMultiTouch(pointA: Nullable<PointerTouch>,
         pointB: Nullable<PointerTouch>,
         previousPinchSquaredDistance: number,
         pinchSquaredDistance: number,
@@ -234,7 +234,7 @@ export class MyArcRotateCameraPointersInput extends BaseCameraPointersInput {
      * Called each time a new POINTERDOWN event occurs. Ie, for each button
      * press.
      */
-    protected onButtonDown(evt: PointerEvent): void {
+    public onButtonDown(evt: PointerEvent): void {
         this._isPanClick = evt.button === this.camera._panningMouseButton;
     }
 
@@ -242,7 +242,7 @@ export class MyArcRotateCameraPointersInput extends BaseCameraPointersInput {
      * Called each time a new POINTERUP event occurs. Ie, for each button
      * release.
      */
-    protected onButtonUp(evt: PointerEvent): void {
+    public onButtonUp(evt: PointerEvent): void {
         this._twoFingerActivityCount = 0;
         this._isPinching = false;
     }
@@ -250,7 +250,7 @@ export class MyArcRotateCameraPointersInput extends BaseCameraPointersInput {
     /**
      * Called when window becomes inactive.
      */
-    protected onLostFocus(): void {
+    public onLostFocus(): void {
 
         // console.trace("失去焦点")
         this._isPanClick = false;

src/app/pages/equipment-info/equipment-info.component.ts

@@ -95,7 +95,7 @@ export class EquipmentInfoComponent implements OnInit {
     const instance = modal.getContentComponent();
   }
   edit(item) {
-    console.log('xxxxx',item)
+    console.log('xxxxx', item)
     const modal = this.modal.create({
       nzContent: EditequipmentComponent,
       nzViewContainerRef: this.viewContainerRef,
@@ -143,7 +143,7 @@ export class EquipmentInfoComponent implements OnInit {
     this.modal.confirm({
       nzTitle: `确定要删除${item.name}这个器材吗?`,
       nzOkText: '确定',
-      nzOkType: 'danger',
+      nzOkType: 'primary',
       nzOnOk: () => {
         this.http.delete('/api/services/app/FireEquipment/Delete', {
           params: {

src/app/pages/login/login.component.ts

@@ -8,7 +8,7 @@ import { Base64 } from 'js-base64';
 import { NzNotificationService } from 'ng-zorro-antd/notification';
 import { NzSafeAny } from 'ng-zorro-antd/core/types';
 import { SelectedMenu } from 'src/app/service/selectedMenu.service';
-import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
+// import { THIS_EXPR } from '@angular/compiler/src/output/output_ast';
 
 declare var abp: any
 @Component({

src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

@@ -229,7 +229,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
     this.modal.confirm({
       nzTitle: '判定该预警为误报吗?',
       nzOkText: '确定',
-      nzOkType: 'danger',
+      nzOkType: 'primary',
       nzOnOk: () => {
         let body = {
           id: this.data.id,

src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts

@@ -174,7 +174,7 @@ export class AnalysisOfTheHostComponent implements OnInit {
     this.modal.confirm({
       nzTitle: `确定要删除${item.name}这个主机吗?`,
       nzOkText: '确定',
-      nzOkType: 'danger',
+      nzOkType: 'primary',
       nzOnOk: () => {
         this.http.delete('/api/services/app/EdgeDevice/Delete', {
           params: {
@@ -267,7 +267,7 @@ export class AnalysisOfTheHostComponent implements OnInit {
     this.modal.confirm({
       nzTitle: `确定要删除${item.name}这个摄像头吗?`,
       nzOkText: '确定',
-      nzOkType: 'danger',
+      nzOkType: 'primary',
       nzOnOk: () => {
         this.http.delete('/api/services/app/Camera/Delete', {
           params: {

src/app/system-management/file-of-license/file-of-license.component.ts

@@ -113,7 +113,7 @@ export class FileOfLicenseComponent implements OnInit {
     this.modal.confirm({
       nzTitle: `确定要删除${item.licenseName}这个证照吗?`,
       nzOkText: '确定',
-      nzOkType: 'danger',
+      nzOkType: 'primary',
       nzOnOk: () => {
         this.http.delete('/api/services/app/FileLicenseType/Delete', {
           params: {

src/app/system-management/menu/addmenu/addmenu.component.spec.ts

@@ -1,4 +1,4 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 
 import { AddmenuComponent } from './addmenu.component';
 
@@ -6,7 +6,7 @@ describe('AddmenuComponent', () => {
   let component: AddmenuComponent;
   let fixture: ComponentFixture<AddmenuComponent>;
 
-  beforeEach(async(() => {
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ AddmenuComponent ]
     })

src/app/system-management/menu/menu.component.ts

@@ -46,7 +46,7 @@ export class MenuComponent implements OnInit {
     let params = {
       OrganizationUnitId: OrganizationUnitId,
       IsContainsChildren: "true",
-      MaxResultCount:"999"
+      MaxResultCount: "999"
     }
     this.http.get('/api/services/app/Menu/GetAll', {
       params: params
@@ -162,7 +162,7 @@ export class MenuComponent implements OnInit {
       this.modal.confirm({
         nzTitle: `确定要删除${item.title}这个菜单吗?`,
         nzOkText: '确定',
-        nzOkType: 'danger',
+        nzOkType: 'primary',
         nzOnOk: () => {
           this.http.delete('/api/services/app/Menu/Delete', {
             params: {

src/app/system-management/organization/organization.component.ts

@@ -208,7 +208,7 @@ export class OrganizationComponent implements OnInit {
       this.modal.confirm({
         nzTitle: `确定要删除${item.title}这个机构吗?`,
         nzOkText: '确定',
-        nzOkType: 'danger',
+        nzOkType: 'primary',
         nzOnOk: () => {
           this.http.delete('/api/services/app/Organization/Delete', {
             params: {

src/app/system-management/role/role.component.ts

@@ -234,7 +234,7 @@ export class RoleComponent implements OnInit {
     this.modal.confirm({
       nzTitle: `确定要删除${item.name}这个角色吗?`,
       nzOkText: '确定',
-      nzOkType: 'danger',
+      nzOkType: 'primary',
       nzOnOk: () => {
         this.http.delete('/api/services/app/Role/Delete', {
           params: {

src/app/system-management/update-of-license/update-of-license.component.ts

@@ -125,7 +125,7 @@ export class UpdateOfLicenseComponent implements OnInit {
     this.modal.confirm({
       nzTitle: `确定要删除${item.licenseName}这个证照吗?`,
       nzOkText: '确定',
-      nzOkType: 'danger',
+      nzOkType: 'primary',
       nzOnOk: () => {
         this.http.delete('/api/services/app/ValidityLicenseType/Delete', {
           params: {

src/app/system-management/user/user.component.ts

@@ -248,11 +248,11 @@ export class UserComponent implements OnInit {
         listOfData: this.listOfData,
         listOfData2: this.listOfData2,
         nodes: this.nodes,
-        editUrl:this.editUrl
+        editUrl: this.editUrl
       }
     });
     const instance = modal.getContentComponent();
-    modal.afterClose.subscribe(result =>  this.getAllUsers());
+    modal.afterClose.subscribe(result => this.getAllUsers());
   }
 
   //重置密码
@@ -323,7 +323,7 @@ export class UserComponent implements OnInit {
     this.modal.confirm({
       nzTitle: `确定要注销${item.userName}这个账户吗?`,
       nzOkText: '确定',
-      nzOkType: 'danger',
+      nzOkType: 'primary',
       nzOnOk: () => {
         this.http.delete(this.deleteUrl, {
           params: {

src/environments/environment.ts

@@ -13,4 +13,4 @@ export const environment = {
  * This import should be commented out in production mode because it will have a negative impact
  * on performance if an error is thrown.
  */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.

src/polyfills.ts

@@ -55,7 +55,7 @@
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
+import 'zone.js';  // Included with Angular CLI.
 
 
 /***************************************************************************************************

src/test.ts

@@ -1,6 +1,6 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import 'zone.js/dist/zone-testing';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,

tsconfig.json

@@ -8,7 +8,7 @@
     "declaration": false,
     "downlevelIteration": true,
     "experimentalDecorators": true,
-    "module": "esnext",
+    "module": "es2020",
     "moduleResolution": "node",
     "importHelpers": true,
     "target": "es2015",

tslint.json

@@ -1,13 +1,21 @@
 {
   "extends": "tslint:recommended",
   "rules": {
+    "align": {
+      "options": [
+        "parameters",
+        "statements"
+      ]
+    },
     "array-type": false,
     "arrow-parens": false,
+    "arrow-return-shorthand": true,
     "deprecation": {
       "severity": "warning"
     },
     "component-class-suffix": true,
     "contextual-lifecycle": true,
+    "curly": true,
     "directive-class-suffix": true,
     "directive-selector": [
       true,
@@ -21,10 +29,17 @@
       "app",
       "kebab-case"
     ],
+    "eofline": true,
     "import-blacklist": [
       true,
       "rxjs/Rx"
     ],
+    "import-spacing": true,
+    "indent": {
+      "options": [
+        "spaces"
+      ]
+    },
     "interface-name": false,
     "max-classes-per-file": false,
     "max-line-length": [
@@ -79,11 +94,60 @@
     "no-output-native": true,
     "no-output-on-prefix": true,
     "no-output-rename": true,
+    "semicolon": {
+      "options": [
+        "always"
+      ]
+    },
+    "space-before-function-paren": {
+      "options": {
+        "anonymous": "never",
+        "asyncArrow": "always",
+        "constructor": "never",
+        "method": "never",
+        "named": "never"
+      }
+    },
     "no-outputs-metadata-property": true,
     "template-banana-in-box": true,
     "template-no-negated-async": true,
+    "typedef-whitespace": {
+      "options": [
+        {
+          "call-signature": "nospace",
+          "index-signature": "nospace",
+          "parameter": "nospace",
+          "property-declaration": "nospace",
+          "variable-declaration": "nospace"
+        },
+        {
+          "call-signature": "onespace",
+          "index-signature": "onespace",
+          "parameter": "onespace",
+          "property-declaration": "onespace",
+          "variable-declaration": "onespace"
+        }
+      ]
+    },
     "use-lifecycle-interface": true,
-    "use-pipe-transform-interface": true
+    "use-pipe-transform-interface": true,
+    "variable-name": {
+      "options": [
+        "ban-keywords",
+        "check-format",
+        "allow-pascal-case"
+      ]
+    },
+    "whitespace": {
+      "options": [
+        "check-branch",
+        "check-decl",
+        "check-operator",
+        "check-separator",
+        "check-type",
+        "check-typecast"
+      ]
+    }
   },
   "rulesDirectory": [
     "codelyzer"