升级到ng13

.gitignore

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

package.json

@@ -11,17 +11,17 @@
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "^12.2.16",
-        "@angular/cdk": "^9.2.4",
-        "@angular/common": "~12.2.16",
-        "@angular/compiler": "~12.2.16",
-        "@angular/core": "~12.2.16",
+        "@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": "~12.2.16",
+        "@angular/forms": "~13.3.11",
         "@angular/material": "9",
-        "@angular/platform-browser": "~12.2.16",
-        "@angular/platform-browser-dynamic": "~12.2.16",
-        "@angular/router": "~12.2.16",
+        "@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",
@@ -29,6 +29,7 @@
         "@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",
@@ -51,7 +52,7 @@
         "js-base64": "^3.7.2",
         "linqjs": "^1.0.2",
         "moment": "^2.29.1",
-        "ng-zorro-antd": "^9.3.0",
+        "ng-zorro-antd": "13",
         "ngx-cookie-service": "^3.0.2",
         "ngx-countdown": "^11.0.0",
         "ngx-echarts": "^4.2.2",
@@ -64,10 +65,10 @@
         "zone.js": "~0.11.4"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~12.2.18",
-        "@angular/cli": "~12.2.18",
-        "@angular/compiler-cli": "~12.2.16",
-        "@angular/language-service": "~12.2.16",
+        "@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",
@@ -84,4 +85,4 @@
         "tslint": "~6.1.0",
         "typescript": "~4.5.2"
     }
-}
+}

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/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: {