[新增]增加黄海盒子配置选择

package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
-    "start": "ng serve --proxy-config  proxy.config.json --open --port 1234",
+    "start": "ng serve --proxy-config  proxy.config.json --open --port 1234 ",
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
     "test": "ng test"
@@ -19,12 +19,10 @@
     "@angular/platform-browser-dynamic": "~13.1.0",
     "@angular/router": "~13.1.0",
     "js-base64": "^3.7.2",
-    "js-yaml": "^4.1.0",
     "ng-zorro-antd": "^13.0.1",
     "ngx-cookie-service": "^13.1.2",
     "rxjs": "~7.4.0",
     "tslib": "^2.3.0",
-    "yaml": "^2.2.1",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {

proxy.config.json

@@ -1,8 +1,6 @@
 {
   "/api": {
     "target": "http://121.36.37.70:8080/",
-    "测试":"http://121.36.37.70:8080/",
-    "生产":"http://10.156.134.53:9001/",
     "secure": false,
     "changeOrigin": true
   },

src/app/CustomReuseStrategy.ts

@@ -1,64 +1,58 @@
-import {
+import { RouteReuseStrategy, ActivatedRouteSnapshot, DetachedRouteHandle } from '@angular/router';
-  RouteReuseStrategy,
-  ActivatedRouteSnapshot,
-  DetachedRouteHandle,
-} from '@angular/router';
 
 export class CustomReuseStrategy implements RouteReuseStrategy {
-  public static handlers: { [key: string]: DetachedRouteHandle } = {};
 
-  /** 删除缓存路由快照的方法 */
+    public static handlers: { [key: string]: DetachedRouteHandle } = {};
-  public static deleteRouteSnapshot(path: string): void {
+
-    const name = path.replace(/\//g, '_');
+    /** 删除缓存路由快照的方法 */
-    if (CustomReuseStrategy.handlers[name]) {
+    public static deleteRouteSnapshot(path: string): void {
-      delete CustomReuseStrategy.handlers[name];
+        const name = path.replace(/\//g, '_');
+        if (CustomReuseStrategy.handlers[name]) {
+            delete CustomReuseStrategy.handlers[name];
+        }
     }
-  }
 
-  /** 进入路由触发，判断是否同一路由 */
+    /** 表示对所有路由允许复用 如果你有路由不想利用可以在这加一些业务逻辑判断 */
-  shouldReuseRoute(
+    shouldDetach(route: ActivatedRouteSnapshot): boolean {
-    future: ActivatedRouteSnapshot,
+        console.log('shouldDetach======>', route);
-    curr: ActivatedRouteSnapshot
+        return true;
-  ): boolean {
+    }
-    // console.debug('shouldReuseRoute======>', future, curr);
-    return (
-      future.routeConfig === curr.routeConfig &&
-      JSON.stringify(future.params) === JSON.stringify(curr.params)
-    );
-  }
 
-  /** 表示对所有路由允许复用 如果你有路由不想利用可以在这加一些业务逻辑判断 */
+    /** 当路由离开时会触发。按path作为key存储路由快照&组件当前实例对象 */
-  shouldDetach(route: ActivatedRouteSnapshot): boolean {
+    store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void {
-    console.log('shouldDetach======>', route);
+        console.log('store======>', route, handle);
-    return true;
+        if(route.routeConfig.path == 'host'){
-  }
+            CustomReuseStrategy.handlers[this.getRouteUrl(route)] = handle;
+        }
+    }
 
-  /** 当路由离开时会触发。按path作为key存储路由快照&组件当前实例对象 */
+    /** 若 path 在缓存中有的都认为允许还原路由 */
-  store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void {
+    shouldAttach(route: ActivatedRouteSnapshot): boolean {
-    console.log('store======>', route, handle);
+        // console.debug('shouldAttach======>', route);
-    if (route.routeConfig.path == 'host') {
+        return !!CustomReuseStrategy.handlers[this.getRouteUrl(route)];
-      CustomReuseStrategy.handlers[this.getRouteUrl(route)] = handle;
     }
-  }
 
-  /** 若 path 在缓存中有的都认为允许还原路由 */
+    /** 从缓存中获取快照，若无则返回nul */
-  shouldAttach(route: ActivatedRouteSnapshot): boolean {
+    retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle {
-    // console.debug('shouldAttach======>', route);
+        // console.debug('retrieve======>', route);
-    return !!CustomReuseStrategy.handlers[this.getRouteUrl(route)];
+        if (!CustomReuseStrategy.handlers[this.getRouteUrl(route)]) {
-  }
+            return null;
+        }
+
+        return CustomReuseStrategy.handlers[this.getRouteUrl(route)];
+    }
+
+    /** 进入路由触发，判断是否同一路由 */
+    shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {
+        // console.debug('shouldReuseRoute======>', future, curr);
+        return future.routeConfig === curr.routeConfig &&
+            JSON.stringify(future.params) === JSON.stringify(curr.params);
+    }
 
-  /** 从缓存中获取快照，若无则返回nul */
+    /** 使用route的path作为快照的key */
-  retrieve(route: ActivatedRouteSnapshot): DetachedRouteHandle {
+    getRouteUrl(route: ActivatedRouteSnapshot) {
-    // console.debug('retrieve======>', route);
+        const path = route['_routerState'].url.replace(/\//g, '_');
-    if (!CustomReuseStrategy.handlers[this.getRouteUrl(route)]) {
+        return path;
-      return null;
     }
-    return CustomReuseStrategy.handlers[this.getRouteUrl(route)];
-  }
 
-  /** 使用route的path作为快照的key */
-  getRouteUrl(route: ActivatedRouteSnapshot) {
-    const path = route['_routerState'].url.replace(/\//g, '_');
-    return path;
-  }
 }

src/app/app.component.ts

@@ -13,6 +13,5 @@ export class AppComponent {
       //调用服务中的function刷新token
       this.token.startUp()  
     }
-    console.log('更新日期:20241213')
   }
 }

src/app/app.module.ts

@@ -6,19 +6,18 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { PagesModule } from './pages/pages.module';
 import { FormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
-import { httpInterceptorProviders } from './http-interceptors/index';
+import { httpInterceptorProviders } from './http-interceptors/index'
-import { CacheTokenService } from './service/cache-token.service';
+import { CacheTokenService } from './service/cache-token.service'
 import { NzNotificationModule } from 'ng-zorro-antd/notification';
 import { NzMessageModule } from 'ng-zorro-antd/message';
 import { TreeService } from './service/tree.service';
 import { RouteReuseStrategy } from '@angular/router';
 import { CustomReuseStrategy } from './CustomReuseStrategy';
 import { ConfigFormDataService } from './service/configFormData.service';
-import { registerLocaleData } from '@angular/common';
-import zh from '@angular/common/locales/zh';
-registerLocaleData(zh);
 @NgModule({
-  declarations: [AppComponent],
+  declarations: [
+    AppComponent
+  ],
   imports: [
     BrowserModule,
     AppRoutingModule,
@@ -27,18 +26,9 @@ registerLocaleData(zh);
     FormsModule,
     HttpClientModule,
     NzNotificationModule,
-    NzMessageModule,
+    NzMessageModule
-  ],
-  providers: [
-    httpInterceptorProviders,
-    CacheTokenService,
-    TreeService,
-    ConfigFormDataService,
-    {
-      provide: RouteReuseStrategy,
-      useClass: CustomReuseStrategy,
-    },
   ],
-  bootstrap: [AppComponent],
+  providers: [httpInterceptorProviders, CacheTokenService, TreeService, ConfigFormDataService],
+  bootstrap: [AppComponent]
 })
-export class AppModule {}
+export class AppModule { }

src/app/http-interceptors/base-interceptor.ts

@@ -1,28 +1,23 @@
 import { Injectable } from '@angular/core';
 import {
-  HttpClient,
+  HttpClient, HttpInterceptor, HttpHandler, HttpRequest,
-  HttpInterceptor,
+  HttpErrorResponse
-  HttpHandler,
-  HttpRequest,
-  HttpErrorResponse,
 } from '@angular/common/http';
-import { throwError } from 'rxjs';
+import { throwError } from 'rxjs'
 import { catchError } from 'rxjs/operators';
-import { Router } from '@angular/router';
+import { Router } from '@angular/router'
-import { CacheTokenService } from '../service/cache-token.service';
+import { CacheTokenService } from '../service/cache-token.service'
 import { NzMessageService } from 'ng-zorro-antd/message';
 //baseurl
 // const baseurl = 'http://39.106.78.171:8008';
 
 @Injectable()
 export class BaseInterceptor implements HttpInterceptor {
-  constructor(
+
-    private router: Router,
+  constructor(private router: Router, public token: CacheTokenService, private message: NzMessageService) { }
-    public token: CacheTokenService,
-    private message: NzMessageService
-  ) {}
 
   intercept(req: any, next: HttpHandler) {
+
     let params = req.params;
     for (const key of req.params.keys()) {
       if (params.get(key) === undefined || params.get(key) === null) {
@@ -37,47 +32,45 @@ export class BaseInterceptor implements HttpInterceptor {
     });
     if (!req.cancelToken) {
       /*获取token*/
-      let token = sessionStorage.getItem('token');
+      let token = sessionStorage.getItem('token')
-      if (req.url == '/api/Data/ViolationRecordPush') {
-        token =
-          'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJhbnhpbiIsIm5hbWUiOiLlronkv6EiLCJyb2xlIjoiUHJvZmlsZSIsIm5iZiI6MTY4NTQzNjIzNCwiZXhwIjoyMDAwNzk2MjM0LCJpc3MiOiJhbnhpbjk5LmNvbSIsImF1ZCI6IkVDTElFTlQifQ.obkc9epvwk2Xain4hqL9OrsRtBrAJ2C690CA1OJIqAo';
-      }
       /*此处设置额外请求头，token令牌*/
-      newReq.headers = newReq.headers.set('Authorization', `Bearer ${token}`);
+      newReq.headers =
+        newReq.headers.set('Authorization', `Bearer ${token}`)
     }
 
     // 携带请求头发送下一次请求
-    return next.handle(newReq).pipe(
+    return next.handle(newReq)
-      //箭头函数,注意this指向
+      .pipe(
-      catchError((err) => this.handleError(err))
+        //箭头函数,注意this指向
-    );
+        catchError((err) => this.handleError(err))
+      )
   }
 
   // 捕获错误  
   //401 token过期   403没权限!!!   400参数错误   404未找到   614刷新令牌过期!!!
 
   private handleError(error: HttpErrorResponse) {
-    console.log('http错误', error);
+    console.log('http错误', error)
     // 用户认证失败返回登录页
     if (error.status === 401) {
-      this.token.delete();
+      this.token.delete()
-      sessionStorage.clear();
+      sessionStorage.clear()
-      localStorage.removeItem('isautologin');
+      localStorage.removeItem("isautologin")
       this.message.create('error', `用户认证信息过期,请重新登录!`);
-      this.router.navigate(['/login']);
+      this.router.navigate(['/login'])
-      return;
+      return
     }
     if (error.status === 403) {
       this.message.create('error', `对不起,您无此权限!`);
-      return;
+      return
     }
     if (error.status === 400) {
       this.message.create('error', error.error);
-      return;
+      return
     }
     if (error.status === 503) {
-      this.message.create('error', error.error.detail);
+      this.message.create('error',  error.error.detail);
-      return;
+      return
     }
     if (error.error instanceof ErrorEvent) {
       // 发生客户端或网络错误。相应处理。
@@ -85,12 +78,14 @@ export class BaseInterceptor implements HttpInterceptor {
     } else {
       // 服务端返回http状态码
       // 服务端返回错误信息
-      console.error(`状态码${error.status}, ` + `错误内容:${error.error}`);
+      console.error(
-      this.message.create('error', error.error);
+        `状态码${error.status}, ` +
+        `错误内容:${error.error}`);
+        this.message.create('error', error.error);
     }
     // 返回带有面向用户的错误信息
     return throwError(() => {
-      new Error('error');
+      new Error('error')
     });
-  }
+  };
 }

src/app/service/objectsSimple.service.ts

@@ -1,114 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ObjectsSimpleService {
-  static readonly c_apiRoot = '/api/'; //普通上传的API根路径
-  static readonly c_apiRoot_Multipart = '/api/'; //分块上传的API根路径
-  constructor(private http: HttpClient) {}
-
-  static getBucketName() {
-    let bucket = '/test/';
-    return bucket;
-  }
-
-  //普通上传，单个文件上限5M
-  static baseUrl =
-    ObjectsSimpleService.c_apiRoot +
-    'Objects' +
-    ObjectsSimpleService.getBucketName();
-  postFile(extensionPath: string, file: File): Observable<Object> {
-    let formData = new FormData();
-    formData.append('file', file, file.name);
-    let data = { keepOriginalName: 'true' };
-    return this.http.post(
-      ObjectsSimpleService.baseUrl + extensionPath,
-      formData,
-      { params: data }
-    );
-  }
-
-  //分块上传
-  static baseUrl_MultipartUpload =
-    ObjectsSimpleService.c_apiRoot_Multipart +
-    'NewMultipartUpload' +
-    ObjectsSimpleService.getBucketName();
-  postFile_MultipartUpload(extensionPath: string, file: File): Promise<Object> {
-    // let formData = new FormData()
-    // formData.append("file", file, file.name)
-    // return this.http.post(ObjectsSimpleService.baseUrl + extensionPath, formData);
-    let data = { keepOriginalName: 'true', filename: file.name };
-    return new Promise((resolve, reject) => {
-      this.http
-        .post(
-          ObjectsSimpleService.baseUrl_MultipartUpload + extensionPath,
-          {},
-          { params: data }
-        )
-        .subscribe(async (data: any) => {
-          //初始化分段上传
-          let objectName = data.objectName;
-          let uploadId = data.uploadId;
-          let PartNumberETag = []; //每次返回需要保存的信息
-          //分块 处理
-          let fileSize = file.size || null; //上传文件的总大小
-          let shardSize = 5 * 1024 * 1024; //5MB一个分片
-          let allSlice = Math.ceil(fileSize / shardSize); //总文件/5MB===共分多少段
-          console.log('共分多少段' + allSlice);
-          for (let i = 0; i < allSlice; i++) {
-            //循环分段上传
-            let start = i * shardSize; //切割文件开始位置
-            let end = Math.min(fileSize, start + shardSize); //切割文件结束位置
-            let formData = new FormData();
-            formData.append('file', file.slice(start, end));
-
-            //同步写法实现异步调用
-            let result = await new Promise((resolve, reject) => {
-              // await 需要后面返回一个 promise 对象
-              this.http
-                .post(
-                  ObjectsSimpleService.c_apiRoot_Multipart +
-                    `MultipartUpload` +
-                    +ObjectsSimpleService.getBucketName() +
-                    `${objectName}?uploadId=${uploadId}&partNumber=${i + 1}`,
-                  formData
-                )
-                .subscribe((data: any) => {
-                  let msg = {
-                    partNumber: data.partNumber || null,
-                    eTag: data.eTag || null,
-                  };
-                  resolve(msg); // 调用 promise 内置方法处理成功
-                });
-            });
-            PartNumberETag.push(result);
-
-            if (PartNumberETag.length === allSlice) {
-              //分块上传完成
-
-              let data = PartNumberETag;
-              let paramsData = { uploadId: uploadId };
-              let path =
-                ObjectsSimpleService.c_apiRoot_Multipart +
-                'CompleteMultipartUpload' +
-                ObjectsSimpleService.getBucketName() +
-                objectName;
-              this.http
-                .post(path, data, { params: paramsData })
-                .subscribe((data) => {
-                  let objData: any = new Object();
-                  objData.fileName = file.name;
-                  objData.filePath = ObjectsSimpleService.baseUrl + objectName;
-                  resolve(objData);
-                });
-            }
-          } //for循环
-
-          //分块 处理
-        });
-    });
-  }
-}

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

@@ -1,22 +1,11 @@
 <div class="box">
     <form nz-form [formGroup]="validateForm">
         <nz-form-item>
-            <nz-form-label [nzSpan]="5">ip</nz-form-label>
             <nz-form-control>
                 <nz-input-group>
                     <input nz-input type="text" formControlName="ip" placeholder="请输入ip" />
                 </nz-input-group>
             </nz-form-control>
         </nz-form-item>
-        <nz-form-item>
-            <nz-form-label [nzSpan]="5">类型</nz-form-label>
-            <nz-form-control>
-                <nz-select formControlName="type" name="select-validate" nzPlaceHolder="设备类型">
-                    <nz-option [nzValue]="0" nzLabel="警旗1"></nz-option>
-                    <nz-option [nzValue]="1" nzLabel="警旗2"></nz-option>
-                    <nz-option [nzValue]="2" nzLabel="警旗3"></nz-option>
-                </nz-select>
-            </nz-form-control>
-        </nz-form-item>
     </form>
 </div>

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

@@ -1,3 +1,3 @@
-.ant-form-item {
+.ant-form-item{
-  margin-bottom: 12px;
+    margin-bottom: 0;
 }

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

@@ -6,20 +6,16 @@ import { HttpClient } from '@angular/common/http';
 @Component({
   selector: 'app-addhost',
   templateUrl: './addhost.component.html',
-  styleUrls: ['./addhost.component.scss'],
+  styleUrls: ['./addhost.component.scss']
 })
 export class AddhostComponent implements OnInit {
+
   validateForm!: FormGroup;
-  constructor(
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
-    private modal: NzModalRef,
-    private fb: FormBuilder,
-    private http: HttpClient
-  ) {}
 
   ngOnInit(): void {
     this.validateForm = this.fb.group({
-      ip: [null, [Validators.required]],
+      ip: [null, [Validators.required]]
-      type: [null, [Validators.required]],
     });
   }
 }

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

@@ -12,11 +12,8 @@
     </div>
     <div class="treeTitle">
       <span>组织机构</span>
-
     </div>
     <div class="treebox">
-      <a (click)="workerTag(1)">批量更新workerTag</a>
-      <a (click)="workerTag(2)">批量更新oilin_sleep_m</a>
       <nz-tree [nzHideUnMatched]='true' [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes"
         [nzExpandAll]="nzExpandAll" [nzExpandedKeys]="defaultExpandedKeys" [nzSelectedKeys]='nzSelectedKeys'
         (nzClick)="nzClick($event)">
@@ -28,9 +25,7 @@
       <div class="lefttop">
         <span>{{selectedOilStation ? selectedOilStation.displayName : '加油站'}} 边缘盒子列表
           <span class="yellowspan">（请从左侧选择加油站）</span>
-          <i style="cursor: pointer;" (click)="refresh()" nz-icon nzType="redo" nzTheme="outline"></i>
         </span>
-
       </div>
       <div class="righttop" *ngIf="selectedOilStation">
         <button nz-button nzType="primary" (click)="addHost()"><i nz-icon nzType="plus-circle"
@@ -43,7 +38,6 @@
           <tr>
             <th>ip</th>
             <th>配置状态</th>
-            <th>设备类型</th>
             <th>操作</th>
           </tr>
         </thead>
@@ -51,10 +45,18 @@
           <tr *ngFor="let data of basicTable.data">
             <td>{{data.hostIPAddress}}</td>
             <td>!配置状态!</td>
-            <td>{{data.deviceProvider === 0 ? '警旗1' : data.deviceProvider === 1 ? '警旗2' :'警旗3'}}</td>
             <td class="operation">
               <a (click)="edit(data)" style="margin-right: 12px;">编辑</a>
               <a (click)="config(data)" style="margin-right: 12px;">配置</a>
+              <nz-modal [(nzVisible)]="isVisible" [nzWidth]="300" nzTitle="请选择要配置的边缘主机" (nzOnCancel)="handleCancel()"
+                (nzOnOk)="handleOk()">
+                <ng-container *nzModalContent>
+                  <nz-radio-group [(ngModel)]="radioValue">
+                    <label nz-radio nzValue="交大">交大盒子</label>
+                    <label nz-radio nzValue="黄海">黄海盒子</label>
+                  </nz-radio-group>
+                </ng-container>
+              </nz-modal>
               <a (click)="download(data)" style="margin-right: 12px;">下载设备编号</a>
               <a class="red" (click)="delete(data)">删除</a>
             </td>

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

@@ -8,6 +8,7 @@
   font-size: 15px;
 }
 
+
 .orbox {
   width: 375px;
   height: 100%;
@@ -26,7 +27,7 @@
 
   .lefttop {
     span {
-      color: #000d21;
+      color: #000D21;
       margin-right: 16px;
     }
 
@@ -55,17 +56,16 @@
   line-height: 36px;
   display: flex;
   justify-content: space-between;
-  color: #000d21;
+  color: #000D21;
   box-sizing: border-box;
-  padding: 0 30px;
+  padding-left: 30px;
+  padding-right: 180px;
   background: rgba(145, 204, 255, 0.2);
   border: 1px solid rgba(145, 204, 255, 0.2);
 }
 
 .treebox {
   flex: 1;
-  display: flex;
-  flex-direction: column;
   overflow-y: auto;
   border: 1px solid rgba(145, 204, 255, 0.2);
   border-top: 0px;
@@ -73,6 +73,7 @@
   padding: 10px 6px;
 
   tr {
+
     th,
     td {
       text-align: center !important;
@@ -94,6 +95,6 @@
   margin-top: 16px;
 }
 
-.red:hover {
+.red:hover{
   color: red;
 }

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

@@ -1,102 +1,70 @@
 import { HttpClient } from '@angular/common/http';
-import {
+import { Component, OnInit, AfterViewInit, ViewChild, ViewContainerRef } from '@angular/core';
-  Component,
-  OnInit,
-  AfterViewInit,
-  ViewChild,
-  ViewContainerRef,
-} from '@angular/core';
 import { TreeService } from 'src/app/service/tree.service';
-import {
+import { NzFormatEmitEvent, NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
-  NzFormatEmitEvent,
-  NzTreeComponent,
-  NzTreeNodeOptions,
-} from 'ng-zorro-antd/tree';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { AddhostComponent } from './addhost/addhost.component';
 import { EdithostComponent } from './edithost/edithost.component';
-import { NavigationEnd, Router } from '@angular/router';
+import { Router } from '@angular/router';
-import { filter } from 'rxjs';
-import { WorkerTagComponent } from './worker-tag/worker-tag.component';
 @Component({
   selector: 'app-analysis-of-the-host',
   templateUrl: './analysis-of-the-host.component.html',
-  styleUrls: ['./analysis-of-the-host.component.scss'],
+  styleUrls: ['./analysis-of-the-host.component.scss']
 })
 export class AnalysisOfTheHostComponent implements OnInit {
-  constructor(
+
-    private router: Router,
+  constructor(private router: Router, private fb: FormBuilder, private http: HttpClient, private toTree: TreeService, private modal: NzModalService, private message: NzMessageService, private viewContainerRef: ViewContainerRef) { }
-    private fb: FormBuilder,
-    private http: HttpClient,
-    private toTree: TreeService,
-    private modal: NzModalService,
-    private message: NzMessageService,
-    private viewContainerRef: ViewContainerRef
-  ) {
-    router.events
-      .pipe(filter((e) => e instanceof NavigationEnd))
-      .subscribe((e) => {
-        if (this.selectedOilStation && this.selectedOilStation.id) {
-          this.getHost();
-        }
-      });
-  }
   ngOnInit(): void {
-    this.getAllOrganization();
+    this.getAllOrganization()
   }
 
+
   //获取所有组织机构
   searchValue = '';
   nzExpandAll = false;
-  totalCount: string;
+  totalCount: string
 
   getAllOrganization() {
     let params = {
       ContainsChildren: true,
-      PageSize: 9999,
+      PageSize: 9999
-    };
+    }
-    this.http
+    this.http.get('/api/Organizations', {
-      .get('/api/Organizations', {
+      params: params
-        params: params,
+    }).subscribe((data: any) => {
-      })
+      this.totalCount = data.totalCount
-      .subscribe((data: any) => {
+      console.log(data.items)
-        this.totalCount = data.totalCount;
+      data.items.forEach(element => {
-        console.log(data.items);
+        element.key = element.id
-        data.items.forEach((element) => {
+        element.title = element.name
-          element.key = element.id;
+        element.selectable = false
-          element.title = element.name;
+        if (element.isGasStation) {
-          element.selectable = false;
+          element.isLeaf = true
-          if (element.isGasStation) {
+        }
-            element.isLeaf = true;
-            element.disableCheckbox = false;
-          } else {
-            element.disableCheckbox = true;
-          }
-        });
-        this.nodes = [...this.toTree.toTree(data.items)];
-        this.defaultExpandedKeys = [this.nodes[0].id];
-        this.defaultExpandedKeys = [...this.defaultExpandedKeys];
       });
+      this.nodes = [...this.toTree.toTree(data.items)]
+      this.defaultExpandedKeys = [this.nodes[0].id]
+      this.defaultExpandedKeys = [...this.defaultExpandedKeys]
+    })
   }
 
-  @ViewChild('nzTreeComponent', { static: false })
+
-  nzTreeComponent!: NzTreeComponent;
+  @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
 
   defaultExpandedKeys = [];
 
-  nodes: any[] = [];
+  nodes: any[] = []
-  nzSelectedKeys: any[] = [];
+  nzSelectedKeys: any[] = []
-  selectedOilStation: any;
+  selectedOilStation: any
   nzClick(event: NzFormatEmitEvent): void {
-    if (event.node.origin['isGasStation']) {
+    if (event.node.origin['isGasStation']) {//如果点击的是加油站才生效
-      //如果点击的是加油站才生效
+      this.nzSelectedKeys[0] = event.node.origin.id
-      this.nzSelectedKeys[0] = event.node.origin.id;
+      this.nzSelectedKeys = [...this.nzSelectedKeys]
-      this.nzSelectedKeys = [...this.nzSelectedKeys];
+      this.selectedOilStation = event.node.origin
-      this.selectedOilStation = event.node.origin;
+      console.log(this.selectedOilStation)
-      console.log(this.selectedOilStation);
+      this.getHost()
-      this.getHost();
     } else {
       this.message.info('只有加油站才可以增加主机');
     }
@@ -104,41 +72,30 @@ export class AnalysisOfTheHostComponent implements OnInit {
 
   //获得加油站的主机
   listOfData: any[] = [];
-  isLoading = false;
+  isLoading = false
   getHost() {
-    this.isLoading = true;
+    this.isLoading = true
-    this.http
+    this.http.get('/api/EdgeDevices', {
-      .get('/api/EdgeDevices', {
+      params: {
-        params: {
+        ContainsChildren: true,
-          ContainsChildren: true,
+        OrganizationId: this.selectedOilStation.id,
-          OrganizationId: this.selectedOilStation.id,
+        PageSize: 999
-          PageSize: 999,
+      }
-        },
+    }).subscribe((data: any) => {
-      })
+      console.log('主机列表', data.items)
-      .subscribe((data: any) => {
+      this.isLoading = false
-        console.log('主机列表', data.items);
+      this.listOfData = data.items
-        this.isLoading = false;
+    })
-        this.listOfData = data.items;
-      });
   }
 
-  refresh() {
-    this.http.put('/api/EdgeDevices/SyncAllEdgeDevices', null).subscribe({
-      next: (data) => {
-        this.message.success('同步边缘设备成功');
-        this.getHost();
-      },
-      error: (err) => {
-        this.message.error('同步边缘设备失败');
-      },
-    });
-  }
 
-  ngAfterViewInit(): void {}
+  ngAfterViewInit(): void {
+
+  }
 
   //新增边缘盒子
   addHost() {
-    console.log(this.selectedOilStation);
+    console.log(this.selectedOilStation)
     const modal = this.modal.create({
       nzTitle: '新增边缘盒子',
       nzContent: AddhostComponent,
@@ -147,190 +104,118 @@ export class AnalysisOfTheHostComponent implements OnInit {
       nzComponentParams: {},
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
-          await new Promise((resolve) => {
+          await new Promise(resolve => {
-            console.log('表单信息', instance.validateForm);
+            console.log('表单信息', instance.validateForm)
             let body = {
               hostIPAddress: instance.validateForm.value.ip,
-              deviceProvider: instance.validateForm.value.type,
+              OrganizationId: this.selectedOilStation.id
-              OrganizationId: this.selectedOilStation.id,
+            }
-            };
+            this.http.post('/api/EdgeDevices', body).subscribe(data => {
-            this.http.post('/api/EdgeDevices', body).subscribe((data) => {
+              resolve(data)
-              resolve(data);
               this.message.create('success', '创建成功！');
-              this.getHost();
+              this.getHost()
-              return true;
+              return true
-            });
+            })
-          });
+          })
         } else {
           this.message.create('warning', '请填写完整！');
-          return false;
+          return false
         }
-      },
+      }
     });
     const instance = modal.getContentComponent();
   }
 
   edit(data) {
-    console.log(data);
+    console.log(data)
     const modal = this.modal.create({
       nzTitle: '编辑边缘盒子',
       nzContent: EdithostComponent,
       nzViewContainerRef: this.viewContainerRef,
       nzWidth: 288,
       nzComponentParams: {
-        ip: data.hostIPAddress,
+        ip: data.hostIPAddress
-        type: data.deviceProvider,
       },
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
-          console.log('表单信息', instance.validateForm.value);
+          await new Promise(resolve => {
-          await new Promise((resolve) => {
+            console.log('表单信息', instance.validateForm)
-            (data.hostIPAddress = instance.validateForm.value.ip),
+            data.hostIPAddress = instance.validateForm.value.ip,
-              (data.deviceProvider = instance.validateForm.value.type);
+              this.http.put(`/api/EdgeDevices/${data.id}`, data).subscribe(data => {
-            this.http
+                resolve(data)
-              .put(`/api/EdgeDevices/${data.id}`, data)
-              .subscribe((data) => {
-                resolve(data);
                 this.message.create('success', '修改成功！');
-                this.getHost();
+                this.getHost()
-                return true;
+                return true
-              });
+              })
-          });
+          })
         } else {
           this.message.create('warning', '请填写完整！');
-          return false;
+          return false
         }
-      },
+      }
     });
     const instance = modal.getContentComponent();
   }
 
   delete(item) {
-    console.log(item);
+    console.log(item)
     this.modal.confirm({
       nzTitle: `确定要删除${item.name}这个主机吗?`,
       nzOkText: '确定',
       nzOkType: 'primary',
       nzOnOk: () => {
-        this.http.delete(`/api/EdgeDevices/${item.id}`).subscribe((data) => {
+        this.http.delete(`/api/EdgeDevices/${item.id}`).subscribe(data => {
           this.message.create('success', '删除成功！');
-          this.getHost();
+          this.getHost()
-        });
+        })
       },
-      nzCancelText: '取消',
+      nzCancelText: '取消'
     });
   }
 
-  isVisible = false;
-  radioValue = '警旗1';
-  configdata;
 
-  deviceProviderObj = {
+  isVisible = false
-    0: '警旗1',
+  radioValue = '交大'
-    1: '警旗2',
-    2: '警旗3',
-    4: '警旗3',
-  };
-  config(data: any) {
-    sessionStorage.setItem('hostIPAddress', data.hostIPAddress);
-    // this.isVisible = true;
-    this.configdata = data;
-    console.log(this.configdata);
-    // return;
-    let body = {
-      deviceProvider: this.configdata.deviceProvider,
-    };
-    this.http.put(`/api/EdgeDevices/${this.configdata.id}`, body).subscribe({
-      next: (data) => {
-        setTimeout(() => {
-          this.router.navigate([`/system/host/camera`], {
-            queryParams: {
-              hostId: this.configdata.id,
-              orId: this.selectedOilStation.id,
-              type: this.deviceProviderObj[this.configdata.deviceProvider],
-            },
-          });
-        }, 0);
-      },
-      error: (err) => {
-        this.message.create('error', '更新边缘设备失败');
-      },
-    });
-  }
 
+  configdata
+  config(data) {
+    this.isVisible = true
+    this.configdata = data
+  }
   handleOk(): void {
-    let body = {
+    this.isVisible = false;
-      deviceProvider: DeviceProvider[this.radioValue],
+    this.router.navigate([`/system/host/camera`], { queryParams: { 'hostId': this.configdata.id, 'orId': this.selectedOilStation.id, 'type': this.radioValue } })
-    };
-    this.http.put(`/api/EdgeDevices/${this.configdata.id}`, body).subscribe({
-      next: (data) => {
-        this.isVisible = false;
-        setTimeout(() => {
-          this.router.navigate([`/system/host/camera`], {
-            queryParams: {
-              hostId: this.configdata.id,
-              orId: this.selectedOilStation.id,
-              type: this.radioValue,
-            },
-          });
-        }, 0);
-      },
-      error: (err) => {
-        this.message.create('error', '更新边缘设备失败');
-      },
-    });
   }
 
   handleCancel(): void {
     this.isVisible = false;
   }
+
   download(data) {
-    console.log(data);
+    console.log(data)
     let params = {
-      edgeDeviceId: data.id,
+      edgeDeviceId: data.id
-    };
+    }
     const httpOptions = {
       responseType: 'blob' as 'json',
-      params: params,
+      params: params
     };
-    this.http
+    this.http.get(`/api/EdgeDevices/IdentityDigest/File`, httpOptions).subscribe({
-      .get(`/api/EdgeDevices/IdentityDigest/File`, httpOptions)
+      next: (data: any) => {
-      .subscribe({
+        console.log('文件', data)
-        next: (data: any) => {
+        // 文件名中有中文 则对文件名进行转码
-          console.log('文件', data);
+        const link = document.createElement('a');
-          // 文件名中有中文 则对文件名进行转码
+        const blob = new Blob([data], { type: 'application/octet-stream' });
-          const link = document.createElement('a');
+        link.setAttribute('href', window.URL.createObjectURL(blob));
-          const blob = new Blob([data], { type: 'application/octet-stream' });
+        link.setAttribute('download', `.deviceid`);
-          link.setAttribute('href', window.URL.createObjectURL(blob));
+        link.style.visibility = 'hidden';
-          link.setAttribute('download', `.deviceid`);
+        document.body.appendChild(link);
-          link.style.visibility = 'hidden';
+        link.click();
-          document.body.appendChild(link);
+        document.body.removeChild(link);
-          link.click();
-          document.body.removeChild(link);
-        },
-        error: (err) => {
-          console.log(err);
-        },
-      });
-  }
-
-  workerTag(type: number) {
-    this.modal.create({
-      nzTitle: type == 1 ? '批量更新workerTag' : '批量更新oilin_sleep_m',
-      nzContent: WorkerTagComponent,
-      nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 500,
-      nzComponentParams: {
-        type: type,
-        tree: this.nodes,
       },
-      nzFooter: null,
+      error: (err) => {
-    });
+        console.log(err)
+      }
+    })
   }
 }
-
-enum DeviceProvider {
-  '警旗1' = 0,
-  '警旗2' = 1,
-  '警旗3' = 2 | 4,
-}

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

@@ -1,22 +1,11 @@
 <div class="box">
     <form nz-form [formGroup]="validateForm">
         <nz-form-item>
-            <nz-form-label [nzSpan]="5">ip</nz-form-label>
             <nz-form-control>
                 <nz-input-group>
                     <input [(ngModel)]="ip" nz-input type="text" formControlName="ip" placeholder="请输入ip" />
                 </nz-input-group>
             </nz-form-control>
         </nz-form-item>
-        <nz-form-item>
-            <nz-form-label [nzSpan]="5">类型</nz-form-label>
-            <nz-form-control>
-                <nz-select formControlName="type" name="select-validate" [(ngModel)]="type" nzPlaceHolder="设备类型">
-                    <nz-option [nzValue]="0" nzLabel="警旗1"></nz-option>
-                    <nz-option [nzValue]="1" nzLabel="警旗2"></nz-option>
-                    <nz-option [nzValue]="2" nzLabel="警旗3"></nz-option>
-                </nz-select>
-            </nz-form-control>
-        </nz-form-item>
     </form>
 </div>

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

@@ -6,23 +6,18 @@ import { HttpClient } from '@angular/common/http';
 @Component({
   selector: 'app-edithost',
   templateUrl: './edithost.component.html',
-  styleUrls: ['./edithost.component.scss'],
+  styleUrls: ['./edithost.component.scss']
 })
 export class EdithostComponent implements OnInit {
-  @Input() ip: any;
+
-  @Input() type: any;
+  @Input() ip: any
+
   validateForm!: FormGroup;
-  constructor(
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
-    private modal: NzModalRef,
-    private fb: FormBuilder,
-    private http: HttpClient
-  ) {}
 
   ngOnInit(): void {
-    console.log('设备类型',this.type);
     this.validateForm = this.fb.group({
-      ip: [null, [Validators.required]],
+      ip: [null, [Validators.required]]
-      type: [null, [Validators.required]],
     });
   }
 }

src/app/system-management/analysis-of-the-host/worker-tag/worker-tag.component.html

@@ -1,23 +0,0 @@
-<div class="tagbox">
-    <div class="content">
-        <nz-tree [hidden]="!(step === 1)" #nzTreeComponent [nzData]="nodes" nzCheckable
-            [nzCheckedKeys]="defaultCheckedKeys" [nzExpandedKeys]="defaultExpandedKeys"></nz-tree>
-        <div class="inputbox" [hidden]="!(step === 2)">
-            <div *ngIf="type==1">
-                <button (click)="addInput()" nz-button>增加一行</button>
-                <div class="inputItem" *ngFor="let item of inputList;let key =index">
-                    <input nz-input [(ngModel)]="item.value" [name]="key.toString()" />
-                </div>
-            </div>
-            <div *ngIf="type==2">
-                <input nz-input [(ngModel)]="oldValue" type="number" placeholder="老值" />
-                <input nz-input [(ngModel)]="newValue" type="number" placeholder="新值" />
-            </div>
-        </div>
-    </div>
-    <div class="btnbox">
-        <button nz-button nzType="primary" (click)="nextStep()" *ngIf="step === 1">下一步</button>
-        <button nz-button nzType="primary" (click)="back()" *ngIf="step === 2">上一步</button>
-        <button nz-button nzType="primary" (click)="ok()" *ngIf="step === 2">确定</button>
-    </div>
-</div>

src/app/system-management/analysis-of-the-host/worker-tag/worker-tag.component.scss

@@ -1,28 +0,0 @@
-.tagbox {
-  max-height: 600px;
-  display: flex;
-  flex-direction: column;
-}
-
-.content {
-  flex: 1;
-  overflow-y: auto;
-
-  .inputbox {
-    .inputItem {
-      display: flex;
-      margin:6px 0px;
-    }
-  }
-
-}
-
-.btnbox {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  margin-top: 16px;
-  button{
-    margin-left: 6px;
-  }
-}

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

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkerTagComponent } from './worker-tag.component';
-
-describe('WorkerTagComponent', () => {
-  let component: WorkerTagComponent;
-  let fixture: ComponentFixture<WorkerTagComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ WorkerTagComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WorkerTagComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -1,179 +0,0 @@
-import { HttpClient } from '@angular/common/http';
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzTreeComponent } from 'ng-zorro-antd/tree';
-import { TreeService } from 'src/app/service/tree.service';
-
-@Component({
-  selector: 'app-worker-tag',
-  templateUrl: './worker-tag.component.html',
-  styleUrls: ['./worker-tag.component.scss'],
-})
-export class WorkerTagComponent implements OnInit {
-  @Input() tree: any;
-  @Input() type: number;
-  @ViewChild('nzTreeComponent', { static: false })
-  nzTreeComponent!: NzTreeComponent;
-  defaultCheckedKeys = [];
-  defaultExpandedKeys = [];
-  constructor(
-    private http: HttpClient,
-    private message: NzMessageService,
-    private toTree: TreeService
-  ) {}
-
-  nodes = [];
-
-  inputList = [{ value: '' }];
-
-  step = 1;
-  ngOnInit(): void {
-    this.getAllOrganization();
-  }
-
-  getAllOrganization() {
-    let params = {
-      ContainsChildren: true,
-      PageSize: 9999,
-    };
-    this.http
-      .get('/api/Organizations', {
-        params: params,
-      })
-      .subscribe((data: any) => {
-        data.items.forEach((element) => {
-          element.key = element.id;
-          element.title = element.name;
-          element.selectable = false;
-          if (element.isGasStation) {
-            element.isLeaf = true;
-            element.disableCheckbox = false;
-          } else {
-            element.disableCheckbox = true;
-          }
-        });
-        this.nodes = [...this.toTree.toTree(data.items)];
-        // this.defaultExpandedKeys = [this.nodes[0].id];
-        // this.defaultExpandedKeys = [...this.defaultExpandedKeys];
-      });
-  }
-
-  nextStep() {
-    this.step = 2;
-  }
-  back() {
-    this.step = 1;
-  }
-  addInput() {
-    this.inputList.push({ value: '' });
-  }
-
-  oldValue: string;
-  newValue: string;
-  ok() {
-    let ids =
-      this.nzTreeComponent.getCheckedNodeList().map((item) => {
-        return item.key;
-      }) || [];
-
-    let workerTags =
-      this.inputList.map((item) => {
-        return item.value;
-      }) || [];
-    if (ids.length === 0) {
-      this.message.create('info', '请至少选择一个加油站');
-      return;
-    }
-    if (this.type == 1) {
-      if (this.inputList.find((v) => !v.value)) {
-        this.message.create('info', '请将所有输入框填写完整');
-        return;
-      }
-    }
-    if (this.type == 2) {
-      if (!this.oldValue || !this.newValue) {
-        this.message.create('info', '请将所有输入框填写完整');
-        return;
-      }
-    }
-    let _this = this;
-    function BatchModifyWorkerTags() {
-      var a = new Promise<void>((resolve, reject) => {
-        _this.http
-          .put('/api/EdgeDevices/BatchModifyWorkerTags', ids, {
-            params: { workerTags: workerTags },
-          })
-          .subscribe({
-            next: (data: any) => {
-              _this.message.create('success', '批量修改成功');
-              resolve(data);
-            },
-            error: (err) => {
-              // _this.message.create('error', '批量修改失败,请重试');
-              reject(err);
-            },
-          });
-      });
-      return a;
-    }
-
-    function BatchModifyoi() {
-      var a = new Promise<void>((resolve, reject) => {
-        let obj = {
-          replaceString: 'oilin_sleep_m: ' + _this.newValue,
-          targetString: 'oilin_sleep_m: ' + _this.oldValue,
-        };
-        _this.http
-          .put('/api/EdgeDevices/BatchModifyConfig', ids, {
-            params: obj,
-          })
-          .subscribe({
-            next: (data: any) => {
-              _this.message.create('success', '批量修改成功');
-              resolve(data);
-            },
-            error: (err) => {
-              // _this.message.create('error', '批量修改失败,请重试');
-              reject(err);
-            },
-          });
-      });
-      return a;
-    }
-
-    function BatchPushFile() {
-      let b = new Promise<void>((resolve, reject) => {
-        _this.http
-          .put('/api/EdgeDevices/Commands/BatchPushFile', ids, {
-            params: { fileName: 'data.yaml' },
-          })
-          .subscribe({
-            next: (data: any) => {
-              _this.message.create('success', '批量推送成功');
-              resolve(data);
-            },
-            error: (err) => {
-              // _this.message.create('error', '批量推送失败');
-              reject(err);
-            },
-          });
-      });
-      return b;
-    }
-
-    if (this.type == 1) {
-      BatchModifyWorkerTags()
-        .then((data) => {
-          BatchPushFile();
-        })
-        .catch((err) => {});
-    }
-    if (this.type == 2) {
-      BatchModifyoi()
-        .then((data) => {
-          BatchPushFile();
-        })
-        .catch((err) => {});
-    }
-  }
-}

src/app/system-management/condition-monitoring/condition-monitoring.component.html

@@ -20,6 +20,7 @@
       </nz-form-item>
 
       <nz-form-item>
+        <!-- <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="state">设备状态</nz-form-label> -->
         <nz-form-control>
           <nz-select formControlName="state" nzPlaceHolder="请选择设备状态">
             <nz-option [nzValue]="0" nzLabel="离线"></nz-option>
@@ -27,16 +28,7 @@
           </nz-select>
         </nz-form-control>
       </nz-form-item>
-      <nz-form-item>
+
-        <nz-form-control>
-          <nz-select formControlName="updatestate" nzPlaceHolder="请选择识别程序更新状态" nzAllowClear>
-            <nz-option [nzValue]="'Never'" nzLabel="未更新"></nz-option>
-            <nz-option [nzValue]="'Updating'" nzLabel="更新中"></nz-option>
-            <nz-option [nzValue]="'Updated'" nzLabel="已更新"></nz-option>
-            <nz-option [nzValue]="'UpdatingTimeout'" nzLabel="更新超时"></nz-option>
-          </nz-select>
-        </nz-form-control>
-      </nz-form-item>
 
       <nz-form-item class="btn">
         <nz-form-control>
@@ -50,23 +42,28 @@
               [nzType]="'sync'"></i>重置</button>
         </nz-form-control>
       </nz-form-item>
-      <button nz-button nzType="primary" type="button" [nzLoading]="loading == 'UpdateApps'"
+      <!-- <button nz-button nzType="primary" type="button" [disabled]="setOfCheckedId.size === 0"
-        (click)="updateBox('UpdateApps','识别程序')">
+        [nzLoading]="loading == 'UpdateStates'" (click)="sendRequest('UpdateStates')">
+        更新识别程序服务状态
+      </button> -->
+      <button nz-button nzType="primary" type="button" [disabled]="setOfCheckedId.size === 0"
+        [nzLoading]="loading == 'UpdateApps'" (click)="sendRequest('UpdateApps')">
         更新识别程序
       </button>
-      <button nz-button nzType="primary" type="button" [nzLoading]="loading == 'primary'"
+      <button nz-button nzType="primary" type="button" [disabled]="setOfCheckedId.size === 0"
-        (click)="updateBox('UpdateImages','镜像')">
+        [nzLoading]="loading == 'primary'" (click)="sendRequest('UpdateImages')">
         更新镜像
       </button>
-      <button nz-button nzType="primary" type="button" [nzLoading]="loading == 'primary'"
+      <button nz-button nzType="primary" type="button" [disabled]="setOfCheckedId.size === 0"
-        (click)="updateBox('UpdateModels','模型')">
+        [nzLoading]="loading == 'primary'" (click)="sendRequest('UpdateModels')">
         更新模型
       </button>
-      <button nz-button nzType="primary" type="button" [nzLoading]="loading == 'primary'"
+      <button nz-button nzType="primary" type="button" [disabled]="setOfCheckedId.size === 0"
-        (click)="updateBox('UpdateMonitors','监控程序')">
+        [nzLoading]="loading == 'primary'" (click)="sendRequest('UpdateMonitors')">
         更新监控程序
       </button>
-      <button nz-button nzType="primary" type="button" [nzLoading]="loading == 'file'" (click)="updateBoxfile()">
+      <button nz-button nzType="primary" type="button" [disabled]="setOfCheckedId.size === 0"
+        [nzLoading]="loading == 'file'" (click)="file()">
         更新监控程序配置文件
       </button>
     </form>
@@ -80,7 +77,6 @@
         <th>ip地址</th>
         <th>所属油站</th>
         <th>设备状态</th>
-        <th>识别程序状态</th>
         <th>识别程序更新状态</th>
         <!-- <th>识别程序更新状态开始时间</th>
         <th>识别程序更新状态结束时间</th> -->
@@ -111,10 +107,6 @@
 
         </td>
         <!-- 识别程序 -->
-        <td>
-          <span style="color: red;" *ngIf="data.appState == 'Dead'">已停止</span>
-          <span style="color: rgb(52, 204, 52);" *ngIf="data.appState == 'Alive'">运行中</span>
-        </td>
         <td>
           <p>
             <span *ngIf="data.appUpdatingState == 'Never'">未更新</span>

src/app/system-management/condition-monitoring/condition-monitoring.component.ts

@@ -9,51 +9,43 @@ import { ModelComponent } from './model/model.component';
 @Component({
   selector: 'app-condition-monitoring',
   templateUrl: './condition-monitoring.component.html',
-  styleUrls: ['./condition-monitoring.component.scss'],
+  styleUrls: ['./condition-monitoring.component.scss']
 })
 export class ConditionMonitoringComponent implements OnInit {
-  constructor(
+
-    private http: HttpClient,
+  constructor(private http: HttpClient, private fb: FormBuilder, private toTree: TreeService, private message: NzMessageService, private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
-    private fb: FormBuilder,
-    private toTree: TreeService,
-    private message: NzMessageService,
-    private modal: NzModalService,
-    private viewContainerRef: ViewContainerRef
-  ) {}
   validateForm!: FormGroup;
   ngOnInit(): void {
     this.validateForm = this.fb.group({
       organization: [null],
-      state: [null],
+      state: [null]
-      updatestate: [null],
     });
-    this.getAllOrganization();
+    this.getAllOrganization()
+
   }
   //获取所有组织机构
-  nodes: any = [];
+  nodes: any = []
-  defaultOrId: string;
+  defaultOrId: string
   defaultExpandedKeys = [];
   getAllOrganization() {
     let params = {
       ContainsChildren: true,
-      pageSize: 9999,
+      pageSize: 9999
-    };
+    }
-    this.http
+    this.http.get('/api/Organizations', {
-      .get('/api/Organizations', {
+      params: params
-        params: params,
+    }).subscribe((data: any) => {
-      })
+      console.log('组织机构列表', data)
-      .subscribe((data: any) => {
+      data.items.forEach(element => {
-        console.log('组织机构列表', data);
+        element.key = element.id
-        data.items.forEach((element) => {
+        element.title = element.name
-          element.key = element.id;
+        // element.selectable = false
-          element.title = element.name;
-          // element.selectable = false
-        });
-        this.nodes = [...this.toTree.toTree(data.items)];
-        this.defaultOrId = this.nodes[0].id;
-        this.validateForm.value.organization = this.defaultOrId;
-        this.getConditionMonitoring();
       });
+      this.nodes = [...this.toTree.toTree(data.items)]
+      this.defaultOrId = this.nodes[0].id
+      this.validateForm.value.organization = this.defaultOrId
+      this.getConditionMonitoring()
+    })
   }
 
   submitForm(): void {
@@ -61,7 +53,7 @@ export class ConditionMonitoringComponent implements OnInit {
       this.validateForm.controls[i].markAsDirty();
       this.validateForm.controls[i].updateValueAndValidity();
     }
-    this.getConditionMonitoring();
+    this.getConditionMonitoring()
   }
   resetForm(e: MouseEvent): void {
     e.preventDefault();
@@ -73,13 +65,13 @@ export class ConditionMonitoringComponent implements OnInit {
     this.validateForm.patchValue({
       organization: this.nodes[0].id,
     });
-    this.PageNumber = 1;
+    this.PageNumber = 1
-    this.getConditionMonitoring();
+    this.getConditionMonitoring()
   }
-  listOfData: any;
+  listOfData: any
-  num: string;
+  num: string
-  PageNumber: number = 1;
+  PageNumber: number = 1
-  isLoading = false;
+  isLoading = false
   //获取盒子状态
   getConditionMonitoring() {
     let params = {
@@ -87,27 +79,28 @@ export class ConditionMonitoringComponent implements OnInit {
       OrganizationId: this.defaultOrId,
       PageNumber: this.PageNumber,
       PageSize: 10,
-      HubConnectionState: this.validateForm.value.state,
+      HubConnectionState: this.validateForm.value.state
-      AppUpdatingState: this.validateForm.value.updatestate,
+    }
-    };
+    this.isLoading = true
-    this.isLoading = true;
     this.http.get('/api/EdgeDevices/Statuses', { params: params }).subscribe(
       (data: any) => {
-        console.log(data);
+        console.log(data)
-        this.isLoading = false;
+        this.isLoading = false
-        this.listOfData = data.items;
+        this.listOfData = data.items
-        this.num = data.totalCount;
+        this.num = data.totalCount
-      },
+      }, err => {
-      (err) => {}
+
-    );
+      }
+    )
   }
   pageChange($event) {
-    this.PageNumber = $event;
+    this.PageNumber = $event
-    this.getConditionMonitoring();
+    this.getConditionMonitoring()
   }
 
+
   checked = false;
-  loading;
+  loading
   indeterminate = false;
   listOfCurrentPageData: readonly any[] = [];
   setOfCheckedId = new Set<number>();
@@ -125,15 +118,9 @@ export class ConditionMonitoringComponent implements OnInit {
   }
 
   refreshCheckedStatus(): void {
-    const listOfEnabledData = this.listOfCurrentPageData.filter(
+    const listOfEnabledData = this.listOfCurrentPageData.filter(({ disabled }) => !disabled);
-      ({ disabled }) => !disabled
+    this.checked = listOfEnabledData.every(({ id }) => this.setOfCheckedId.has(id));
-    );
+    this.indeterminate = listOfEnabledData.some(({ id }) => this.setOfCheckedId.has(id)) && !this.checked;
-    this.checked = listOfEnabledData.every(({ id }) =>
-      this.setOfCheckedId.has(id)
-    );
-    this.indeterminate =
-      listOfEnabledData.some(({ id }) => this.setOfCheckedId.has(id)) &&
-      !this.checked;
   }
 
   onItemChecked(id: number, checked: boolean): void {
@@ -148,64 +135,38 @@ export class ConditionMonitoringComponent implements OnInit {
     this.refreshCheckedStatus();
   }
 
-  selectedBoxId = [];
+  sendRequest(type): void {
-  updateBox(type, name) {
-    const requestData = this.listOfData.filter((data) =>
-      this.setOfCheckedId.has(data.id)
-    );
-    this.selectedBoxId = [];
-    requestData.forEach((element) => {
-      this.selectedBoxId.push(element.id);
-    });
 
-    if (this.selectedBoxId.length == 0) {
+    const requestData = this.listOfData.filter(data => this.setOfCheckedId.has(data.id));
-      this.modal.confirm({
-        nzTitle: `<i>确定更新所有边缘主机的${name}吗?</i>`,
-        nzOnOk: () => {
-          console.log('OK');
-          this.sendRequest(type, true);
-        },
-      });
-    } else {
-      this.sendRequest(type, false);
-    }
-  }
 
-  sendRequest(type, isAllBox): void {
+    let strArr = []
-    let body;
+    requestData.forEach(element => {
+      strArr.push(element.id)
+    });
+    let body
     if (type != 'UpdateModels') {
       this.loading = type;
       body = {
-        edgeDeviceIds: this.selectedBoxId,
+        edgeDeviceIds: strArr
-        allEdgeDevices: isAllBox,
+      }
-      };
+      this.http.patch('/api/EdgeDevices/Commands', body, { params: { command: type } }).subscribe({
-      this.http
+        next: (data: any) => {
-        .patch('/api/EdgeDevices/Commands', body, { params: { command: type } })
+          this.message.create('success', '通知边缘盒子成功，请过一段时间手动刷新尝试！');
-        .subscribe({
+          console.log(data)
-          next: (data: any) => {
+          if (data.failedItems.length != 0) {
-            this.message.create(
+            data.failedItems.forEach(element => {
-              'success',
+              this.message.create('info', element.detail);
-              '通知边缘盒子成功，请过一段时间手动刷新尝试！'
+            });
-            );
+          }
-            let str = '更新失败列表<br>';
+          this.setOfCheckedId.clear();
-            if (data.failedItems.length != 0) {
+          this.refreshCheckedStatus();
-              data.failedItems.forEach((element) => {
+          this.loading = null;
-                str += element.detail + '<br>';
+          this.getConditionMonitoring()
-              });
+        },
-              this.message.create('info', str, {
+        error: (err) => {
-                nzDuration: 3000,
+          this.loading = null;
-              });
+        }
-            }
+      })
-
-            this.setOfCheckedId.clear();
-            this.refreshCheckedStatus();
-            this.loading = null;
-            this.getConditionMonitoring();
-          },
-          error: (err) => {
-            this.loading = null;
-          },
-        });
     } else {
       const modal = this.modal.create({
         nzTitle: '选择更新模型类型',
@@ -214,78 +175,52 @@ export class ConditionMonitoringComponent implements OnInit {
         nzWidth: 288,
         nzComponentParams: {},
         nzOnOk: async () => {
+          // console.log(instance.validateForm.value.type)
           if (instance.validateForm.valid) {
             body = {
-              edgeDeviceIds: this.selectedBoxId,
+              edgeDeviceIds: strArr,
-              modelNames: instance.validateForm.value.type,
+              modelNames: instance.validateForm.value.type
-              allEdgeDevices: isAllBox,
+            }
-            };
+            await new Promise(resolve => {
-            await new Promise((resolve) => {
+              this.http.patch('/api/EdgeDevices/Commands', body, { params: { command: type } }).subscribe({
-              this.http
+                next: (data: any) => {
-                .patch('/api/EdgeDevices/Commands', body, {
+                  resolve(data)
-                  params: { command: type },
+                  this.message.create('success', '通知边缘盒子成功，请过一段时间手动刷新尝试！');
-                })
+                  if (data.failedItems.length != 0) {
-                .subscribe({
+                    data.failedItems.forEach(element => {
-                  next: (data: any) => {
+                      this.message.create('info', element.detail);
-                    resolve(data);
+                    });
-                    this.message.create(
+                  }
-                      'success',
+                  this.setOfCheckedId.clear();
-                      '通知边缘盒子成功，请过一段时间手动刷新尝试！'
+                  this.refreshCheckedStatus();
-                    );
+                  this.loading = null;
-                    let str = '更新失败列表<br>';
+                  this.getConditionMonitoring()
-                    if (data.failedItems.length != 0) {
+                  return true
-                      data.failedItems.forEach((element) => {
+                },
-                        str += element.detail + '<br>';
+                error: (err) => {
-                      });
+                  resolve(err)
-                      this.message.create('info', str, {
+                  this.loading = null;
-                        nzDuration: 3000,
+                  return false
-                      });
+                }
-                    }
+              })
-
+            })
-                    this.setOfCheckedId.clear();
-                    this.refreshCheckedStatus();
-                    this.loading = null;
-                    this.getConditionMonitoring();
-                    return true;
-                  },
-                  error: (err) => {
-                    resolve(err);
-                    this.loading = null;
-                    return false;
-                  },
-                });
-            });
           } else {
             this.message.create('warning', '请填写完整！');
-            return false;
+            return false
           }
-        },
+        }
       });
       const instance = modal.getContentComponent();
     }
-  }
 
-  updateBoxfile() {
-    const requestData = this.listOfData.filter((data) =>
-      this.setOfCheckedId.has(data.id)
-    );
-    this.selectedBoxId = [];
-    requestData.forEach((element) => {
-      this.selectedBoxId.push(element.id);
-    });
-    if (this.selectedBoxId.length == 0) {
-      this.modal.confirm({
-        nzTitle: `<i>确定更新所有边缘主机的监控程序配置文件吗?</i>`,
-        nzOnOk: () => {
-          this.file(true);
-        },
-      });
-    } else {
-      this.file(false);
-    }
   }
 
-  file(isAllBox) {
+  file() {
+    const requestData = this.listOfData.filter(data => this.setOfCheckedId.has(data.id));
+    let strArr = []
+    requestData.forEach(element => {
+      strArr.push(element.id)
+    });
     const modal = this.modal.create({
       nzTitle: '配置文件',
       nzContent: FileComponent,
@@ -295,51 +230,41 @@ export class ConditionMonitoringComponent implements OnInit {
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
           let body = {
-            edgeDeviceIds: this.selectedBoxId,
+            edgeDeviceIds: strArr,
             scheme: instance.validateForm.value.scheme,
             host: instance.validateForm.value.host,
             port: instance.validateForm.value.port,
-            maxRetries: instance.validateForm.value.maxRetries,
+            maxRetries: instance.validateForm.value.maxRetries
-            allEdgeDevices: isAllBox,
+          }
-          };
+          await new Promise(resolve => {
-          await new Promise((resolve, reject) => {
+            this.loading = 'file'
-            this.loading = 'file';
+            this.http.patch('/api/EdgeDevices/Commands/PushMonitorSettingsJson', body).subscribe({
-            this.http
+              next: (data: any) => {
-              .patch('/api/EdgeDevices/Commands/PushMonitorSettingsJson', body)
+                this.message.create('success', '通知边缘盒子成功，请过一段时间手动刷新尝试！');
-              .subscribe({
+                // console.log(data)
-                next: (data: any) => {
+                if (data.failedItems.length != 0) {
-                  this.message.create(
+                  data.failedItems.forEach(element => {
-                    'success',
+                    this.message.create('info', element.detail);
-                    '通知边缘盒子成功，请过一段时间手动刷新尝试！'
+                  });
-                  );
+                }
-                  let str = '更新失败列表<br>';
+                this.setOfCheckedId.clear();
-                  if (data.failedItems.length != 0) {
+                this.refreshCheckedStatus();
-                    data.failedItems.forEach((element) => {
+
-                      str += element.detail + '<br>';
+                this.getConditionMonitoring()
-                    });
+                this.loading = null;
-                    this.message.create('info', str, {
+              },
-                      nzDuration: 3000,
+              error: (err) => {
-                    });
+                this.loading = null;
-                  }
+              }
-                  this.setOfCheckedId.clear();
+            })
-                  this.refreshCheckedStatus();
+          })
-                  this.getConditionMonitoring();
-                  this.loading = null;
-                  resolve(data);
-                  return true;
-                },
-                error: (err) => {
-                  reject(err);
-                  this.loading = null;
-                },
-              });
-          });
         } else {
           this.message.create('warning', '请填写完整！');
-          return false;
+          return false
         }
-      },
+      }
     });
     const instance = modal.getContentComponent();
+
   }
 }

src/app/system-management/condition-monitoring/model/model.component.html

@@ -1,21 +1,20 @@
 <div class="box">
-  <form nz-form [formGroup]="validateForm">
+    <form nz-form [formGroup]="validateForm">
-    <nz-form-item>
+        <nz-form-item>
-      <nz-form-control>
+            <nz-form-control>
-        <nz-select nzMode="multiple" formControlName="type" nzPlaceHolder="请选择类型">
+                <nz-select nzMode="multiple" formControlName="type" nzPlaceHolder="请选择类型">
-          <nz-option [nzValue]="'peoplenet'" nzLabel="peoplenet"></nz-option>
+                    <nz-option [nzValue]="'peoplenet'" nzLabel="peoplenet"></nz-option>
-          <nz-option [nzValue]="'trafficcam'" nzLabel="trafficcam"></nz-option>
+                    <nz-option [nzValue]="'trafficcam'" nzLabel="trafficcam"></nz-option>
-          <nz-option [nzValue]="'actionnet'" nzLabel="actionnet"></nz-option>
+                    <nz-option [nzValue]="'actionnet'" nzLabel="actionnet"></nz-option>
-          <nz-option [nzValue]="'idnet'" nzLabel="idnet"></nz-option>
+                    <nz-option [nzValue]="'idnet'" nzLabel="idnet"></nz-option>
-          <nz-option [nzValue]="'oilnet'" nzLabel="oilnet"></nz-option>
+                    <nz-option [nzValue]="'oilnet'" nzLabel="oilnet"></nz-option>
-          <nz-option [nzValue]="'smoking_calling_net'" nzLabel="smoking_calling_net"></nz-option>
+                    <nz-option [nzValue]="'smoking_calling_net'" nzLabel="smoking_calling_net"></nz-option>
-          <!-- <nz-option [nzValue]="'connet'" nzLabel="connet"></nz-option> -->
+                    <!-- <nz-option [nzValue]="'connet'" nzLabel="connet"></nz-option> -->
-          <nz-option [nzValue]="'connet_oil'" nzLabel="connet_oil"></nz-option>
+                    <nz-option [nzValue]="'connet_oil'" nzLabel="connet_oil"></nz-option>
-          <nz-option [nzValue]="'connet_grounder'" nzLabel="connet_grounder"></nz-option>
+                    <nz-option [nzValue]="'connet_grounder'" nzLabel="connet_grounder"></nz-option>
-          <nz-option [nzValue]="'fire_smoke_net'" nzLabel="fire_smoke_net"></nz-option>
+                    <nz-option [nzValue]="'fire_smoke_net'" nzLabel="fire_smoke_net"></nz-option>
-          <nz-option [nzValue]="'bulk_oil_net'" nzLabel="bulk_oil_net"></nz-option>
+                </nz-select>
-        </nz-select>
+            </nz-form-control>
-      </nz-form-control>
+        </nz-form-item>
-    </nz-form-item>
+    </form>
-  </form>
 </div>

src/app/system-management/host-config/addcamera/addcamera.component.html

@@ -16,15 +16,6 @@
         </nz-input-group>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="decoderType">编码类型</nz-form-label>
-      <nz-form-control>
-        <nz-select formControlName="decoderType" nzPlaceHolder="请选择编码类型">
-          <nz-option [nzValue]="264" nzLabel="264"></nz-option>
-          <nz-option [nzValue]="265" nzLabel="265"></nz-option>
-        </nz-select>
-      </nz-form-control>
-    </nz-form-item>
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="password">密码</nz-form-label>
       <nz-form-control>

src/app/system-management/host-config/addcamera/addcamera.component.ts

@@ -18,7 +18,6 @@ export class AddcameraComponent implements OnInit {
     this.validateForm = this.fb.group({
       name: [null, [Validators.required, namevalidate]],
       user: [null, [Validators.required]],
-      decoderType: [null, [Validators.required]],
       password: [null, [Validators.required]],
       uri: [null, [Validators.required]],
       type: [null, [Validators.required]],

src/app/system-management/host-config/anxin-config/anxin-config.component.html

@@ -1,5 +0,0 @@
-<div class="box">
-    <div class="content">
-        <textarea name="config" id="config" [(ngModel)]="datacopy"></textarea>
-    </div>
-</div>

src/app/system-management/host-config/anxin-config/anxin-config.component.scss

@@ -1,21 +0,0 @@
-.box {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  font-size: 15px;
-  color: black;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  overflow-y: auto;
-}
-
-.content {
-  flex: 1;
-  box-sizing: border-box;
-
-  textarea {
-    width: 100%;
-    height: 400px;
-  }
-}

src/app/system-management/host-config/anxin-config/anxin-config.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AnxinConfigComponent } from './anxin-config.component';
-
-describe('AnxinConfigComponent', () => {
-  let component: AnxinConfigComponent;
-  let fixture: ComponentFixture<AnxinConfigComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ AnxinConfigComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AnxinConfigComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/system-management/host-config/anxin-config/anxin-config.component.ts

@@ -1,19 +0,0 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-import yaml from 'js-yaml';
-@Component({
-  selector: 'app-anxin-config',
-  templateUrl: './anxin-config.component.html',
-  styleUrls: ['./anxin-config.component.scss'],
-})
-export class AnxinConfigComponent implements OnInit {
-  @Input() data: any;
-  validateForm!: FormGroup;
-  constructor() {}
-  datacopy;
-  ngOnInit(): void {
-    this.datacopy = yaml.dump(JSON.parse(JSON.stringify(this.data)), {
-      lineWidth: -1,
-    });
-  }
-}

src/app/system-management/host-config/editcamera/editcamera.component.html

@@ -16,15 +16,6 @@
         </nz-input-group>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="decoderType">编码类型</nz-form-label>
-      <nz-form-control>
-        <nz-select formControlName="decoderType" nzPlaceHolder="请选择编码类型">
-          <nz-option [nzValue]="264" nzLabel="264"></nz-option>
-          <nz-option [nzValue]="265" nzLabel="265"></nz-option>
-        </nz-select>
-      </nz-form-control>
-    </nz-form-item>
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="password">密码</nz-form-label>
       <nz-form-control>

src/app/system-management/host-config/editcamera/editcamera.component.ts

@@ -7,29 +7,26 @@ import { MyValidators } from '../addcamera/addcamera.component';
 @Component({
   selector: 'app-editcamera',
   templateUrl: './editcamera.component.html',
-  styleUrls: ['./editcamera.component.scss'],
+  styleUrls: ['./editcamera.component.scss']
 })
 export class EditcameraComponent implements OnInit {
-  @Input() data: any;
+
+  @Input() data: any
   validateForm!: FormGroup;
-  constructor(
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
-    private modal: NzModalRef,
-    private fb: FormBuilder,
-    private http: HttpClient
-  ) {}
 
   ngOnInit(): void {
     const { namevalidate } = MyValidators;
-    let datacopy = JSON.parse(JSON.stringify(this.data));
+    let datacopy = JSON.parse(JSON.stringify(this.data))
-    console.log('编辑数据', datacopy);
+    console.log('编辑数据', datacopy)
     this.validateForm = this.fb.group({
-      name: [datacopy.name, [Validators.required, namevalidate]],
+      name: [datacopy.name, [Validators.required,namevalidate]],
       user: [datacopy.user, [Validators.required]],
-      decoderType: [datacopy.decoderType, [Validators.required]],
       password: [datacopy.password, [Validators.required]],
       uri: [datacopy.uri, [Validators.required]],
       type: [datacopy.type, [Validators.required]],
-      order: [datacopy.order, [Validators.required]],
+      order: [datacopy.order, [Validators.required]]
     });
   }
+
 }

src/app/system-management/host-config/host-config.component.html

@@ -3,7 +3,7 @@
     <nz-page-header class="site-page-header" (nzBack)="goback()" nzBackIcon nzSubtitle="返回上一页"></nz-page-header>
     <div class="cameraList">
       <div class="title">
-        <span>摄像头列表</span>
+        <span>摄像头列表 ({{hostType}}盒子)</span>
         <button nz-button nzType="primary" (click)="addCamera()">新增摄像头</button>
       </div>
       <nz-table [nzPageSize]="999" #basicTable [nzData]="listOfData" [nzShowPagination]="false" [nzLoading]="isLoading">
@@ -29,21 +29,18 @@
             <td>{{ item.uri }}</td>
             <td>{{ item.type | cameraType}}</td>
             <td>
-              <span *ngIf="hostType === '警旗1'">
+              <ng-container *ngIf="item.type == 1; else elseTemplate">
+                不需要标注
+              </ng-container>
+              <ng-template #elseTemplate>
                 {{item.dimensionedPoints ? '已标注' : '未标注'}}
-              </span>
+              </ng-template>
-              <span *ngIf="hostType === '警旗2'">
-                {{item.dimensionedPointsHuanghai ? '已标注' : '未标注'}}
-              </span>
-              <span *ngIf="hostType === '警旗3'">
-                {{item.dimensionedPointsAnxin ? '已标注' : '未标注'}}
-              </span>
             </td>
             <td>{{ item.isEnabled ? '已启用' : '已禁用'}}</td>
             <td>
               <span class="blue" style="margin-right: 12px;" (click)="editCamera(item)">编辑</span>
-              <span class="blue" style="margin-right: 12px;" (click)="label(item)">标注</span>
+              <span class="blue" style="margin-right: 12px;" [ngClass]="{'forbid': item.type == 1}"
-              <span class="blue" *ngIf="my" style="margin-right: 12px;" (click)="simulate(item)">模拟数据</span>
+                (click)="label(item)">标注</span>
               <ng-container *ngIf="item.isEnabled; else elseTemplate2">
                 <span class="red" style="margin-right: 12px;" (click)="forbidden(item)">禁用</span>
               </ng-container>
@@ -56,18 +53,12 @@
           </tr>
         </tbody>
       </nz-table>
-      <div class="footer" *ngIf="hostType === '警旗1'">
+      <div class="footer">
         <button nz-button nzType="primary" (click)="sourceYaml()">下发source.yaml配置</button>
       </div>
-      <div class="footer" *ngIf="hostType === '警旗1'">
+      <div class="footer">
         <button [disabled]="isSourceYaml === false" nz-button nzType="primary" (click)="connect()">下发算法配置</button>
       </div>
-      <div class="footer" *ngIf="hostType === '警旗2'">
-        <button nz-button nzType="primary" (click)="config()">下发黄海config.json配置</button>
-      </div>
-      <div class="footer" *ngIf="hostType === '警旗3'">
-        <button nz-button nzType="primary" (click)="configToAx()">下发安信data.yaml配置</button>
-      </div>
     </div>
   </div>
   <div class="rightbox">

src/app/system-management/host-config/huang-hai-config/huang-hai-config.component.html

@@ -1,5 +0,0 @@
-<div class="box">
-    <div class="content">
-        <textarea name="config" id="config" [(ngModel)]="datacopy"></textarea>
-    </div>
-</div>

src/app/system-management/host-config/huang-hai-config/huang-hai-config.component.scss

@@ -1,21 +0,0 @@
-.box {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  font-size: 15px;
-  color: black;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  overflow-y: auto;
-}
-
-.content {
-  flex: 1;
-  box-sizing: border-box;
-
-  textarea {
-    width: 100%;
-    height: 400px;
-  }
-}

src/app/system-management/host-config/huang-hai-config/huang-hai-config.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HuangHaiConfigComponent } from './huang-hai-config.component';
-
-describe('HuangHaiConfigComponent', () => {
-  let component: HuangHaiConfigComponent;
-  let fixture: ComponentFixture<HuangHaiConfigComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ HuangHaiConfigComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(HuangHaiConfigComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/system-management/host-config/huang-hai-config/huang-hai-config.component.ts

@@ -1,16 +0,0 @@
-import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-@Component({
-  selector: 'app-huang-hai-config',
-  templateUrl: './huang-hai-config.component.html',
-  styleUrls: ['./huang-hai-config.component.scss'],
-})
-export class HuangHaiConfigComponent implements OnInit {
-  @Input() data: any;
-  validateForm!: FormGroup;
-  constructor() {}
-  datacopy;
-  ngOnInit(): void {
-    this.datacopy = JSON.stringify(JSON.parse(this.data), null, 2);
-  }
-}

src/app/system-management/host-config/send-file/send-file.component.scss

@@ -13,7 +13,6 @@
 .content {
   flex: 1;
   box-sizing: border-box;
-
   textarea {
     width: 100%;
     height: 400px;

src/app/system-management/host-config/send-file/send-file.component.ts

@@ -1,16 +1,23 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
 @Component({
   selector: 'app-send-file',
   templateUrl: './send-file.component.html',
-  styleUrls: ['./send-file.component.scss'],
+  styleUrls: ['./send-file.component.scss']
 })
 export class SendFileComponent implements OnInit {
-  @Input() data: any;
+
+  @Input() data: any
   validateForm!: FormGroup;
-  constructor() {}
+  constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
-  datacopy;
+  datacopy
   ngOnInit(): void {
-    this.datacopy = JSON.parse(JSON.stringify(this.data));
+    this.datacopy = JSON.parse(JSON.stringify(this.data))
+    console.log(this.datacopy)
+  }
+  putConfig() {
+
   }
 }

src/app/system-management/host-config/simulate-data/simulate-data.component.html

@@ -1,82 +0,0 @@
-<div class="box">
-    <form nz-form [formGroup]="validateForm" [nzLayout]="'inline'">
-        <nz-form-item>
-            <nz-form-label nzRequired nzFor="HostIPAddress">主机地址</nz-form-label>
-            <nz-form-control>
-                <nz-input-group>
-                    <input nz-input type="text" formControlName="HostIPAddress" placeholder="请输入主机地址" />
-                </nz-input-group>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-            <nz-form-label nzRequired nzFor="EventSystemName">预警事件</nz-form-label>
-            <nz-form-control>
-                <nz-select formControlName="EventSystemName" nzPlaceHolder="请选择预警事件">
-                    <nz-option *ngFor="let item of eventList" [nzValue]="item" [nzLabel]="item"></nz-option>
-                </nz-select>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-            <nz-form-label nzRequired nzFor="ViolateArea">预警区域</nz-form-label>
-            <nz-form-control>
-                <nz-select formControlName="ViolateArea" nzPlaceHolder="请选择预警区域">
-                    <nz-option *ngFor="let item of areaList" [nzValue]="item" [nzLabel]="item"></nz-option>
-                </nz-select>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-            <nz-form-label nzRequired nzFor="CameraNo">摄像头编号</nz-form-label>
-            <nz-form-control>
-                <nz-input-group>
-                    <input nz-input type="text" formControlName="CameraNo" placeholder="请输入摄像头编号" />
-                </nz-input-group>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-            <nz-form-label nzRequired nzFor="ViolateTime">选择日期</nz-form-label>
-            <nz-form-control>
-                <nz-date-picker nzShowTime formControlName="ViolateTime"></nz-date-picker>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-            <nz-form-label nzRequired nzFor="ViolateImage">图片地址</nz-form-label>
-            <nz-form-control>
-                <nz-input-group>
-                    <input nz-input type="text" formControlName="ViolateImage" placeholder="请输入图片地址" />
-                </nz-input-group>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-            <nz-form-label nzRequired nzFor="violateVideo">视频地址</nz-form-label>
-            <nz-form-control>
-                <nz-input-group>
-                    <input nz-input type="text" formControlName="violateVideo" placeholder="请输入图片地址" />
-                </nz-input-group>
-            </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-            <nz-form-label>第一步</nz-form-label>
-            <button nz-button (click)="getImg()">捕获图片</button>
-        </nz-form-item>
-        <nz-form-item>
-            <button nz-button (click)="getVideo()">捕获视频</button>
-        </nz-form-item>
-        <nz-form-item>
-            <nz-form-label>第二步</nz-form-label>
-            <button nz-button (click)="updateImg()">更新底图</button>
-        </nz-form-item>
-        <nz-form-item>
-            <button nz-button (click)="updateVideo()">更新视频</button>
-        </nz-form-item>
-    </form>
-    <div class="img_box">
-        <canvas #canvas (mousedown)="onMouseDown($event)" (mousemove)="onMouseMove($event)" (mouseup)="onMouseUp()"
-            style="border: 1px solid #ccc;"></canvas>
-        <video style="width: 500px;height: auto;" [src]="videoUrl" controls></video>
-        <div>
-            <button style="margin-bottom: 10px;" nz-button nzType="primary" (click)="uploadImg()">上传预警图片</button>
-            <button nz-button nzType="primary" (click)="uploadVideo()">上传预警视频</button>
-        </div>
-
-    </div>
-</div>

src/app/system-management/host-config/simulate-data/simulate-data.component.scss

@@ -1,16 +0,0 @@
-.ant-form-item {
-    margin-bottom: 10px;
-  }
-  .img_box {
-    height: auto;
-    display: flex;
-    canvas {
-      max-width: 1000px;
-      height: auto;
-    }
-    button {
-      margin: 0;
-      margin-left: 10px;
-    }
-  }
-  

src/app/system-management/host-config/simulate-data/simulate-data.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SimulateDataComponent } from './simulate-data.component';
-
-describe('SimulateDataComponent', () => {
-  let component: SimulateDataComponent;
-  let fixture: ComponentFixture<SimulateDataComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ SimulateDataComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SimulateDataComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/system-management/host-config/simulate-data/simulate-data.component.ts

@@ -1,327 +0,0 @@
-import { Component, OnInit, Input, ViewChild, ElementRef } from '@angular/core';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { HttpClient } from '@angular/common/http';
-import { DomSanitizer } from '@angular/platform-browser';
-import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
-import { NzMessageService } from 'ng-zorro-antd/message';
-@Component({
-  selector: 'app-simulate-data',
-  templateUrl: './simulate-data.component.html',
-  styleUrls: ['./simulate-data.component.scss'],
-})
-export class SimulateDataComponent implements OnInit {
-  @Input() data: any;
-  validateForm!: FormGroup;
-  constructor(
-    private fb: FormBuilder,
-    private http: HttpClient,
-    private objectsSrv: ObjectsSimpleService,
-    private message: NzMessageService,
-    private sanitizer: DomSanitizer
-  ) {}
-
-  currentTime = null;
-  arr = ['进出口', '加油区', '卸油区', '便利店'];
-  ngOnInit(): void {
-    this.currentTime = new Date().getTime();
-
-    let datacopy = JSON.parse(JSON.stringify(this.data));
-    let HostIPAddress = sessionStorage.getItem('hostIPAddress');
-    this.validateForm = this.fb.group({
-      HostIPAddress: [HostIPAddress, [Validators.required]],
-      EventSystemName: [null, [Validators.required]],
-      ViolateArea: [this.arr[datacopy.type], [Validators.required]],
-      CameraNo: [datacopy.name, [Validators.required]],
-      ViolateTime: [null, [Validators.required]],
-      ViolateImage: [
-        `/api/Objects/test/${this.currentTime}/image.png`,
-        [Validators.required],
-      ],
-      violateVideo: [
-        `/api/Objects/test/${this.currentTime}/video.mp4`,
-        [Validators.required],
-      ],
-    });
-    this.getImgMarkData();
-    this.updateVideo();
-  }
-
-  @ViewChild('canvas') canvasRef: ElementRef<HTMLCanvasElement>;
-  private ctx: CanvasRenderingContext2D;
-  imgUrl: string;
-  isDrawing = false;
-  startX: number;
-  startY: number;
-  endX: number;
-  endY: number;
-  img: HTMLImageElement;
-
-  //获取 摄像头图片/标注点位
-  getImgMarkData() {
-    const httpOptions = {
-      responseType: 'blob' as 'json',
-      params: { cameraId: this.data.id },
-    };
-    let date = new Date().getTime();
-    this.http.get(`/api/Cameras/Images?v=${date}`, httpOptions).subscribe({
-      next: (data: any) => {
-        setTimeout(() => {
-          this.initCanvas(data);
-        }, 0);
-      },
-      error: (error) => {
-        console.error('获取图片数据失败', error);
-        setTimeout(() => {
-          this.initCanvas(null);
-        }, 0);
-      },
-    });
-  }
-
-  canvasObj = null;
-  initCanvas(data) {
-    if (!data) {
-      // 如果没有获取到图片数据，使用本地默认图片
-      this.message.warning('未获取到照片数据，使用默认图片');
-      this.imgUrl = '../../../../assets/images/bgImg.png'; // 请确保这个路径下有默认图片
-    } else {
-      this.imgUrl = window.URL.createObjectURL(data);
-    }
-
-    this.img = new Image();
-    this.img.src = this.imgUrl;
-    this.img.onerror = () => {
-      // 如果图片加载失败，也使用默认图片
-      this.message.warning('图片加载失败，使用默认图片');
-      this.img.src = '../../../../assets/images/bgImg.png';
-    };
-
-    this.img.onload = () => {
-      this.canvasObj = this.canvasRef.nativeElement;
-      this.ctx = this.canvasObj.getContext('2d');
-
-      // 设置 canvas 宽度为 1000px，保持图片的宽高比
-      const targetWidth = 1000;
-      this.canvasObj.width = targetWidth;
-      this.canvasObj.height = (this.img.height / this.img.width) * targetWidth;
-
-      // 在 canvas 上绘制图片
-      this.ctx.drawImage(
-        this.img,
-        0,
-        0,
-        this.canvasObj.width,
-        this.canvasObj.height
-      );
-    };
-  }
-
-  // 开始绘制红框
-  onMouseDown(event: MouseEvent): void {
-    this.isDrawing = true;
-    this.startX = event.offsetX;
-    this.startY = event.offsetY;
-  }
-
-  // 实时绘制红框
-  onMouseMove(event: MouseEvent): void {
-    if (!this.isDrawing) return;
-
-    this.endX = event.offsetX;
-    this.endY = event.offsetY;
-
-    const canvas = this.canvasRef.nativeElement;
-    this.ctx.clearRect(0, 0, canvas.width, canvas.height); // 清除 canvas
-    this.ctx.drawImage(this.img, 0, 0, canvas.width, canvas.height); // 重新绘制图片
-    this.ctx.strokeStyle = 'red';
-    this.ctx.lineWidth = 2;
-    this.ctx.strokeRect(
-      this.startX,
-      this.startY,
-      this.endX - this.startX,
-      this.endY - this.startY
-    );
-  }
-
-  // 停止绘制红框
-  onMouseUp(): void {
-    this.isDrawing = false;
-  }
-
-  async uploadImg() {
-    const canvas = this.canvasRef.nativeElement;
-    canvas.toBlob(async (blob: Blob) => {
-      // 创建 File 对象，'image.png' 为文件名，'image/png' 为文件类型
-      const file = new File([blob], 'image.png', { type: 'image/png' });
-      console.log(file);
-      let url = await this.postFile(file);
-      console.log(url);
-      this.validateForm.patchValue({
-        ViolateImage: url, // 替换为你想要的 ViolateImage 值
-      });
-    }, 'image/png');
-  }
-
-  async uploadVideo() {
-    // 创建 File 对象，'image.png' 为文件名，'image/png' 为文件类型
-    const file = new File([this.videoBlob], 'video.mp4', { type: 'video/mp4' });
-    console.log(file);
-    let url = await this.postFile(file);
-    console.log(url);
-    this.validateForm.patchValue({
-      ViolateImage: url, // 替换为你想要的 ViolateImage 值
-    });
-  }
-
-  //上传文件
-  async postFile(file: File) {
-    return new Promise((resolve, reject) => {
-      this.objectsSrv
-        .postFile(`${this.currentTime}/`, file)
-        .subscribe((data) => {
-          let dataObj = data as any;
-          let filePath: string =
-            ObjectsSimpleService.baseUrl + dataObj.objectName;
-          this.message.create('success', '上传成功');
-          resolve(filePath);
-        });
-    });
-  }
-
-  getImg() {
-    let params = {
-      cameraId: this.data.id,
-      provider: 1,
-    };
-    this.http
-      .put('/api/Cameras/Commands/CaptureImages', '', { params: params })
-      .subscribe({
-        next: (value: Object) => {
-          this.message.create(
-            'success',
-            '发送指令: 捕获图片成功，请过一段时间手动更新底图!'
-          );
-        },
-      });
-  }
-
-  getVideo() {
-    let params = {
-      cameraId: this.data.id,
-      provider: 1,
-    };
-    this.http
-      .put('/api/Cameras/Commands/CaptureVideos', '', { params: params })
-      .subscribe({
-        next: (value: Object) => {
-          this.message.create(
-            'success',
-            '发送指令: 捕获视频成功，请过一段时间手动更新视频!'
-          );
-        },
-      });
-  }
-  updateImg() {
-    const httpOptions = {
-      responseType: 'blob' as 'json',
-      params: { cameraId: this.data.id },
-    };
-    let date = new Date().getTime();
-    this.http.get(`/api/Cameras/Images?v=${date}`, httpOptions).subscribe({
-      next: (data: any) => {
-        this.replaceBackground(data);
-      },
-    });
-  }
-
-  replaceBackground(newData: Blob) {
-    console.log('newData', newData);
-    const newImgUrl = window.URL.createObjectURL(newData);
-
-    this.img = new Image();
-    this.img.src = newImgUrl;
-
-    this.img.onload = () => {
-      // 清空 canvas 内容
-      this.ctx.clearRect(0, 0, this.canvasObj.width, this.canvasObj.height);
-
-      // 更新 canvas 大小和图片宽高比
-      const targetWidth = 1000;
-      this.canvasObj.width = targetWidth;
-      this.canvasObj.height = (this.img.height / this.img.width) * targetWidth;
-
-      // 绘制新的图片
-      this.ctx.drawImage(
-        this.img,
-        0,
-        0,
-        this.canvasObj.width,
-        this.canvasObj.height
-      );
-    };
-  }
-
-  videoBlob = null;
-  videoUrl = null;
-  updateVideo() {
-    const httpOptions = {
-      responseType: 'blob' as 'json',
-      params: { cameraId: this.data.id },
-    };
-    let date = new Date().getTime();
-    this.http.get(`/api/Cameras/Videos?v=${date}`, httpOptions).subscribe({
-      next: (data: any) => {
-        console.log('视频数据', data);
-        this.videoBlob = data;
-        // 获取图片数据 (data 是 Blob 类型)
-        const unsafeUrl = window.URL.createObjectURL(data);
-
-        // 使用 DomSanitizer 处理 URL
-        this.videoUrl = this.sanitizer.bypassSecurityTrustUrl(unsafeUrl);
-      },
-    });
-  }
-  eventList = [
-    '油罐区入侵',
-    '进出口停车',
-    '站内吸烟',
-    '前庭接打电话',
-    '设置卸油隔离区',
-    '拆除卸油管',
-    '卸油连接静电接地',
-    '卸油设置消防器材',
-    '卸油现场清理',
-    '油罐车无人卸油',
-    '连接卸油管',
-    '卸油中无人监卸',
-    '证照年检逾期报警',
-    '证照年检临期提醒',
-    '证照年检办理提醒',
-    '普通证照有效期逾期报警',
-    '证照有效期办理提醒',
-    '烟雾预警',
-    '火灾报警',
-    '设备报废逾期报警',
-    '设备报废临期提醒',
-    '收银员着装',
-    '关键证照有效期逾期报警',
-    '证照有效期临期提醒',
-    '设备维保临期提醒',
-    '设备维保逾期报警',
-  ];
-
-  areaList = [
-    '进出口',
-    '卸油区',
-    '加油区',
-    '收银区',
-    '发油区',
-    '油库区',
-    '监控区',
-    '消防通道',
-    '泵房区',
-    '油罐区',
-    '停车区',
-  ];
-}

src/app/system-management/iframe/iframe.component.html

@@ -1,2 +0,0 @@
-<button (click)="xxx()">向子页面发送信息</button>
-<iframe id="iframe" src="http://192.168.1.86:25647/login" frameborder="0" width="100%" height="100%"></iframe>

src/app/system-management/iframe/iframe.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { IframeComponent } from './iframe.component';
-
-describe('IframeComponent', () => {
-  let component: IframeComponent;
-  let fixture: ComponentFixture<IframeComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ IframeComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(IframeComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -1,27 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-import { Renderer2} from '@angular/core';
-@Component({
-  selector: 'app-iframe',
-  templateUrl: './iframe.component.html',
-  styleUrls: ['./iframe.component.scss']
-})
-export class IframeComponent implements OnInit {
-
-  constructor( private render2: Renderer2) { }
-
-  ngOnInit(): void {
-  }
-  xxx(){
-    this.handleToIframe()
-  }
-  handleToIframe() {
-    const child = this.render2.selectRootElement("#iframe");
-    console.log(child);
-    let data = {
-      from: 'parent page',
-      code: 200,
-      data: '来自父页面的数据！！！'
-    };
-    child.contentWindow.postMessage(data, '*');
-  }
-}

src/app/system-management/image-label-anxin/image-label-anxin.component.html

@@ -1,55 +0,0 @@
-<div class="canvasBox" >
-    <div class="btnbox" cdkDrag>
-        <label class="leftTitle" style="color: red;">安信盒子标记</label>
-
-        <label class="leftTitle" *ngIf="markType === 0">进出口</label>
-        <label class="leftTitle" *ngIf="markType === 1">加油区</label>
-        <label class="leftTitle" *ngIf="markType === 2">卸油区</label>
-        <label class="leftTitle" *ngIf="markType === 3">便利店</label>
-
-
-
-        <button nz-button [ngClass]="{selectBtn: selectedBtn === '进出口'}" (click)="selectedBtn = '进出口'">进出口
-            <span class="colorBlock" style="background-color: red;"></span>
-            <span class="deleteItem" (click)="clearCanvasItem($event,'进出口')">删除</span>
-        </button>
-
-        <button nz-button [ngClass]="{selectBtn: selectedBtn === '收银区'}" (click)="selectedBtn = '收银区'">收银区
-            <span class="colorBlock" style="background-color: yellow;"></span>
-            <span class="deleteItem" (click)="clearCanvasItem($event,'收银区')">删除</span>
-        </button>
-
-        <button nz-button [ngClass]="{selectBtn: selectedBtn === '加油区'}" (click)="selectedBtn = '加油区'">加油区
-            <span class="colorBlock" style="background-color: green;"></span>
-            <span class="deleteItem" (click)="clearCanvasItem($event,'加油区')">删除</span>
-        </button>
-
-        <button nz-button [ngClass]="{selectBtn: selectedBtn === '卸油区'}" (click)="selectedBtn = '卸油区'">卸油区
-            <span class="colorBlock" style="background-color: black;"></span>
-            <span class="deleteItem" (click)="clearCanvasItem($event,'卸油区')">删除</span>
-        </button>
-
-
-        <button nz-button nzType="primary" (click)="anewgetImg()">重新捕获摄像头图片</button>
-        <button nz-button nzType="primary" (click)="save()">保存</button>
-        <button nz-button nzType="primary" nzDanger nz-popconfirm nzPopconfirmTitle="您确定要清空吗?"
-            (nzOnConfirm)="clearCanvas()">清空</button>
-        <div class="changeImg">
-            <button nz-button nzType="primary">更换底图</button>
-            <input type="file" class="inputfile" (change)="changeImg($event)">
-        </div>
-
-        <label *ngIf="camerasData" class="rightTitle">原始分辨率： {{camerasData.originalWeight}} ×
-            {{camerasData.originalHeight}}
-        </label>
-    </div>
-
-
-    <div class="imgbox">
-        <div class="content">
-            <div class="center" id="canvasCenter"><canvas id="canvas" [width]="canvasWidth"
-                    [height]="canvasHeight"></canvas>
-            </div>
-        </div>
-    </div>
-</div>

src/app/system-management/image-label-anxin/image-label-anxin.component.scss

@@ -1,103 +0,0 @@
-.canvasBox {
-  width: 100%;
-  height: 100%;
-  background: #fff;
-  font-size: 15px;
-  color: black;
-  box-sizing: border-box;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-
-  .imgbox {
-    flex: 1;
-    overflow: hidden;
-  }
-
-  canvas {
-    overflow: hidden;
-    display: block;
-  }
-
-  .content,
-  .center {
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-  }
-}
-
-.btnbox {
-  display: flex;
-  position: fixed;
-  left: 1%;
-  top: 1%;
-  z-index: 10;
-  border: 1px solid red;
-  box-sizing: border-box;
-  cursor: move;
-
-  button {
-    margin-right: 6px;
-    display: flex;
-    align-items: center;
-  }
-
-  .colorBlock {
-    display: inline-block;
-    width: 12px;
-    height: 12px;
-    margin-left: 3px;
-  }
-
-
-
-  .deleteItem {
-    display: none;
-    color: red;
-    cursor: pointer;
-    margin-left: 5px;
-  }
-
-  button:hover {
-    .deleteItem {
-      display: block;
-    }
-  }
-
-  .leftTitle {
-    line-height: 32px;
-    margin-right: 10px;
-    color: #fff;
-  }
-
-  .rightTitle {
-    line-height: 32px;
-    margin-left: 10px;
-    color: #fff;
-  }
-}
-
-.imgbox,
-.btnbox {
-  box-sizing: border-box;
-  padding: 0;
-}
-
-.selectBtn {
-  background-color: #1890ff;
-  color: #fff;
-}
-
-.changeImg {
-  position: relative;
-
-  .inputfile {
-    width: 88px;
-    height: 32px;
-    position: absolute;
-    left: 0;
-    top: 0;
-    opacity: 0;
-  }
-}

src/app/system-management/image-label-anxin/image-label-anxin.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ImageLabelAnxinComponent } from './image-label-anxin.component';
-
-describe('ImageLabelAnxinComponent', () => {
-  let component: ImageLabelAnxinComponent;
-  let fixture: ComponentFixture<ImageLabelAnxinComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ImageLabelAnxinComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ImageLabelAnxinComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

src/app/system-management/image-label-anxin/image-label-anxin.component.ts

@@ -1,605 +0,0 @@
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-import { Component, Input, OnInit } from '@angular/core';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzModalService } from 'ng-zorro-antd/modal';
-
-@Component({
-  selector: 'app-image-label-anxin',
-  templateUrl: './image-label-anxin.component.html',
-  styleUrls: ['./image-label-anxin.component.scss'],
-})
-export class ImageLabelAnxinComponent implements OnInit {
-  constructor(
-    private http: HttpClient,
-    private message: NzMessageService,
-    private modal: NzModalService
-  ) {}
-
-  @Input() cameraId: any; //传递id
-  camerasData: any; //摄像头Data
-  imgItem: any; //图片 URL
-  canvasWidth: number = 0;
-  canvasHeight: number = 0;
-  copyCanvas: any; //拷贝 canvas底图
-
-  selectedBtn: string; //按钮选中
-  //返回上一步路由
-  goback() {
-    history.go(-1);
-  }
-
-  ngOnInit(): void {}
-
-  //获取 摄像头图片/标注点位
-  getImgMarkData() {
-    console.log('获取照片', new Date().getTime());
-    return new Promise((resolve, reject) => {
-      this.http.get(`/api/Cameras/${this.cameraId}`).subscribe((data: any) => {
-        this.camerasData = data;
-        // this.camerasData.dimensionedPointsAnxin = null
-        this.markType = data.type;
-        const httpOptions = {
-          responseType: 'blob' as 'json',
-          params: { cameraId: this.cameraId },
-        };
-        let date = new Date().getTime();
-        this.http.get(`/api/Cameras/Images?v=${date}`, httpOptions).subscribe({
-          next: (data) => {
-            resolve(data);
-          },
-          error: (err) => {
-            reject('error');
-          },
-        });
-      });
-    });
-  }
-
-  anewgetImg() {
-    let params = {
-      cameraId: this.cameraId,
-      provider: 1,
-    };
-    this.http
-      .put('/api/Cameras/Commands/CaptureImages', '', { params: params })
-      .subscribe({
-        next: (value: Object) => {
-          this.message.create(
-            'success',
-            '向边缘设备发送请求成功，请过一段时间手动刷新页面!'
-          );
-        },
-        error: (error: HttpErrorResponse) => {},
-        complete: () => {},
-      });
-  }
-
-  ngAfterContentInit(): void {
-    this.getImgMarkData()
-      .then((res: any) => {
-        this.imgItem = window.URL.createObjectURL(res);
-        window.setTimeout(() => {
-          this.initBackgroundImg();
-        }, 0);
-      })
-      .catch((err) => {
-        this.message.create('error', '获取图片失败!');
-        window.setTimeout(() => {
-          this.initBackgroundImg();
-        }, 0);
-      });
-  }
-
-  //初始化背景图
-  canvas;
-  ctx;
-
-  initBackgroundImg() {
-    this.canvas = document.getElementById('canvas') as any;
-    //取消鼠标右键事件
-    this.canvas.oncontextmenu = () => {
-      return false;
-    };
-    // 检测canvas支持性
-    if (this.canvas.getContext) {
-      this.ctx = this.canvas.getContext('2d'); // 返回一个对象，该对象提供了用在画布上绘图的方法和属性
-    } else {
-      document.write('你的浏览器不支持canvas,请升级你的浏览器!');
-      return;
-    }
-    // 图片加载完后，将其显示在canvas中
-    var img = new Image();
-    img.src = this.imgItem ? this.imgItem : '../../../assets/images/noImg.png';
-
-    console.log('img', img);
-
-    img.onload = () => {
-      console.log('原始宽度', img.width);
-      console.log('原始高度', img.height);
-      if (img.width > 1920) {
-        img.height = img.height * (1920 / img.width);
-        img.width = 1920;
-      }
-      this.canvasWidth = img.width;
-      this.canvasHeight = img.height;
-      console.log('显示宽度', this.canvasWidth);
-      console.log('显示高度', this.canvasHeight);
-      // return;
-      window.setTimeout(() => {
-        // 加载图片
-        this.ctx.drawImage(img, 0, 0, this.canvasWidth, this.canvasHeight);
-        this.copyCanvas = this.ctx.getImageData(
-          0,
-          0,
-          this.canvasWidth,
-          this.canvasHeight
-        );
-        //初始化标绘图形
-        this.initMark(this.canvas, this.ctx);
-        //监听canvas事件
-        this.initCanvasEvent(this.canvas);
-      }, 0);
-    };
-  }
-
-  //初始化标绘图形
-
-  DrawPolygoning = '';
-  initMark(canvas, context) {
-    // return
-    if (!this.camerasData.dimensionedPointsAnxin) {
-      return;
-    } else {
-      this.camerasData.dimensionedPointsAnxin = JSON.parse(
-        this.camerasData.dimensionedPointsAnxin
-      );
-    }
-    console.log('原始标点数据', this.camerasData.dimensionedPointsAnxin);
-
-    // for (const key in this.camerasData.dimensionedPointsAnxin.rawData) {
-    //   const element = this.camerasData.dimensionedPointsAnxin.rawData[key];
-    //   console.log(key, element);
-    //   if (element.length !== 0) {
-    //     for (let index = 0; index < element.length; index++) {
-    //       const item = element[index];
-    //       console.log(666, item);
-    //       let obj = this.PolygonData[key];
-    //       this.DrawPolygoning = key;
-    //       this.DrawPolygon(
-    //         item.x,
-    //         item.y,
-    //         canvas,
-    //         context,
-    //         obj.Points,
-    //         obj.Circles,
-    //         obj.Allpoints,
-    //         obj.IsDragging,
-    //         obj.IsInOut,
-    //         obj.Color
-    //       );
-    //     }
-    //   }
-    //   this.DrawPolygoning = '';
-    // }
-
-    for (
-      let key = 0;
-      key < this.camerasData.dimensionedPointsAnxin.yamlData.length;
-      key++
-    ) {
-      const element = this.camerasData.dimensionedPointsAnxin.yamlData[key];
-      let name = enum_area[element.type];
-      let arr = this.handleArr(element.points);
-      for (let index = 0; index < arr.length; index++) {
-        const item = arr[index];
-        let obj = this.PolygonData[name];
-        this.DrawPolygoning = name;
-        this.DrawPolygon(
-          item.x,
-          item.y,
-          canvas,
-          context,
-          obj.Points,
-          obj.Circles,
-          obj.Allpoints,
-          obj.IsDragging,
-          obj.IsInOut,
-          obj.Color
-        );
-      }
-      this.DrawPolygoning = '';
-    }
-  }
-  handleArr(arr, n = 2) {
-    const res = [];
-    for (let i = 0; i < arr.length - 1; i += 2) {
-      let index = Math.floor(i / n);
-      const obj = {
-        x: Number((arr[i] * this.canvasWidth).toFixed(0)),
-        y: Number((arr[i + 1] * this.canvasHeight).toFixed(0)),
-      };
-      res[index] = obj;
-    }
-    return res;
-  }
-
-  markType: number = 0; //0=进出口,1=加油区,2=卸油区,3=便利店,
-
-  //记录鼠标点击位置
-  downx = 0;
-  downy = 0;
-
-  //初始化 canvas画布 监听事件
-  context;
-  initCanvasEvent(canvas) {
-    var context = canvas.getContext('2d');
-    this.context = context;
-    canvas.onmousedown = (e) => {
-      if (!this.selectedBtn) {
-        this.message.create('warning', '请先选择要绘制的区域!');
-        return;
-      }
-
-      //鼠标按下事件
-      var clickX = e.pageX - canvas.offsetLeft;
-      var clickY = e.pageY - canvas.offsetTop;
-      this.downx = clickX;
-      this.downy = clickY;
-      let obj;
-      obj = this.PolygonData[this.selectedBtn];
-      this.DrawPolygon(
-        clickX,
-        clickY,
-        canvas,
-        context,
-        obj.Points,
-        obj.Circles,
-        obj.Allpoints,
-        obj.IsDragging,
-        obj.IsInOut,
-        obj.Color
-      );
-    };
-
-    canvas.onmouseup = (e) => {
-      //鼠标松开事件
-      canvas.onmousemove = (ev) => {
-        //鼠标移动事件
-        return false;
-      };
-    };
-  }
-
-  PolygonData = {
-    进出口: {
-      //进出口多边形
-      Points: [], //线段的点的集合
-      Circles: [], //可拖动圆圈的点的集合
-      Allpoints: [], //整体移动点位
-      IsDragging: false, //是否可拖拽
-      IsInOut: false, //是否在绘制区域内
-      Color: 'red',
-    },
-    收银区: {
-      //收银区多边形
-      Points: [], //线段的点的集合
-      Circles: [], //可拖动圆圈的点的集合
-      Allpoints: [], //整体移动点位
-      IsDragging: false, //是否可拖拽
-      IsInOut: false, //是否在绘制区域内
-      Color: 'yellow',
-    },
-    加油区: {
-      //加油区多边形
-      Points: [], //线段的点的集合
-      Circles: [], //可拖动圆圈的点的集合
-      Allpoints: [], //整体移动点位
-      IsDragging: false, //是否可拖拽
-      IsInOut: false, //是否在绘制区域内
-      Color: 'green',
-    },
-    卸油区: {
-      Points: [], //线段的点的集合
-      Circles: [], //可拖动圆圈的点的集合
-      Allpoints: [], //整体移动点位
-      IsDragging: false, //是否可拖拽
-      IsInOut: false, //是否在绘制区域内
-      Color: 'black',
-    },
-  };
-
-  //绘制多边形的方法
-  DrawPolygon(
-    clickX,
-    clickY,
-    canvas,
-    context,
-    Points,
-    Circles,
-    Allpoints,
-    IsDragging,
-    IsInOut,
-    Color
-  ) {
-    if (this.isInt(clickX, clickY, Points)) {
-      IsInOut = true;
-      return;
-    } else {
-      IsInOut = false;
-    }
-    let index;
-    //判断当前点击点是否在已经绘制的圆圈上，如果是执行相关操作，并return，不进入画线的代码
-    for (var i = 0; i < Circles.length; i++) {
-      let circle = Circles[i];
-      //使用勾股定理计算这个点与圆心之间的距离
-      var distanceFromCenter = Math.sqrt(
-        Math.pow(circle.x - clickX, 2) + Math.pow(circle.y - clickY, 2)
-      );
-      // 如果是其他的点，则设置可以拖动
-      if (distanceFromCenter <= circle.radius) {
-        // 清除之前选择的圆圈
-        index = i;
-        IsDragging = true;
-        //停止搜索
-        return;
-      }
-    }
-    //如果点击新的位置，则进入下面的代码，绘制点
-    context.clearRect(0, 0, canvas.width, canvas.height);
-    this.copyCanvas ? context.putImageData(this.copyCanvas, 0, 0) : null;
-
-    //重绘除了自己的其他区域
-    for (const key in this.PolygonData) {
-      const item = this.PolygonData[key];
-      if (key !== this.selectedBtn && key !== this.DrawPolygoning) {
-        this.redrawPolygon(
-          item.Points,
-          item.Allpoints,
-          item.Circles,
-          context,
-          item.Color
-        );
-      }
-    }
-
-    //遍历数组画圆
-    var circle = {
-      x: clickX,
-      y: clickY,
-      radius: 5,
-      color: Color,
-      isSelected: false, //拖拽点的标记
-    };
-    Circles.push(circle);
-    Allpoints = JSON.parse(JSON.stringify(Circles));
-    Circles[0].color = Color;
-    for (var i = 0; i < Circles.length; i++) {
-      let circle = Circles[i];
-      // 绘制圆圈
-      context.globalAlpha = 0.85;
-      context.beginPath();
-      context.arc(circle.x, circle.y, circle.radius, 0, Math.PI * 2);
-      context.fillStyle = circle.color;
-      context.strokeStyle = Color;
-      context.fill();
-      context.stroke();
-    }
-    // 画线
-    var point = {
-      x: clickX,
-      y: clickY,
-    };
-    Points.push(point);
-    context.beginPath();
-    context.lineWidth = 3;
-    //从起始点开始绘制
-    context.moveTo(Points[0].x, Points[0].y);
-    for (var i = 0; i < Points.length; i++) {
-      context.lineTo(Points[i].x, Points[i].y);
-    }
-    context.closePath();
-    context.strokeStyle = Color;
-    context.stroke();
-  }
-
-  //判断点位是否在图形区域内
-  isInt(x, y, points) {
-    if (!points[2]) {
-      return;
-    }
-    var pt = {
-      x: x,
-      y: y,
-    };
-    return this.PointInPoly(pt, points);
-  }
-  //射线法判断点位
-  PointInPoly(pt, poly) {
-    for (var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
-      ((poly[i].y <= pt.y && pt.y < poly[j].y) ||
-        (poly[j].y <= pt.y && pt.y < poly[i].y)) &&
-        pt.x <
-          ((poly[j].x - poly[i].x) * (pt.y - poly[i].y)) /
-            (poly[j].y - poly[i].y) +
-            poly[i].x &&
-        (c = !c);
-    return c;
-  }
-
-  //根据已有数据重绘多边形
-  redrawPolygon(data, points, circles, context, color) {
-    data.forEach((element) => {
-      //遍历数组画圆
-      points = JSON.parse(JSON.stringify(circles));
-      circles[0].color = color;
-      for (var i = 0; i < circles.length; i++) {
-        let circle = circles[i];
-        // 绘制圆圈
-        context.globalAlpha = 0.85;
-        context.beginPath();
-        context.arc(circle.x, circle.y, circle.radius, 0, Math.PI * 2);
-        context.fillStyle = circle.color;
-        context.strokeStyle = color;
-        context.fill();
-        context.stroke();
-      }
-      // 画线
-      context.beginPath();
-      context.lineWidth = 3;
-      //从起始点开始绘制
-      context.moveTo(data[0].x, data[0].y);
-      for (var i = 0; i < data.length; i++) {
-        context.lineTo(data[i].x, data[i].y);
-      }
-      context.closePath();
-      context.strokeStyle = color;
-      context.stroke();
-    });
-  }
-
-  //清空画布
-  clearCanvas() {
-    let canvas = document.getElementById('canvas') as any;
-    let context = canvas.getContext('2d');
-    for (const key in this.PolygonData) {
-      const element = this.PolygonData[key];
-      element.Points = [];
-      element.Circles = [];
-      element.Allpoints = [];
-      element.IsDragging = false;
-      element.IsInOut = false;
-    }
-    context.clearRect(0, 0, canvas.width, canvas.height);
-    this.copyCanvas ? context.putImageData(this.copyCanvas, 0, 0) : null;
-    // console.log(this.PolygonData)
-  }
-
-  //清除某个标绘
-  clearCanvasItem(e, type) {
-    e.stopPropagation();
-    this.modal.confirm({
-      nzTitle: '确认要清除此标绘吗?',
-      nzOkText: '确定',
-      nzOkType: 'primary',
-      nzOkDanger: true,
-      nzOnOk: () => {
-        this.context.clearRect(0, 0, this.canvasWidth, this.canvasHeight);
-        this.copyCanvas
-          ? this.context.putImageData(this.copyCanvas, 0, 0)
-          : null;
-        this.PolygonData[type].Points = [];
-        this.PolygonData[type].Circles = [];
-        this.PolygonData[type].Allpoints = [];
-        this.redrawAll();
-      },
-      nzCancelText: '取消',
-    });
-  }
-
-  redrawAll() {
-    //重绘除了自己的其他区域
-    for (const key in this.PolygonData) {
-      const item = this.PolygonData[key];
-      this.redrawPolygon(
-        item.Points,
-        item.Allpoints,
-        item.Circles,
-        this.context,
-        item.Color
-      );
-    }
-  }
-
-  //保存
-  save() {
-    console.log(this.camerasData.dimensionedPointsAnxin);
-    console.log('标点数据', this.PolygonData);
-
-    for (const key in this.PolygonData) {
-      const element = this.PolygonData[key];
-      if (element.Points.length !== 0 && element.Points.length <= 2) {
-        this.message.create('info', '标绘图形必须为封闭图形!');
-        return;
-      }
-    }
-    if (!this.camerasData.dimensionedPointsAnxin) {
-      this.camerasData.dimensionedPointsAnxin = {};
-      this.camerasData.dimensionedPointsAnxin.rawData = {
-        进出口: [],
-        收银区: [],
-        加油区: [],
-        卸油区: [],
-      };
-      this.camerasData.dimensionedPointsAnxin.yamlData = [];
-    }
-
-    let yamlData = [];
-    for (const key in this.PolygonData) {
-      const item = this.PolygonData[key];
-      this.camerasData.dimensionedPointsAnxin.rawData[key] = item.Points;
-      if (item.Points.length !== 0) {
-        let points = [];
-        for (const key in item.Points) {
-          const v = item.Points[key];
-          points.push(Number((v.x / this.canvasWidth).toFixed(4)));
-          points.push(Number((v.y / this.canvasHeight).toFixed(4)));
-        }
-        let obj = {
-          type: enum_area[key],
-          points: points,
-        };
-        yamlData.push(obj);
-      }
-    }
-    this.camerasData.dimensionedPointsAnxin.yamlData = yamlData;
-    let body = {
-      dimensionedPointsAnxin: JSON.stringify(
-        this.camerasData.dimensionedPointsAnxin
-      ),
-    };
-
-    console.log('标点结果', this.camerasData.dimensionedPointsAnxin);
-    // return;
-    this.http
-      .put(`/api/Cameras/${this.camerasData.id}/DimensionedPoints`, body)
-      .subscribe((data) => {
-        this.message.create('success', '保存成功!');
-        const isFullScreen = document.fullscreenElement;
-        if (document.exitFullscreen && isFullScreen) {
-          //关闭全屏
-          document.exitFullscreen();
-        }
-        this.modal.closeAll();
-      });
-  }
-  //更换底图
-  changeImg(e) {
-    this.clearCanvas();
-    let file = e.target.files[0] || null; //获取上传的文件
-    let fileUrl = URL.createObjectURL(file);
-    console.log(fileUrl);
-    var img = new Image();
-    img.src = fileUrl;
-    img.onload = () => {
-      this.canvasWidth = img.width;
-      this.canvasHeight = img.height;
-      window.setTimeout(() => {
-        // 加载图片
-        this.ctx.drawImage(img, 0, 0, this.canvasWidth, this.canvasHeight);
-        this.copyCanvas = this.ctx.getImageData(
-          0,
-          0,
-          this.canvasWidth,
-          this.canvasHeight
-        );
-      }, 0);
-    };
-  }
-}
-
-enum enum_area {
-  '加油区' = 2,
-  '卸油区' = 3,
-  '收银区' = 1,
-  '进出口' = 0,
-}

src/app/system-management/image-label/image-label.component.html

@@ -1,57 +1,33 @@
+<!-- 黄海盒子标注 -->
 <div class="canvasBox">
   <!-- <nz-page-header class="site-page-header" (nzBack)="goback()" nzBackIcon nzSubtitle="返回上一页"></nz-page-header> -->
   <div class="btnbox">
-    <label class="leftTitle" style="color: red;">黄海盒子标记</label>
+    <label class="leftTitle" *ngIf="markType === 0">666进出口</label>
-    <label class="leftTitle" *ngIf="markType === 0">进出口</label>
-    <label class="leftTitle" *ngIf="markType === 1">加油区</label>
     <label class="leftTitle" *ngIf="markType === 2">卸油区</label>
     <label class="leftTitle" *ngIf="markType === 3">便利店</label>
-
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: isDrawArrow && !arrowDirection}"
-
+      (click)="isDrawArrow = true;arrowDirection=null">
-
+      箭头方向标绘1
-    <button *ngIf="markType === 0 || markType === 2 " nz-button [ngClass]="{selectBtn: selectedBtn === '停车区'}"
+      <span class="deleteItem" (click)="clearCanvasItem($event,'arrow')">删除</span>
-      (click)="selectedBtn = '停车区'">停车区
-      <span class="deleteItem" (click)="clearCanvasItem($event,'carStopROI')">删除</span>
-    </button>
-
-    <button *ngIf="markType === 1" nz-button [ngClass]="{selectBtn: selectedBtn === '散装油'}"
-      (click)="selectedBtn = '散装油'">散装油
-      <span class="deleteItem" (click)="clearCanvasItem($event,'bulkoilROI')">删除</span>
-    </button>
-
-    <button *ngIf="markType === 2" nz-button [ngClass]="{selectBtn: selectedBtn === '闯入区'}"
-      (click)="selectedBtn = '闯入区'">闯入区
-      <span class="deleteItem" (click)="clearCanvasItem($event,'intrusionROI')">删除</span>
-    </button>
-
-
-    <!-- 矩形 -->
-    <button *ngIf="markType === 2" nz-button [ngClass]="{selectBtn: selectedBtn === '卸油区'}"
-      (click)="selectedBtn = '卸油区'">卸油区
-      <span class="deleteItem" (click)="clearCanvasItem($event,'unloadingROI')">删除</span>
     </button>
-    <button *ngIf="markType === 2" nz-button [ngClass]="{selectBtn: selectedBtn === '人'}"
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: (isDrawArrow && arrowDirection=='West')}"
-      (click)="selectedBtn = '人'">人,灭火器,隔离椎
+      (click)="isDrawArrow = true;arrowDirection='West'">箭头方向标绘2
-      <span class="deleteItem" (click)="clearCanvasItem($event,'xxxROI')">删除</span>
+      <span class="deleteItem" (click)="clearCanvasItem($event,'arrowOfWest')">删除</span></button>
-    </button>
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: !isDrawArrow && oilUnloadingArea}"
-
+      (click)="isDrawArrow = false; oilUnloadingArea = true;">泄油管区域
-
+      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaTrue')">删除</span></button>
-    <button *ngIf="markType === 3" nz-button [ngClass]="{selectBtn: selectedBtn === '收银区'}"
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: !isDrawArrow && !oilUnloadingArea}"
-      (click)="selectedBtn = '收银区'">收银区
+      (click)="isDrawArrow = false; oilUnloadingArea = false;">静电接地仪
-      <span class="deleteItem" (click)="clearCanvasItem($event,'cashierROI')">删除</span>
+      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaFalse')">删除</span></button>
-    </button>
-
-
     <button nz-button nzType="primary" (click)="anewgetImg()">重新捕获摄像头图片</button>
     <button nz-button nzType="primary" (click)="save()">保存</button>
     <button nz-button nzType="primary" nzDanger nz-popconfirm nzPopconfirmTitle="您确定要清空吗?"
       (nzOnConfirm)="clearCanvas()">清空</button>
     <label *ngIf="camerasData" class="rightTitle">原始分辨率： {{camerasData.originalWeight}} ×
-      {{camerasData.originalHeight}}
+      {{camerasData.originalHeight}}</label>
-    </label>
-  </div>
-
 
+    <!-- <label *ngIf="markType === 2 && !isDrawArrow" class="rightTitle">当前矩形框高度为:{{rectangleHeight}}px,请确保低于420px</label> -->
+  </div>
   <div class="imgbox">
     <div class="content">
       <div class="center" id="canvasCenter"><canvas id="canvas" [width]="canvasWidth" [height]="canvasHeight"></canvas>

src/app/system-management/image-label2/image-label2.component.html

@@ -1,63 +1,40 @@
+<!-- 交大盒子标注 -->
 <div class="canvasBox">
   <!-- <nz-page-header class="site-page-header" (nzBack)="goback()" nzBackIcon nzSubtitle="返回上一页"></nz-page-header> -->
   <div class="btnbox">
-    <label class="leftTitle" style="color: red;">交大盒子标记</label>
     <label class="leftTitle" *ngIf="markType === 0">进出口</label>
-    <label class="leftTitle" *ngIf="markType === 1">加油区</label>
     <label class="leftTitle" *ngIf="markType === 2">卸油区</label>
     <label class="leftTitle" *ngIf="markType === 3">便利店</label>
-
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: isDrawArrow && !arrowDirection}"
-    <!-- <button nz-button *ngIf="markType === 0" [ngClass]="{selectBtn: isPolygon}"
+      (click)="isDrawArrow = true;arrowDirection=null">
-      (click)="isPolygon = true;isAllMonitoring = false">
-      进出口监控区域
-      <span class="deleteItem" (click)="clearCanvasItem($event,'polygon')">删除</span>
-    </button> -->
-
-    <button nz-button *ngIf="markType === 3" [ngClass]="{selectBtn: isConvenienceStore && isDrawArrow}"
-      (click)="isConvenienceStore = true;isAllMonitoring = false">
-      便利店箭头标绘
-      <span class="deleteItem" (click)="clearCanvasItem($event,'arrow')">删除</span>
-    </button>
-
-
-    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: isDrawArrow && !arrowDirection && !isAllMonitoring}"
-      (click)="isDrawArrow = true;arrowDirection=null;isAllMonitoring = false">
       箭头方向标绘1
       <span class="deleteItem" (click)="clearCanvasItem($event,'arrow')">删除</span>
     </button>
-    <button nz-button *ngIf="markType === 2"
+    <!-- <button nz-button *ngIf="markType === 2"
-      [ngClass]="{selectBtn: isDrawArrow && arrowDirection=='West'  && !isAllMonitoring}"
+      [ngClass]="{selectBtn:(isDrawArrow && arrowDirection=='South')}"
-      (click)="isDrawArrow = true;arrowDirection='West';isAllMonitoring = false">箭头方向标绘2
+      (click)="isDrawArrow = true;arrowDirection='South'">South</button> -->
-      <span class="deleteItem" (click)="clearCanvasItem($event,'arrowOfWest')">删除</span>
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: (isDrawArrow && arrowDirection=='West')}"
-    </button>
+      (click)="isDrawArrow = true;arrowDirection='West'">箭头方向标绘2
-    <button nz-button *ngIf="markType === 2"
+      <span class="deleteItem" (click)="clearCanvasItem($event,'arrowOfWest')">删除</span></button>
-      [ngClass]="{selectBtn: !isDrawArrow && oilUnloadingArea && !isAllMonitoring}"
+    <!-- <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: (isDrawArrow && arrowDirection=='East')}"
-      (click)="isDrawArrow = false; oilUnloadingArea = true;isAllMonitoring = false">泄油管区域
+      (click)="isDrawArrow = true;arrowDirection='East'">East</button>
-      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaTrue')">删除</span>
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: (isDrawArrow && arrowDirection=='North')}"
-    </button>
+      (click)="isDrawArrow = true;arrowDirection='North'">North</button> -->
-    <button nz-button *ngIf="markType === 2"
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: !isDrawArrow && oilUnloadingArea}"
-      [ngClass]="{selectBtn: !isDrawArrow && !oilUnloadingArea && !isAllMonitoring}"
+      (click)="isDrawArrow = false; oilUnloadingArea = true;">泄油管区域
-      (click)="isDrawArrow = false; oilUnloadingArea = false;isAllMonitoring = false">静电接地仪
+      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaTrue')">删除</span></button>
-      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaFalse')">删除</span>
+    <button nz-button *ngIf="markType === 2" [ngClass]="{selectBtn: !isDrawArrow && !oilUnloadingArea}"
-    </button>
+      (click)="isDrawArrow = false; oilUnloadingArea = false;">静电接地仪
-
+      <span class="deleteItem" (click)="clearCanvasItem($event,'oilUnloadingAreaFalse')">删除</span></button>
-
-    <button *ngIf="markType !== 0" nz-button [ngClass]="{selectBtn: isAllMonitoring}"
-      (click)="isAllMonitoring = true;isPolygon = false;isConvenienceStore = false;">全局监控区域
-      <span class="deleteItem" (click)="clearCanvasItem($event,'isAllMonitoring')">删除</span>
-    </button>
-
-
     <button nz-button nzType="primary" (click)="anewgetImg()">重新捕获摄像头图片</button>
     <button nz-button nzType="primary" (click)="save()">保存</button>
     <button nz-button nzType="primary" nzDanger nz-popconfirm nzPopconfirmTitle="您确定要清空吗?"
       (nzOnConfirm)="clearCanvas()">清空</button>
     <label *ngIf="camerasData" class="rightTitle">原始分辨率： {{camerasData.originalWeight}} ×
-      {{camerasData.originalHeight}}
+      {{camerasData.originalHeight}}</label>
-    </label>
-  </div>
-
 
+    <!-- <label *ngIf="markType === 2 && !isDrawArrow" class="rightTitle">当前矩形框高度为:{{rectangleHeight}}px,请确保低于420px</label> -->
+  </div>
   <div class="imgbox">
     <div class="content">
       <div class="center" id="canvasCenter"><canvas id="canvas" [width]="canvasWidth" [height]="canvasHeight"></canvas>

src/app/system-management/organization/change-or/change-or.component.html

@@ -1,4 +0,0 @@
-<div class="box">
-    <nz-tree #nzTreeComponent [nzSelectedKeys]="defaultSelectedKeys" [nzData]="nodes"
-        [nzExpandedKeys]="defaultExpandedKeys"></nz-tree>
-</div>

src/app/system-management/organization/change-or/change-or.component.scss

@@ -1,4 +0,0 @@
-.box {
-  max-height: 500px;
-  overflow-y: auto;
-}

src/app/system-management/organization/change-or/change-or.component.spec.ts

@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ChangeOrComponent } from './change-or.component';
-
-describe('ChangeOrComponent', () => {
-  let component: ChangeOrComponent;
-  let fixture: ComponentFixture<ChangeOrComponent>;
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [ ChangeOrComponent ]
-    })
-    .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ChangeOrComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -1,55 +0,0 @@
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
-import { NzModalRef } from 'ng-zorro-antd/modal';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
-import { HttpClient } from '@angular/common/http';
-import { TreeService } from 'src/app/service/tree.service';
-import { NzTreeComponent } from 'ng-zorro-antd/tree';
-
-@Component({
-  selector: 'app-change-or',
-  templateUrl: './change-or.component.html',
-  styleUrls: ['./change-or.component.scss'],
-})
-export class ChangeOrComponent implements OnInit {
-  @Input() data?: any;
-  @ViewChild('nzTreeComponent', { static: false })
-  nzTreeComponent!: NzTreeComponent;
-  constructor(
-    private modal: NzModalRef,
-    private fb: FormBuilder,
-    private http: HttpClient,
-    private toTree: TreeService
-  ) {}
-
-  defaultExpandedKeys = [];
-  defaultSelectedKeys = [];
-  ngOnInit(): void {
-    this.getAllOrganization();
-    // this.nzTreeComponent.getCheckedNodeList()
-  }
-
-  allOrList: any;
-  nodes: any;
-  getAllOrganization() {
-    let params = {
-      ContainsChildren: true,
-      pageSize: 9999,
-    };
-    this.http
-      .get('/api/Organizations', {
-        params: params,
-      })
-      .subscribe((data: any) => {
-        data.items.forEach((element) => {
-          element.key = element.id;
-          element.title = element.name;
-        });
-        this.allOrList = data.items.filter((v) => !v.isGasStation);
-        this.nodes = [...this.toTree.toTree(this.allOrList)];
-      });
-  }
-
-  destroyModal(): void {
-    this.modal.destroy({ data: 'this the result data' });
-  }
-}

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

@@ -9,22 +9,23 @@
       <nz-input-group nzPrefixIcon="search">
         <input type="text" nz-input placeholder="请输入单位" [(ngModel)]="searchValue" />
       </nz-input-group>
+      <button nz-button nzType="primary" (click)="addOr()"><i nz-icon nzType="plus-circle"
+          nzTheme="outline"></i>新增</button>
     </div>
   </div>
   <div class="treeTitle">
-    <span>组织机构 <i style="margin-left: 12px;cursor: pointer;" (click)="refresh()" nz-icon nzType="redo"
+    <span>组织机构</span>
-        nzTheme="outline"></i></span>
+    <span>操作</span>
   </div>
   <nz-tree [nzHideUnMatched]='true' [nzSearchValue]="searchValue" #nzTreeComponent [nzData]="nodes"
-    [nzExpandAll]="nzExpandAll" [nzExpandedKeys]="defaultExpandedKeys" nzDraggable nzBlockNode
+    [nzExpandAll]="nzExpandAll" [nzExpandedKeys]="defaultExpandedKeys" [nzTreeTemplate]="nzTreeTemplate" nzDraggable
-    (nzOnDrop)="nzEvent($event)" [nzBeforeDrop]="beforeDrop" [nzTreeTemplate]="nzTreeTemplate">
+    nzBlockNode (nzOnDrop)="nzEvent($event)" [nzBeforeDrop]="beforeDrop">
   </nz-tree>
   <ng-template #nzTreeTemplate let-node let-origin="origin">
     <div class="nodebox">
       <span class="name">{{ node.title }}</span>
       <span class="operation">
         <span class="blue" (click)="addOr(node)" *ngIf="!node.origin.isGasStation">新增</span>
-        <span class="blue" (click)="changeOr(node)">修改所属机构</span>
         <span class="blue" (click)="editOr(node)">编辑</span>
         <span class="red" (click)="deleteOr(node)">删除</span>
       </span>

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

@@ -1,17 +1,7 @@
 import { HttpClient } from '@angular/common/http';
-import {
+import { Component, OnInit, AfterViewInit, ViewChild, ViewContainerRef } from '@angular/core';
-  Component,
-  OnInit,
-  AfterViewInit,
-  ViewChild,
-  ViewContainerRef,
-} from '@angular/core';
 import { TreeService } from 'src/app/service/tree.service';
-import {
+import { NzFormatEmitEvent, NzTreeComponent, NzTreeNodeOptions } from 'ng-zorro-antd/tree';
-  NzFormatEmitEvent,
-  NzTreeComponent,
-  NzTreeNodeOptions,
-} from 'ng-zorro-antd/tree';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { NzMessageService } from 'ng-zorro-antd/message';
@@ -22,51 +12,23 @@ import { NzFormatBeforeDropEvent } from 'ng-zorro-antd/tree';
 import { Observable, of } from 'rxjs';
 import { delay } from 'rxjs/operators';
 import { CustomReuseStrategy } from 'src/app/CustomReuseStrategy';
-import { ChangeOrComponent } from './change-or/change-or.component';
 @Component({
   selector: 'app-organization',
   templateUrl: './organization.component.html',
-  styleUrls: ['./organization.component.scss'],
+  styleUrls: ['./organization.component.scss']
 })
 export class OrganizationComponent implements OnInit {
   validateForm!: FormGroup;
-  constructor(
+  constructor(private fb: FormBuilder, private http: HttpClient, private toTree: TreeService, private modal: NzModalService, private message: NzMessageService, private viewContainerRef: ViewContainerRef) { }
-    private fb: FormBuilder,
-    private http: HttpClient,
-    private toTree: TreeService,
-    private modal: NzModalService,
-    private message: NzMessageService,
-    private viewContainerRef: ViewContainerRef
-  ) {}
 
   ngOnInit(): void {
     this.validateForm = this.fb.group({
-      search: [null],
+      search: [null]
     });
-    this.getAllOrganization();
+    this.getAllOrganization()
-  }
 
-  refresh() {
+    this.deleteRouteSnapshot();
-    this.http.put('/api/Organizations/SyncAllOrganizations', null).subscribe({
-      next: (data) => {
-        this.message.success('同步组织机构成功');
-        this.getAllOrganization();
-      },
-      error: (err) => {
-        this.message.error('同步组织机构失败');
-      },
-    });
-    this.http.put('/api/GasStations/SyncAllGasStations', null).subscribe({
-      next: (data) => {
-        this.message.success('同步油站成功');
-        this.getAllOrganization();
-      },
-      error: (err) => {
-        this.message.error('同步油站失败');
-      },
-    });
   }
-
   deleteRouteSnapshot() {
     CustomReuseStrategy.deleteRouteSnapshot('/system/host');
   }
@@ -81,43 +43,44 @@ export class OrganizationComponent implements OnInit {
   //获取所有组织机构
   searchValue = '';
   nzExpandAll = false;
-  totalCount: string;
+  totalCount: string
 
-  allOrList: any;
+  allOrList: any
   getAllOrganization() {
+    let OrganizationUnitId = ''
     let params = {
+      // OrganizationUnitId: OrganizationUnitId,
+      // IsContainsChildren: "true"
       ContainsChildren: true,
-      pageSize: 9999,
+      pageSize: 9999
-    };
+    }
-    this.http
+    this.http.get('/api/Organizations', {
-      .get('/api/Organizations', {
+      params: params
-        params: params,
+    }).subscribe((data: any) => {
-      })
+      console.log('组织机构列表', data)
-      .subscribe((data: any) => {
+      this.totalCount = data.totalCount
-        console.log('组织机构列表', data);
+      data.items.forEach(element => {
-        this.totalCount = data.totalCount;
+        element.key = element.id
-        data.items.forEach((element) => {
+        element.title = element.name
-          element.key = element.id;
+        element.selectable = false
-          element.title = element.name;
+        if (element.isGasStation) {
-          element.selectable = false;
+          element.isLeaf = true
-          if (element.isGasStation) {
+        }
-            element.isLeaf = true;
-          }
-        });
-        this.allOrList = data.items;
-        this.nodes = [...this.toTree.toTree(data.items)];
-        this.defaultExpandedKeys.length == 0
-          ? (this.defaultExpandedKeys = [this.nodes[0].id])
-          : (this.defaultExpandedKeys = [...this.defaultExpandedKeys]);
       });
+      this.allOrList = data.items
+      this.nodes = [...this.toTree.toTree(data.items)]
+      this.defaultExpandedKeys.length == 0 ? this.defaultExpandedKeys = [this.nodes[0].id] : this.defaultExpandedKeys = [...this.defaultExpandedKeys]
+
+    })
   }
 
-  @ViewChild('nzTreeComponent', { static: false })
+
-  nzTreeComponent!: NzTreeComponent;
+  @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
 
   defaultExpandedKeys = [];
 
-  nodes: any[] = [];
+  nodes: any[] = []
+
 
   addOr(node?: any) {
     // console.log(node.key)
@@ -129,32 +92,37 @@ export class OrganizationComponent implements OnInit {
       nzComponentParams: {},
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
-          await new Promise((resolve) => {
+          await new Promise(resolve => {
             let body = {
               name: instance.validateForm.value.name,
               parentId: node ? node.key : null,
-              isGasStation: instance.validateForm.value.isGasStation,
+              isGasStation: instance.validateForm.value.isGasStation
-            };
+            }
-            this.http.post('/api/Organizations', body).subscribe((data) => {
+            this.http.post('/api/Organizations', body).subscribe(data => {
-              resolve(data);
+              resolve(data)
               this.message.create('success', '创建成功！');
               this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
-                this.defaultExpandedKeys.push(item.key);
+                this.defaultExpandedKeys.push(item.key)
-              });
+              })
-              this.getAllOrganization();
+              this.getAllOrganization()
-              return true;
+              return true
-            });
+            }, err => {
-          });
+              resolve(err)
+              this.message.create('warning', '创建失败');
+              return false
+            })
+          })
         } else {
           this.message.create('warning', '请填写完整！');
-          return false;
+          return false
         }
-      },
+      }
     });
     const instance = modal.getContentComponent();
+
   }
   editOr(node) {
-    console.log(node);
+    console.log(node)
     const modal = this.modal.create({
       nzTitle: '编辑组织机构',
       nzContent: EditorComponent,
@@ -165,76 +133,36 @@ export class OrganizationComponent implements OnInit {
       },
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
-          await new Promise((resolve) => {
+          await new Promise(resolve => {
             let body = {
               name: instance.validateForm.value.name,
               isGasStation: instance.validateForm.value.isGasStation,
-              parentId: node.origin.parentId,
+              parentId: node.origin.parentId
-            };
+            }
-            this.http
+            this.http.put(`/api/Organizations/${node.origin.id}`, body).subscribe(data => {
-              .put(`/api/Organizations/${node.origin.id}`, body)
+              resolve(data)
-              .subscribe((data) => {
+              this.message.create('success', '编辑成功！');
-                resolve(data);
+              this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
-                this.message.create('success', '编辑成功！');
+                this.defaultExpandedKeys.push(item.key)
-                this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
+              })
-                  this.defaultExpandedKeys.push(item.key);
+              this.getAllOrganization()
-                });
+              return true
-                this.getAllOrganization();
+            }, err => {
-                return true;
+              resolve(err)
-              });
+              this.message.create('warning', '编辑失败');
-          });
+              return false
+            })
+          })
         } else {
           this.message.create('warning', '请填写完整！');
-          return false;
+          return false
         }
-      },
+      }
-    });
-    const instance = modal.getContentComponent();
-  }
-
-  changeOr(node) {
-    console.log(node);
-    const modal = this.modal.create({
-      nzTitle: '修改所属组织机构',
-      nzContent: ChangeOrComponent,
-      nzViewContainerRef: this.viewContainerRef,
-      nzWidth: 500,
-      nzComponentParams: {
-        data: this.allOrList,
-      },
-      nzOnOk: async () => {
-        let selectedNode =
-          instance.nzTreeComponent.getSelectedNodeList()[0].key;
-
-        if (selectedNode) {
-          await new Promise((resolve) => {
-            let body = {
-              parentId: selectedNode,
-              isGasStation: node.origin.isGasStation,
-            };
-            this.http
-              .put(`/api/Organizations/${node.origin.id}`, body)
-              .subscribe((data) => {
-                resolve(data);
-                this.message.create('success', '修改成功！');
-                this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
-                  this.defaultExpandedKeys.push(item.key);
-                });
-                this.getAllOrganization();
-                return true;
-              });
-          });
-        } else {
-          this.message.create('warning', '请选择机构！');
-          return false;
-        }
-      },
     });
     const instance = modal.getContentComponent();
   }
-
   deleteOr(item) {
-    console.log(item);
+    console.log(item)
     if (item.origin.children && item.origin.children.length != 0) {
       this.message.create('warning', '请先删除所有子节点');
     } else {
@@ -243,64 +171,66 @@ export class OrganizationComponent implements OnInit {
         nzOkText: '确定',
         nzOkType: 'primary',
         nzOnOk: () => {
-          this.http
+          this.http.delete(`/api/Organizations/${item.origin.id}`).subscribe(data => {
-            .delete(`/api/Organizations/${item.origin.id}`)
+            this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
-            .subscribe((data) => {
+              this.defaultExpandedKeys.push(item.key)
-              this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
+            })
-                this.defaultExpandedKeys.push(item.key);
+            this.getAllOrganization()
-              });
+            this.message.create('success', '删除成功！');
-              this.getAllOrganization();
+          })
-              this.message.create('success', '删除成功！');
-            });
         },
         nzCancelText: '取消',
-        nzOnCancel: () => {},
+        nzOnCancel: () => {
+
+        }
       });
     }
+
   }
 
+
   nzEvent(event: NzFormatEmitEvent): void {
-    console.log('event', event);
+    console.log('event', event)
     if (this.isDrag) {
-      let parentId;
+      let parentId
-      if (this.pos == 0) {
+      if (this.pos == 0) {//目标节点内部
-        //目标节点内部
+        parentId = event.node.key
-        parentId = event.node.key;
       } else {
         if (event.node.level == 0) {
-          parentId = null;
+          parentId = null
         } else {
-          parentId = event.node.origin.parentId;
+          parentId = event.node.origin.parentId
         }
       }
       let body = {
         parentId: parentId,
         name: event.dragNode.origin.name,
-        isGasStation: event.dragNode.origin.isGasStation,
+        isGasStation: event.dragNode.origin.isGasStation
-      };
+      }
-      this.http
+      this.http.put(`/api/Organizations/${event.dragNode.origin.id}`, body).subscribe(data => {
-        .put(`/api/Organizations/${event.dragNode.origin.id}`, body)
+        this.message.create('success', '拖拽成功！');
-        .subscribe((data) => {
+        this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
-          this.message.create('success', '拖拽成功！');
+          this.defaultExpandedKeys.push(item.key)
-          this.nzTreeComponent.getExpandedNodeList().forEach((item) => {
+        })
-            this.defaultExpandedKeys.push(item.key);
+        this.getAllOrganization()
-          });
+        return true
-          this.getAllOrganization();
+      }, err => {
-          return true;
+        this.message.create('warning', '拖拽失败');
-        });
+        return false
+      })
+
     }
   }
-  isDrag; //是否可以拖动
+  isDrag //是否可以拖动
-  pos; //放置位置
+  pos//放置位置
   beforeDrop = (arg: NzFormatBeforeDropEvent) => {
-    console.log('arg', arg);
+    console.log('arg', arg)
-    if (arg.pos != 0 && arg.node.level === 0) {
+    if (arg.pos != 0 && arg.node.level === 0) {//如果为数据节点则不允许拖到一级节点
-      //如果为数据节点则不允许拖到一级节点
       this.message.create('warning', '不允许拖拽到一级节点');
-      this.isDrag = false;
+      this.isDrag = false
       return of(false);
     } else {
-      return of(true);
+      return of(true)
     }
-  };
+  }
 }

src/app/system-management/status-monitoring/status-monitoring.component.html

@@ -68,7 +68,6 @@
                 <th>ip地址</th>
                 <th>所属油站</th>
                 <th>设备状态</th>
-                <th>识别程序状态</th>
             </tr>
         </thead>
         <tbody>
@@ -85,10 +84,6 @@
                         <span style="color: rgb(52, 204, 52);">在线</span>
                     </ng-template>
                 </td>
-                <td>
-                    <span style="color: red;" *ngIf="data.appState == 'Dead'">已停止</span>
-                    <span style="color: rgb(52, 204, 52);" *ngIf="data.appState == 'Alive'">运行中</span>
-                </td>
             </tr>
         </tbody>
     </nz-table>

src/app/system-management/system-management-routing.module.ts

@@ -5,13 +5,11 @@ import { AnalysisOfTheHostComponent } from './analysis-of-the-host/analysis-of-t
 import { HostConfigComponent } from './host-config/host-config.component';
 import { ImageListComponent } from './image-list/image-list.component';
 import { PlottingImageComponent } from './plotting-image/plotting-image.component';
-import { ImageLabel2Component } from './image-label2/image-label2.component';
 import { ConfigFormComponent } from './config-form/config-form.component';
 import { ConditionMonitoringComponent } from './condition-monitoring/condition-monitoring.component';
 import { KafkaComponent } from './kafka/kafka.component';
 import { StatusMonitoringComponent } from './status-monitoring/status-monitoring.component';
 import { VideoStreamingComponent } from './video-streaming/video-streaming.component';
-import { IframeComponent } from './iframe/iframe.component';
 
 
 const routes: Routes = [
@@ -19,14 +17,12 @@ const routes: Routes = [
     { path: 'host', component: AnalysisOfTheHostComponent },
     { path: 'host/camera', component: HostConfigComponent },
     { path: 'host/camera/imageList', component: ImageListComponent },
-    { path: 'host/camera/imageLabel', component: ImageLabel2Component },
     { path: 'host/camera/configForm', component: ConfigFormComponent },
     { path: 'plottingImage', component: PlottingImageComponent },
     { path: 'conditionMonitoring', component: ConditionMonitoringComponent },
     { path: 'statusMonitoring', component: StatusMonitoringComponent },
     { path: 'kafka', component: KafkaComponent },
-    { path: 'videoStreaming', component: VideoStreamingComponent },
+    { path: 'videoStreaming', component: VideoStreamingComponent }
-    { path: 'iframe', component: IframeComponent }
 ];
 
 @NgModule({

src/app/system-management/system-management.module.ts

@@ -46,50 +46,8 @@ import { ScriptComponent } from './status-monitoring/script/script.component';
 import { VideoStreamingComponent } from './video-streaming/video-streaming.component';
 import { DetailsComponent } from './video-streaming/details/details.component';
 import { NzRadioModule } from 'ng-zorro-antd/radio';
-import { HuangHaiConfigComponent } from './host-config/huang-hai-config/huang-hai-config.component';
-import { ImageLabelAnxinComponent } from './image-label-anxin/image-label-anxin.component';
-import { AnxinConfigComponent } from './host-config/anxin-config/anxin-config.component';
-import { DragDropModule } from '@angular/cdk/drag-drop';
-import { IframeComponent } from './iframe/iframe.component';
-import { WorkerTagComponent } from './analysis-of-the-host/worker-tag/worker-tag.component';
-import { ChangeOrComponent } from './organization/change-or/change-or.component';
-import { SimulateDataComponent } from './host-config/simulate-data/simulate-data.component';
-import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
 @NgModule({
-  declarations: [
+  declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, ImageListComponent, ImageLabelComponent, PlottingImageComponent, cameraType, ImageLabel2Component, ConfigFormComponent, ConditionMonitoringComponent, SendFileComponent, ModelComponent, KafkaComponent, StatusMonitoringComponent, FileComponent, ScriptComponent, VideoStreamingComponent, DetailsComponent],
-    OrganizationComponent,
-    NavigationComponent,
-    AddorComponent,
-    EditorComponent,
-    AnalysisOfTheHostComponent,
-    AddhostComponent,
-    EdithostComponent,
-    AddcameraComponent,
-    EditcameraComponent,
-    HostConfigComponent,
-    ImageListComponent,
-    ImageLabelComponent,
-    PlottingImageComponent,
-    cameraType,
-    ImageLabel2Component,
-    ConfigFormComponent,
-    ConditionMonitoringComponent,
-    SendFileComponent,
-    ModelComponent,
-    KafkaComponent,
-    StatusMonitoringComponent,
-    FileComponent,
-    ScriptComponent,
-    VideoStreamingComponent,
-    DetailsComponent,
-    HuangHaiConfigComponent,
-    ImageLabelAnxinComponent,
-    AnxinConfigComponent,
-    IframeComponent,
-    WorkerTagComponent,
-    ChangeOrComponent,
-    SimulateDataComponent,
-  ],
   imports: [
     CommonModule,
     SystemRoutingModule,
@@ -113,22 +71,9 @@ import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
     NzPageHeaderModule,
     NzTabsModule,
     NzPopconfirmModule,
-    NzRadioModule,
+    NzRadioModule
-    DragDropModule,
-    NzDatePickerModule,
-  ],
-  entryComponents: [
-    AddorComponent,
-    EditorComponent,
-    AddhostComponent,
-    EdithostComponent,
-    AddcameraComponent,
-    EditcameraComponent,
-    SendFileComponent,
-    ModelComponent,
-    FileComponent,
-    ScriptComponent,
-    DetailsComponent,
   ],
+  entryComponents: [AddorComponent, EditorComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, SendFileComponent, ModelComponent, FileComponent, ScriptComponent, DetailsComponent]
+
 })
-export class SystemManagementModule {}
+export class SystemManagementModule { }

src/assets/file/config_arm.yaml

@@ -1,148 +0,0 @@
-# The all in one config file.
-
-debug: false #when the debug is on, osd.
-video_record: 10 #time to record into the .ts video
-
-sources:
-  config: 'config/source.yaml'
-
-tracker:
-  config: 'config/dstest_tracker_config.txt'
-
-analytics:
-  config: 'config/config_nvdsanalytics.txt'
-
-## 通用模型 ##
-
-# 1：人物检测
-peoplenet:
-  enable: true
-  apply_on: -1
-  interval: 1
-  batch_size: 16
-  topk: 5
-  roi-top-offset: 0
-  roi-bottom-offset: 0
-  detected-min-w: 20 
-  detected-min-h: 200
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/peoplenet/weights/resnet34_peoplenet_int8.etlt_b16_gpu0_int8.engine'
-  threshold: 0.3
-
-# 2：车辆检测
-trafficcam:
-  enable: true
-  apply_on: 0
-  interval: 1
-  batch_size: 16
-  topk: 5
-  roi-top-offset: 0
-  roi-bottom-offset: 0
-  detected-min-w: 100 
-  detected-min-h: 100
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/trafficcam/weights/resnet18_trafficcamnet_pruned.etlt_b16_gpu0_int8.engine'
-
-# 3：人物倚靠行为
-actionnet:
-  enable: false
-  apply_on: 1
-  # roi:
-  #   - 'fuel_island-4':
-  #     - [200, 0, 450, 500]
-  #   - 'fuel_island-5':
-  #     - [930, 93, 940, 987]
-  #   - 'fuel_island-6':
-  #     - [1174, 151, 746, 929]
-  #   - 'fuel_island-7':
-  #     - [1450, 300, 460, 650]
-  interval: 1
-  batch_size: 32
-
-# 4：烟火检测
-fire_smoke_net:
-  enable: true
-  apply_on: -1
-  interval: 1
-  batch_size: 16
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/fire_smoke_net/weights/yolov4_cspdarknet_tiny_fp16.etlt_b16_gpu0_fp16.engine'
-  threshold: 0.95
-
-# 5：抽烟打电话检测
-smoking_calling_net:
-  enable: true
-  apply_on: -1
-  interval: 1
-  batch_size: 2
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/smoking_calling_net/weights/resnet50_smoking_calling_net_fp16.etlt_b2_gpu0_fp16.engine'
-
-## 油站专用模型 ##
-
-# 1：身份判别：工装、反光衣、便衣
-idnet:
-  enable: true
-  apply_on: -1
-  interval: 1
-  batch_size: 2
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/idnet/weights/resnet50_idnet_fp16.etlt_b2_gpu0_fp16.engine'
-
-# 2：卸油区物体识别：油罐车、灭火器、手推车、三角木、取样桶、隔离锥、卸油管
-oilnet:
-  enable: false
-  apply_on: 2
-  interval: 1
-  batch_size: 2 
-  roi-top-offset: 0
-  roi-bottom-offset: 0
-  detected-min-w: 20 
-  detected-min-h: 20
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/oilnet/weights/yolov4_cspdarknet_tiny_fp16.etlt_b2_gpu0_fp16.engine'
-  threshold: 0.5
-
-# 3：卸油管是否连接判定
-connet_oil:
-  enable: true
-  apply_on: 2
-  roi:
-    - 'oil_tube-0':
-      # - [719,509,136,206]   
-      - [719,509,436,286]   
-  interval: 1
-  batch_size: 2
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/connet_oil/weights/resnet50_connet_oil_fp16.etlt_b2_gpu0_fp16.engine'
-
-# 4：静电接地仪器是否连接判定
-connet_grounder:
-  enable: true
-  apply_on: 2
-  roi:
-    - 'grounder-0':
-      - [782,378,271,149]
-  interval: 1
-  batch_size: 2
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/connet_grounder/weights/resnet50_connet_grounder_fp16.etlt_b2_gpu0_fp16.engine'
-
-# 5：散装桶加油
-bulk_oil_net:
-  enable: False
-  apply_on: 2
-  interval: 1
-  batch_size: 2
-  model_engine_file: '/opt/nvidia/deepstream/deepstream-6.0/sources/project/models/bulk_oil_net/weights/yolov4_cspdarknet_tiny_fp16.etlt_b2_gpu0_fp16.engine'
-  threshold: 0.2
-
-# 模型阈值通用设定
-rule_threshold:
-  object_occurence_interval_second: 3
-  object_disappear_interval_second: 10
-  on_car_parking_interval_second: 1800
-  on_fire_smoke_interval_second: 5
-  on_helmet_interval_second: 5
-  threshold_relying_sitting: 0.4 #rolling mean confidence
-  threshold_smoking_calling: 0.3 #rolling mean confidence
-  threshold_connecting: 0.667 #rolling mean confidence
-  threshold_identity: 0.1 #only to filter out people net error
-  threshold_helmet: 0 #num of helmet detected on a person
-  enable_seconday_model: False      # secondary model (双模型)
-  threshold_secondary_model: 0.5    
-  secondary_model_window: 50
-  secondary_model_path: '/opt/app/xgboost'
-

src/index.html

@@ -1,6 +1,5 @@
 <!doctype html>
 <html lang="en">
-
 <head>
   <meta charset="utf-8">
   <title>边缘主机管理系统</title>
@@ -8,9 +7,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
-
 <body>
   <app-root></app-root>
 </body>
-
 </html>