[新增]预警声音增加

package-lock.json

@@ -8449,7 +8449,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "iconv-lite": "^0.6.2"
@@ -8459,7 +8459,7 @@
       "version": "0.6.3",
       "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
       "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -21613,7 +21613,8 @@
     "@angular/animations": {
       "version": "9.1.13",
       "resolved": "https://registry.npmmirror.com/@angular/animations/-/animations-9.1.13.tgz",
-      "integrity": "sha512-ane1eeQmsP7fcAiLgRhle7YIDgE88WDMMvzqJYhSxwLzXNF/hwqNeskmNcjo8bLt9h/yTIjrCQbycLCHJfU8UQ=="
+      "integrity": "sha512-ane1eeQmsP7fcAiLgRhle7YIDgE88WDMMvzqJYhSxwLzXNF/hwqNeskmNcjo8bLt9h/yTIjrCQbycLCHJfU8UQ==",
+      "requires": {}
     },
     "@angular/cdk": {
       "version": "9.2.4",
@@ -21662,12 +21663,14 @@
     "@angular/common": {
       "version": "9.0.7",
       "resolved": "https://registry.npmmirror.com/@angular/common/-/common-9.0.7.tgz",
-      "integrity": "sha512-B58YgxZva1DBaeayOBsaUOOkoyR+GRibuNC3gfOMm2vXeW9eCNX+jvDtw767GnKm2yGzIq8wB3x6GHojN00dPw=="
+      "integrity": "sha512-B58YgxZva1DBaeayOBsaUOOkoyR+GRibuNC3gfOMm2vXeW9eCNX+jvDtw767GnKm2yGzIq8wB3x6GHojN00dPw==",
+      "requires": {}
     },
     "@angular/compiler": {
       "version": "9.0.7",
       "resolved": "https://registry.npmmirror.com/@angular/compiler/-/compiler-9.0.7.tgz",
-      "integrity": "sha512-hFpkuGpzxpK5h59LHHAjTFWsY6DCXZwgJFqvCuTPxWi/srvLGZRXrpC6Z1SlgHI9xxXaPfoa4uWw2VfA3BnqEg=="
+      "integrity": "sha512-hFpkuGpzxpK5h59LHHAjTFWsY6DCXZwgJFqvCuTPxWi/srvLGZRXrpC6Z1SlgHI9xxXaPfoa4uWw2VfA3BnqEg==",
+      "requires": {}
     },
     "@angular/compiler-cli": {
       "version": "9.0.7",
@@ -21700,17 +21703,20 @@
     "@angular/core": {
       "version": "9.0.7",
       "resolved": "https://registry.npmmirror.com/@angular/core/-/core-9.0.7.tgz",
-      "integrity": "sha512-E9XZH5Dl+9MWG3MDC6wrKllhA8Rljpz66HOIeqKv2fHPed8kzuJZU3WJWLtbhDAXFwtGTyTZ4c82ZLSmqwTorg=="
+      "integrity": "sha512-E9XZH5Dl+9MWG3MDC6wrKllhA8Rljpz66HOIeqKv2fHPed8kzuJZU3WJWLtbhDAXFwtGTyTZ4c82ZLSmqwTorg==",
+      "requires": {}
     },
     "@angular/fire": {
       "version": "5.4.2",
       "resolved": "https://registry.npmmirror.com/@angular/fire/-/fire-5.4.2.tgz",
-      "integrity": "sha512-QzB5d1wtqr9jxfsVNv2+569MlfK4/QrrpNy0IngOHdxS4FBbXqMOcx37iv1m2mzJv9zlGUddUX44IZP5Xfb3cw=="
+      "integrity": "sha512-QzB5d1wtqr9jxfsVNv2+569MlfK4/QrrpNy0IngOHdxS4FBbXqMOcx37iv1m2mzJv9zlGUddUX44IZP5Xfb3cw==",
+      "requires": {}
     },
     "@angular/forms": {
       "version": "9.0.7",
       "resolved": "https://registry.npmmirror.com/@angular/forms/-/forms-9.0.7.tgz",
-      "integrity": "sha512-PaHAmjMJDtg/3aGCPuq5BCRC1eZ/DBCpva9f7NrA1kqk0LcLdebm0v2uHwTOBtiz/VEgPvxiS4tXC4rjvUtfEg=="
+      "integrity": "sha512-PaHAmjMJDtg/3aGCPuq5BCRC1eZ/DBCpva9f7NrA1kqk0LcLdebm0v2uHwTOBtiz/VEgPvxiS4tXC4rjvUtfEg==",
+      "requires": {}
     },
     "@angular/language-service": {
       "version": "9.0.7",
@@ -21721,22 +21727,26 @@
     "@angular/material": {
       "version": "9.2.4",
       "resolved": "https://registry.npmmirror.com/@angular/material/-/material-9.2.4.tgz",
-      "integrity": "sha512-LkoTXE6B0slvMhvfZDdPWaz4yaYLkaAp5VSPunI9pxGsPxzqEV9e210wC1/sjG/76Nk8Ep7/2z9XKac8Q9bMwA=="
+      "integrity": "sha512-LkoTXE6B0slvMhvfZDdPWaz4yaYLkaAp5VSPunI9pxGsPxzqEV9e210wC1/sjG/76Nk8Ep7/2z9XKac8Q9bMwA==",
+      "requires": {}
     },
     "@angular/platform-browser": {
       "version": "9.0.7",
       "resolved": "https://registry.npmmirror.com/@angular/platform-browser/-/platform-browser-9.0.7.tgz",
-      "integrity": "sha512-Por8omrEiSV2U/K2mm/Kuv+2R2rJkbAZ3ctEM6CWj9Y4Gz2akjOCxmEgWhhBeqdigcC3T1v707f52osf9jWBkg=="
+      "integrity": "sha512-Por8omrEiSV2U/K2mm/Kuv+2R2rJkbAZ3ctEM6CWj9Y4Gz2akjOCxmEgWhhBeqdigcC3T1v707f52osf9jWBkg==",
+      "requires": {}
     },
     "@angular/platform-browser-dynamic": {
       "version": "9.0.7",
       "resolved": "https://registry.npmmirror.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.7.tgz",
-      "integrity": "sha512-jwpyd93ofcRtchbayKD5v4GN4Lc7vbPe6dMUiwfnVnVAql0bOD/3YRI7w5qJ0Xx0sgQT+9Xo6jTXYnyUsZpEww=="
+      "integrity": "sha512-jwpyd93ofcRtchbayKD5v4GN4Lc7vbPe6dMUiwfnVnVAql0bOD/3YRI7w5qJ0Xx0sgQT+9Xo6jTXYnyUsZpEww==",
+      "requires": {}
     },
     "@angular/router": {
       "version": "9.0.7",
       "resolved": "https://registry.npmmirror.com/@angular/router/-/router-9.0.7.tgz",
-      "integrity": "sha512-uKru9F/Zju//gg6INl54abnlpLdEUUO/GpCfMk4zqu8LCZGNFta6OY7VT+9DK9Vdrh/XUD70oE9WoelcRwwTYA=="
+      "integrity": "sha512-uKru9F/Zju//gg6INl54abnlpLdEUUO/GpCfMk4zqu8LCZGNFta6OY7VT+9DK9Vdrh/XUD70oE9WoelcRwwTYA==",
+      "requires": {}
     },
     "@ant-design/colors": {
       "version": "3.2.2",
@@ -22738,12 +22748,14 @@
     "@firebase/auth-interop-types": {
       "version": "0.1.5",
       "resolved": "https://registry.npmmirror.com/@firebase/auth-interop-types/-/auth-interop-types-0.1.5.tgz",
-      "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw=="
+      "integrity": "sha512-88h74TMQ6wXChPA6h9Q3E1Jg6TkTHep2+k63OWg3s0ozyGVMeY+TTOti7PFPzq5RhszQPQOoCi59es4MaRvgCw==",
+      "requires": {}
     },
     "@firebase/auth-types": {
       "version": "0.10.1",
       "resolved": "https://registry.npmmirror.com/@firebase/auth-types/-/auth-types-0.10.1.tgz",
-      "integrity": "sha512-/+gBHb1O9x/YlG7inXfxff/6X3BPZt4zgBv4kql6HEmdzNQCodIRlEYnI+/da+lN+dha7PjaFH7C7ewMmfV7rw=="
+      "integrity": "sha512-/+gBHb1O9x/YlG7inXfxff/6X3BPZt4zgBv4kql6HEmdzNQCodIRlEYnI+/da+lN+dha7PjaFH7C7ewMmfV7rw==",
+      "requires": {}
     },
     "@firebase/component": {
       "version": "0.1.19",
@@ -22795,7 +22807,8 @@
     "@firebase/firestore-types": {
       "version": "1.14.0",
       "resolved": "https://registry.npmmirror.com/@firebase/firestore-types/-/firestore-types-1.14.0.tgz",
-      "integrity": "sha512-WF8IBwHzZDhwyOgQnmB0pheVrLNP78A8PGxk1nxb/Nrgh1amo4/zYvFMGgSsTeaQK37xMYS/g7eS948te/dJxw=="
+      "integrity": "sha512-WF8IBwHzZDhwyOgQnmB0pheVrLNP78A8PGxk1nxb/Nrgh1amo4/zYvFMGgSsTeaQK37xMYS/g7eS948te/dJxw==",
+      "requires": {}
     },
     "@firebase/functions": {
       "version": "0.5.1",
@@ -22829,7 +22842,8 @@
     "@firebase/installations-types": {
       "version": "0.3.4",
       "resolved": "https://registry.npmmirror.com/@firebase/installations-types/-/installations-types-0.3.4.tgz",
-      "integrity": "sha512-RfePJFovmdIXb6rYwtngyxuEcWnOrzdZd9m7xAW0gRxDIjBT20n3BOhjpmgRWXo/DAxRmS7bRjWAyTHY9cqN7Q=="
+      "integrity": "sha512-RfePJFovmdIXb6rYwtngyxuEcWnOrzdZd9m7xAW0gRxDIjBT20n3BOhjpmgRWXo/DAxRmS7bRjWAyTHY9cqN7Q==",
+      "requires": {}
     },
     "@firebase/logger": {
       "version": "0.2.6",
@@ -22852,7 +22866,8 @@
     "@firebase/messaging-types": {
       "version": "0.5.0",
       "resolved": "https://registry.npmmirror.com/@firebase/messaging-types/-/messaging-types-0.5.0.tgz",
-      "integrity": "sha512-QaaBswrU6umJYb/ZYvjR5JDSslCGOH6D9P136PhabFAHLTR4TWjsaACvbBXuvwrfCXu10DtcjMxqfhdNIB1Xfg=="
+      "integrity": "sha512-QaaBswrU6umJYb/ZYvjR5JDSslCGOH6D9P136PhabFAHLTR4TWjsaACvbBXuvwrfCXu10DtcjMxqfhdNIB1Xfg==",
+      "requires": {}
     },
     "@firebase/performance": {
       "version": "0.4.2",
@@ -22921,7 +22936,8 @@
     "@firebase/storage-types": {
       "version": "0.3.13",
       "resolved": "https://registry.npmmirror.com/@firebase/storage-types/-/storage-types-0.3.13.tgz",
-      "integrity": "sha512-pL7b8d5kMNCCL0w9hF7pr16POyKkb3imOW7w0qYrhBnbyJTdVxMWZhb0HxCFyQWC0w3EiIFFmxoz8NTFZDEFog=="
+      "integrity": "sha512-pL7b8d5kMNCCL0w9hF7pr16POyKkb3imOW7w0qYrhBnbyJTdVxMWZhb0HxCFyQWC0w3EiIFFmxoz8NTFZDEFog==",
+      "requires": {}
     },
     "@firebase/util": {
       "version": "0.3.2",
@@ -24989,13 +25005,15 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/ajv-errors/-/ajv-errors-1.0.1.tgz",
       "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "alphanum-sort": {
       "version": "1.0.2",
@@ -26165,7 +26183,8 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmmirror.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.0.tgz",
       "integrity": "sha512-7p4Kn/gffhQaavNfyDFg7LS5S/UT1JAjyGd4UqR2+jzoYF02eDkj0Ec3+48TsIa4zghjLY87nQHIh/ecK9qLdw==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "class-transformer": {
       "version": "0.4.0",
@@ -27759,7 +27778,7 @@
       "version": "0.1.13",
       "resolved": "https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz",
       "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
-      "dev": true,
+      "devOptional": true,
       "requires": {
         "iconv-lite": "^0.6.2"
       },
@@ -27768,7 +27787,7 @@
           "version": "0.6.3",
           "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.6.3.tgz",
           "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-          "dev": true,
+          "devOptional": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3.0.0"
           }
@@ -30601,7 +30620,8 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmmirror.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz",
       "integrity": "sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "karma-source-map-support": {
       "version": "1.4.0",

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config  proxy.config.json  --open --port 25647 --host 192.168.1.86",
+    "start": "ng serve --proxy-config  proxy.config.json  --open --port 25647",
     "build": "node --max_old_space_size=5048 ./node_modules/@angular/cli/bin/ng build --prod",
     "test": "ng test",
     "lint": "ng lint",

proxy.config.json

@@ -1,13 +1,13 @@
 {
   "/api": {
-    "target": "http://121.36.37.70:8200/",
+    "target": "http://10.156.134.53:8200/",
     "测试": "http://121.36.37.70:8200/",
     "生产": "http://10.156.134.53:8200/",
     "secure": false,
     "changeOrigin": true
   },
   "/signalr": {
-    "target": "http://121.36.37.70:8200/",
+    "target": "http://10.156.134.53:8200/",
     "secure": false,
     "ws": true,
     "logLevel": "debug"

src/app/pages/get-out-of-line-details/get-out-of-line-details.component.html

@@ -22,9 +22,9 @@
     </label>
     <label *ngFor="let item of legendList" nz-checkbox [(ngModel)]="item.checked"
       (ngModelChange)="typeChange(item)">
-      <div style="width: 10px;height: 10px;display: inline-block;" [ngStyle]="{'background': typeArr[item.id].color}">
+      <div style="width: 10px;height: 10px;display: inline-block;" [ngStyle]="{'background': typeArr[item.id]?.color || 'yellow'}">
       </div>
-      {{typeArr[item.id].name}}
+      {{typeArr[item.id]?.name || '未定义'}}
     </label>
     <button nz-button nzType="primary" (click)="downImg()">导出图片</button>
   </div>

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

@@ -48,6 +48,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
     { id: 17, name: "延长工装", color: "blue" },
     { id: 18, name: "江苏工装", color: "blue" },
     { id: 19, name: "经理工装", color: "yellow" },
+    { id: 20, name: "江苏道达尔工装", color: "yellow" },
   ];
 
   userName;
@@ -171,7 +172,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
         Math.round(this.canvasHeight * item.box[3]),
       ];
       // console.log(startPoint, endPoint);
-      this.ctx.strokeStyle = this.typeArr[item.id].color;
+      this.ctx.strokeStyle = this.typeArr[item.id]?.color || "yellow";
       this.ctx.lineWidth = 3;
       this.ctx.strokeRect(
         startPoint[0],
@@ -181,10 +182,10 @@ export class GetOutOfLineDetailsComponent implements OnInit {
       );
       //如果当前矩形区域为错误区域，则左上角增加色块
       if (item.error) {
-        this.ctx.fillStyle = this.typeArr[item.id].color;
+        this.ctx.fillStyle = this.typeArr[item.id]?.color || "yellow";
         this.ctx.fillRect(startPoint[0], startPoint[1], 10, 10);
       }
-      this.ctx.fillStyle = this.typeArr[item.id].color;
+      this.ctx.fillStyle = this.typeArr[item.id]?.color || "yellow";
       this.ctx.font = "16px Verdana";
       let name = "";
       if (
@@ -192,9 +193,9 @@ export class GetOutOfLineDetailsComponent implements OnInit {
         this.userName === "admin" ||
         this.userName === "superadmin"
       ) {
-        name = this.typeArr[item.id].name + item.scores;
+        name = this.typeArr[item.id]?.name || "未定义" + item.scores;
       } else {
-        name = this.typeArr[item.id].name;
+        name = this.typeArr[item.id]?.name || "未定义";
       }
       this.ctx.fillText(
         name,
@@ -227,10 +228,14 @@ export class GetOutOfLineDetailsComponent implements OnInit {
   }
   typeChangeAll() {
     if (this.checkedAll) {
-      this.legendList.forEach((element) => {element.checked = true;});
+      this.legendList.forEach((element) => {
+        element.checked = true;
+      });
       this.currentCoordinate = this.coordinate;
     } else {
-      this.legendList.forEach((element) => {element.checked = false;});
+      this.legendList.forEach((element) => {
+        element.checked = false;
+      });
       this.currentCoordinate = [];
     }
 

src/app/pages/home/home.component.ts

@@ -159,7 +159,7 @@ export class HomeComponent implements OnInit {
   }
   messageId = [];
   receiptOfNotification(userNotification) {
-    this.Sound()
+    this.Sound(userNotification);
     let obj = {
       id: userNotification.notification.entityId,
       messageId: this.notificationService.template(this.template!, {
@@ -511,9 +511,30 @@ export class HomeComponent implements OnInit {
     );
   }
 
-  Sound(){
+  Sound(userNotification) {
-    var mp3Url = "../../../assets/sound/warning.mp3";
+    let violationName =
-    var player = new Audio(mp3Url);
+      userNotification.notification.data.properties.ViolationName;
+    const soundMap = {
+      油罐区非工作人员闯入: "../../../assets/sound/chuangru.mp3",
+      进出口长时间停放车辆: "../../../assets/sound/jinchukou.mp3",
+      前庭有顾客疑似抽烟: "../../../assets/sound/chouyan.mp3",
+      前庭有顾客接打电话: "../../../assets/sound/dadianhua.mp3",
+      卸油前未按规定设置隔离: "../../../assets/sound/xygeli.mp3",
+      卸油后未按规定拆除卸油管: "../../../assets/sound/xychaichuxyguan.mp3",
+      卸油前未按规定连接静电接地: "../../../assets/sound/xyjiedi.mp3",
+      卸油前未按规定放置灭火器: "../../../assets/sound/xymiehuoqi.mp3",
+      卸油后长时间未清理现场: "../../../assets/sound/xyxianchang.mp3",
+      油罐车长时间无人卸油: "../../../assets/sound/xywuren.mp3",
+      卸油前未按规定连接卸油管: "../../../assets/sound/xyxieyouguan.mp3",
+      卸油中未按规定全程监卸: "../../../assets/sound/xyjianxie.mp3",
+      疑似烟雾: "../../../assets/sound/yanwu.mp3",
+      疑似明火: "../../../assets/sound/minghuo.mp3",
+      "收银员未穿工装/非工作人员闯入收银区":
+        "../../../assets/sound/gongzhuang.mp3",
+      default: "../../../assets/sound/warning.mp3",
+    };
+    const audioUrl = soundMap[violationName] || soundMap.default;
+    var player = new Audio(audioUrl);
     player.play(); //播放 mp3这个音频对象
   }
 }

yarn.lock

@@ -117,12 +117,12 @@
     "ora" "4.0.2"
     "rxjs" "6.5.3"
 
-"@angular/animations@^9.0.0":
+"@angular/animations@^9.0.0", "@angular/animations@^9.0.0 || ^10.0.0-0", "@angular/animations@>=6.0.0", "@angular/animations@9.0.7":
   "integrity" "sha512-ane1eeQmsP7fcAiLgRhle7YIDgE88WDMMvzqJYhSxwLzXNF/hwqNeskmNcjo8bLt9h/yTIjrCQbycLCHJfU8UQ=="
   "resolved" "https://registry.npmmirror.com/@angular/animations/-/animations-9.1.13.tgz"
   "version" "9.1.13"
 
-"@angular/cdk@^9.0.0", "@angular/cdk@^9.2.4":
+"@angular/cdk@^9.0.0", "@angular/cdk@^9.2.4", "@angular/cdk@9.2.4":
   "integrity" "sha512-iw2+qHMXHYVC6K/fttHeNHIieSKiTEodVutZoOEcBu9rmRTGbLB26V/CRsfIRmA1RBk+uFYWc6UQZnMC3RdnJQ=="
   "resolved" "https://registry.npmmirror.com/@angular/cdk/-/cdk-9.2.4.tgz"
   "version" "9.2.4"
@@ -155,12 +155,12 @@
     "universal-analytics" "^0.4.20"
     "uuid" "^3.3.2"
 
-"@angular/common@~9.0.0":
+"@angular/common@^12.2.8", "@angular/common@^6.0.0-rc.0 || >=6.0.0", "@angular/common@^9.0.0", "@angular/common@^9.0.0 || ^10.0.0-0", "@angular/common@^9.0.5", "@angular/common@>=5.0.0", "@angular/common@>=6.0.0", "@angular/common@>=6.0.0 <9 || ^9.0.0-0", "@angular/common@~9.0.0", "@angular/common@9.0.7":
   "integrity" "sha512-B58YgxZva1DBaeayOBsaUOOkoyR+GRibuNC3gfOMm2vXeW9eCNX+jvDtw767GnKm2yGzIq8wB3x6GHojN00dPw=="
   "resolved" "https://registry.npmmirror.com/@angular/common/-/common-9.0.7.tgz"
   "version" "9.0.7"
 
-"@angular/compiler-cli@~9.0.0":
+"@angular/compiler-cli@>=9.0.0 < 10", "@angular/compiler-cli@~9.0.0":
   "integrity" "sha512-+RXghex63v0Vi8vpQtDpWiqpAAnrTaN3bHT5fntRenq5+Ok5vL1MJ1mzbTmBXs2tuwTqNlwMm2AlZB7G/xcDMQ=="
   "resolved" "https://registry.npmmirror.com/@angular/compiler-cli/-/compiler-cli-9.0.7.tgz"
   "version" "9.0.7"
@@ -178,12 +178,12 @@
     "sourcemap-codec" "^1.4.8"
     "yargs" "13.1.0"
 
-"@angular/compiler@~9.0.0":
+"@angular/compiler@>=2.3.1 <10.0.0 || >9.0.0-beta <10.0.0 || >9.1.0-beta <10.0.0 || >9.2.0-beta <10.0.0", "@angular/compiler@~9.0.0", "@angular/compiler@9.0.7":
   "integrity" "sha512-hFpkuGpzxpK5h59LHHAjTFWsY6DCXZwgJFqvCuTPxWi/srvLGZRXrpC6Z1SlgHI9xxXaPfoa4uWw2VfA3BnqEg=="
   "resolved" "https://registry.npmmirror.com/@angular/compiler/-/compiler-9.0.7.tgz"
   "version" "9.0.7"
 
-"@angular/core@~9.0.0":
+"@angular/core@^12.2.8", "@angular/core@^6.0.0-rc.0 || >=6.0.0", "@angular/core@^9.0.0", "@angular/core@^9.0.0 || ^10.0.0-0", "@angular/core@^9.0.5", "@angular/core@>=2.3.1 <10.0.0 || >9.0.0-beta <10.0.0 || >9.1.0-beta <10.0.0 || >9.2.0-beta <10.0.0", "@angular/core@>=5.0.0", "@angular/core@>=6.0.0", "@angular/core@>=6.0.0 <9 || ^9.0.0-0", "@angular/core@~9.0.0", "@angular/core@9.0.7", "@angular/core@9.1.13":
   "integrity" "sha512-E9XZH5Dl+9MWG3MDC6wrKllhA8Rljpz66HOIeqKv2fHPed8kzuJZU3WJWLtbhDAXFwtGTyTZ4c82ZLSmqwTorg=="
   "resolved" "https://registry.npmmirror.com/@angular/core/-/core-9.0.7.tgz"
   "version" "9.0.7"
@@ -193,7 +193,7 @@
   "resolved" "https://registry.npmmirror.com/@angular/fire/-/fire-5.4.2.tgz"
   "version" "5.4.2"
 
-"@angular/forms@~9.0.0":
+"@angular/forms@^9.0.0", "@angular/forms@^9.0.0 || ^10.0.0-0", "@angular/forms@~9.0.0":
   "integrity" "sha512-PaHAmjMJDtg/3aGCPuq5BCRC1eZ/DBCpva9f7NrA1kqk0LcLdebm0v2uHwTOBtiz/VEgPvxiS4tXC4rjvUtfEg=="
   "resolved" "https://registry.npmmirror.com/@angular/forms/-/forms-9.0.7.tgz"
   "version" "9.0.7"
@@ -208,17 +208,17 @@
   "resolved" "https://registry.npmmirror.com/@angular/material/-/material-9.2.4.tgz"
   "version" "9.2.4"
 
-"@angular/platform-browser-dynamic@~9.0.0":
+"@angular/platform-browser-dynamic@>=6.0.0 <9 || ^9.0.0-0", "@angular/platform-browser-dynamic@~9.0.0":
   "integrity" "sha512-jwpyd93ofcRtchbayKD5v4GN4Lc7vbPe6dMUiwfnVnVAql0bOD/3YRI7w5qJ0Xx0sgQT+9Xo6jTXYnyUsZpEww=="
   "resolved" "https://registry.npmmirror.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.0.7.tgz"
   "version" "9.0.7"
 
-"@angular/platform-browser@~9.0.0":
+"@angular/platform-browser@^9.0.0", "@angular/platform-browser@>=6.0.0 <9 || ^9.0.0-0", "@angular/platform-browser@~9.0.0", "@angular/platform-browser@9.0.7":
   "integrity" "sha512-Por8omrEiSV2U/K2mm/Kuv+2R2rJkbAZ3ctEM6CWj9Y4Gz2akjOCxmEgWhhBeqdigcC3T1v707f52osf9jWBkg=="
   "resolved" "https://registry.npmmirror.com/@angular/platform-browser/-/platform-browser-9.0.7.tgz"
   "version" "9.0.7"
 
-"@angular/router@~9.0.0":
+"@angular/router@^9.0.0", "@angular/router@~9.0.0":
   "integrity" "sha512-uKru9F/Zju//gg6INl54abnlpLdEUUO/GpCfMk4zqu8LCZGNFta6OY7VT+9DK9Vdrh/XUD70oE9WoelcRwwTYA=="
   "resolved" "https://registry.npmmirror.com/@angular/router/-/router-9.0.7.tgz"
   "version" "9.0.7"
@@ -258,7 +258,7 @@
   "resolved" "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.17.7.tgz"
   "version" "7.17.7"
 
-"@babel/core@^7.7.5", "@babel/core@7.7.7":
+"@babel/core@^7.0.0", "@babel/core@^7.0.0-0", "@babel/core@^7.7.5", "@babel/core@7.7.7":
   "integrity" "sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ=="
   "resolved" "https://registry.npmmirror.com/@babel/core/-/core-7.7.7.tgz"
   "version" "7.7.7"
@@ -988,12 +988,12 @@
     "@firebase/util" "0.3.2"
     "tslib" "^1.11.1"
 
-"@firebase/app-types@0.6.1":
+"@firebase/app-types@0.6.1", "@firebase/app-types@0.x":
   "integrity" "sha512-L/ZnJRAq7F++utfuoTKX4CLBG5YR7tFO3PLzG1/oXXKEezJ0kRL3CMRoueBEmTCzVb/6SIs2Qlaw++uDgi5Xyg=="
   "resolved" "https://registry.npmmirror.com/@firebase/app-types/-/app-types-0.6.1.tgz"
   "version" "0.6.1"
 
-"@firebase/app@0.6.11":
+"@firebase/app@0.6.11", "@firebase/app@0.x":
   "integrity" "sha512-FH++PaoyTzfTAVuJ0gITNYEIcjT5G+D0671La27MU8Vvr6MTko+5YUZ4xS9QItyotSeRF4rMJ1KR7G8LSyySiA=="
   "resolved" "https://registry.npmmirror.com/@firebase/app/-/app-0.6.11.tgz"
   "version" "0.6.11"
@@ -1183,7 +1183,7 @@
     "@firebase/util" "0.3.2"
     "tslib" "^1.11.1"
 
-"@firebase/util@0.3.2":
+"@firebase/util@0.3.2", "@firebase/util@0.x":
   "integrity" "sha512-Dqs00++c8rwKky6KCKLLY2T1qYO4Q+X5t+lF7DInXDNF4ae1Oau35bkD+OpJ9u7l1pEv7KHowP6CUKuySCOc8g=="
   "resolved" "https://registry.npmmirror.com/@firebase/util/-/util-0.3.2.tgz"
   "version" "0.3.2"
@@ -2576,14 +2576,14 @@
   "resolved" "https://registry.npmmirror.com/@types/q/-/q-1.5.5.tgz"
   "version" "1.5.5"
 
-"@types/react-dom@^17.0.10":
+"@types/react-dom@^17.0.10", "@types/react-dom@>=16.0.9":
   "integrity" "sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ=="
   "resolved" "https://registry.npmmirror.com/@types/react-dom/-/react-dom-17.0.14.tgz"
   "version" "17.0.14"
   dependencies:
     "@types/react" "*"
 
-"@types/react@*":
+"@types/react@*", "@types/react@>=16.7.3":
   "integrity" "sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A=="
   "resolved" "https://registry.npmmirror.com/@types/react/-/react-17.0.43.tgz"
   "version" "17.0.43"
@@ -2880,7 +2880,7 @@
   "resolved" "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
   "version" "3.5.2"
 
-"ajv@^6.1.0", "ajv@^6.10.2", "ajv@6.10.2":
+"ajv@^6.1.0", "ajv@^6.10.2", "ajv@^6.9.1", "ajv@>=5.0.0", "ajv@6.10.2":
   "integrity" "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="
   "resolved" "https://registry.npmmirror.com/ajv/-/ajv-6.10.2.tgz"
   "version" "6.10.2"
@@ -4959,7 +4959,7 @@
     "jsbn" "~0.1.0"
     "safer-buffer" "^2.1.0"
 
-"echarts@^4.9.0":
+"echarts@^4.9.0", "echarts@>=3.1.1":
   "integrity" "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA=="
   "resolved" "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz"
   "version" "4.9.0"
@@ -5009,7 +5009,7 @@
   "resolved" "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz"
   "version" "1.0.2"
 
-"encoding@^0.1.11":
+"encoding@^0.1.0", "encoding@^0.1.11":
   "integrity" "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A=="
   "resolved" "https://registry.npmmirror.com/encoding/-/encoding-0.1.13.tgz"
   "version" "0.1.13"
@@ -5491,7 +5491,7 @@
     "locate-path" "^5.0.0"
     "path-exists" "^4.0.0"
 
-"firebase@^7.6.2":
+"firebase@^7.6.2", "firebase@>= 5.5.7 <8":
   "integrity" "sha512-j6jIyGFFBlwWAmrlUg9HyQ/x+YpsPkc/TTkbTyeLwwAJrpAmmEHNPT6O9xtAnMV4g7d3RqLL/u9//aZlbY4rQA=="
   "resolved" "https://registry.npmmirror.com/firebase/-/firebase-7.24.0.tgz"
   "version" "7.24.0"
@@ -6782,7 +6782,7 @@
   dependencies:
     "html-escaper" "^2.0.0"
 
-"jasmine-core@^3.3", "jasmine-core@~3.4.0":
+"jasmine-core@^3.3", "jasmine-core@>=3.8", "jasmine-core@~3.4.0":
   "integrity" "sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg=="
   "resolved" "https://registry.npmmirror.com/jasmine-core/-/jasmine-core-3.4.0.tgz"
   "version" "3.4.0"
@@ -6975,7 +6975,7 @@
   "resolved" "https://registry.npmmirror.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz"
   "version" "1.7.0"
 
-"karma-jasmine@~2.0.1":
+"karma-jasmine@>=1.1", "karma-jasmine@~2.0.1":
   "integrity" "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA=="
   "resolved" "https://registry.npmmirror.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz"
   "version" "2.0.1"
@@ -6989,7 +6989,7 @@
   dependencies:
     "source-map-support" "^0.5.5"
 
-"karma@~4.1.0":
+"karma@*", "karma@>=0.9", "karma@~4.1.0":
   "integrity" "sha512-xckiDqyNi512U4dXGOOSyLKPwek6X/vUizSy2f3geYevbLj+UIdvNwbn7IwfUIL2g1GXEPWt/87qFD1fBbl/Uw=="
   "resolved" "https://registry.npmmirror.com/karma/-/karma-4.1.0.tgz"
   "version" "4.1.0"
@@ -7081,7 +7081,7 @@
     "loader-utils" "^1.1.0"
     "pify" "^4.0.1"
 
-"less@3.10.3":
+"less@^2.3.1 || ^3.0.0", "less@3.10.3":
   "integrity" "sha512-vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow=="
   "resolved" "https://registry.npmmirror.com/less/-/less-3.10.3.tgz"
   "version" "3.10.3"
@@ -9414,7 +9414,7 @@
   dependencies:
     "aproba" "^1.1.1"
 
-"rxjs@^6.4.0", "rxjs@~6.5.4":
+"rxjs@^6.0.0", "rxjs@^6.4.0", "rxjs@^6.5.3", "rxjs@>=6.0.0", "rxjs@~6.5.3", "rxjs@~6.5.4":
   "integrity" "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="
   "resolved" "https://registry.npmmirror.com/rxjs/-/rxjs-6.5.5.tgz"
   "version" "6.5.5"
@@ -9471,7 +9471,7 @@
     "schema-utils" "^2.1.0"
     "semver" "^6.3.0"
 
-"sass@1.23.3":
+"sass@^1.3.0", "sass@1.23.3":
   "integrity" "sha512-1DKRZxJMOh4Bme16AbWTyYeJAjTlrvw2+fWshHHaepeJfGq2soFZTnt0YhWit+bohtDu4LdyPoEj6VFD4APHog=="
   "resolved" "https://registry.npmmirror.com/sass/-/sass-1.23.3.tgz"
   "version" "1.23.3"
@@ -10298,7 +10298,7 @@
     "lodash.clonedeep" "^4.5.0"
     "when" "~3.6.x"
 
-"stylus@0.54.7":
+"stylus@>=0.52.4", "stylus@0.54.7":
   "integrity" "sha512-Yw3WMTzVwevT6ZTrLCYNHAFmanMxdylelL3hkWNgPMeTCpMwpV3nXjpOHuBXtFv7aiO2xRuQS6OoAdgkNcSNug=="
   "resolved" "https://registry.npmmirror.com/stylus/-/stylus-0.54.7.tgz"
   "version" "0.54.7"
@@ -10616,7 +10616,7 @@
   "resolved" "https://registry.npmmirror.com/tslib/-/tslib-1.10.0.tgz"
   "version" "1.10.0"
 
-"tslint@~5.15.0":
+"tslint@^5.0.0 || ^6.0.0", "tslint@~5.15.0":
   "integrity" "sha512-6bIEujKR21/3nyeoX2uBnE8s+tMXCQXhqMmaIPJpHmXJoBJPTLcI7/VHRtUwMhnLVdwLqqY3zmd8Dxqa5CVdJA=="
   "resolved" "https://registry.npmmirror.com/tslint/-/tslint-5.15.0.tgz"
   "version" "5.15.0"
@@ -10682,7 +10682,7 @@
   "resolved" "https://registry.npmmirror.com/typedarray/-/typedarray-0.0.6.tgz"
   "version" "0.0.6"
 
-"typescript@~3.7.5":
+"typescript@>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev", "typescript@>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev", "typescript@>=3.6 < 3.8", "typescript@>=3.6 <3.8", "typescript@~3.7.5":
   "integrity" "sha512-MmQdgo/XenfZPvVLtKZOq9jQQvzaUAUpcKW8Z43x9B2fOm4S5g//tPtMweZUIP+SoBqrVPEIm+dJeQ9dfO0QdA=="
   "resolved" "https://registry.npmmirror.com/typescript/-/typescript-3.7.7.tgz"
   "version" "3.7.7"
@@ -11010,7 +11010,7 @@
     "range-parser" "^1.2.1"
     "webpack-log" "^2.0.0"
 
-"webpack-dev-server@3.9.0":
+"webpack-dev-server@^3.1.4", "webpack-dev-server@3.9.0":
   "integrity" "sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw=="
   "resolved" "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz"
   "version" "3.9.0"
@@ -11079,7 +11079,7 @@
   dependencies:
     "webpack-sources" "^1.3.0"
 
-"webpack@4.41.2":
+"webpack@^1 || ^2 || ^3 || ^4", "webpack@^1.12.11 || ~2 || ~3 || ~4", "webpack@^2.0.0 || ^3.0.0 || ^4.0.0", "webpack@^4.0.0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.3.0", "webpack@^4.36.0", "webpack@^4.4.0", "webpack@^4.6.0", "webpack@>= 4", "webpack@>=2", "webpack@>=4.0.1", "webpack@4.41.2":
   "integrity" "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A=="
   "resolved" "https://registry.npmmirror.com/webpack/-/webpack-4.41.2.tgz"
   "version" "4.41.2"