[修改]修改流程

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

@@ -52,7 +52,7 @@ export class BaseInterceptor implements HttpInterceptor {
   private handleError(error: HttpErrorResponse) {
     console.log('http错误', error)
     // 用户认证失败返回登录页
-    if (error.status === 401 || error.status === 614) {
+    if (error.status === 401) {
       this.token.delete()
       sessionStorage.clear()
       localStorage.removeItem("isautologin")
@@ -73,11 +73,12 @@ export class BaseInterceptor implements HttpInterceptor {
       // 服务端返回http状态码
       // 服务端返回错误信息
       console.error(
-        `Backend returned code ${error.status}, ` +
+        `状态码${error.status}, ` +
-        `body was: ${error.error}`);
+        `错误内容:${error.error}`);
     }
     // 返回带有面向用户的错误信息
-    return throwError(
+    return throwError(() => {
-      error);
+      new Error('error')
+    });
   };
 }

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

@@ -99,8 +99,9 @@ export class LoginComponent implements OnInit {
     this.http.post('/api/Accounts/SignIn', {
       username: this.validateForm.value.userName,
       password: this.validateForm.value.password
-    }).subscribe(
+    }).subscribe({
-      (data: any) => {
+      next: (data: any) => {
+        // this.isLoading = false;
         console.log('登录信息', data)
         this.rememberInfo()
         this.autoLogin()
@@ -111,7 +112,12 @@ export class LoginComponent implements OnInit {
 
         //调用服务中的function刷新token
         this.token.startUp()
+      },
+      error: (err) => {
+        this.isLoading = false;
       }
+    }
+
     )
   }
 

src/app/service/cache-token.service.ts

@@ -20,10 +20,12 @@ export class CacheTokenService {
         token: token,
         refreshToken: refreshToken
       }).subscribe((data: any) => {
+        console.log('定时刷新token成功')
         sessionStorage.setItem("token", data.token);
         sessionStorage.setItem("refreshToken", data.refreshToken);
       })
     }, 18 * 60 * 1000)
+    console.log('启动定时刷新token')
   }
 
 

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

@@ -37,13 +37,13 @@
   <div class="hostListbox">
     <div class="topbox">
       <div class="lefttop">
-        <span>{{selectedOilStation ? selectedOilStation.displayName : '加油站'}} 分析主机列表
+        <span>{{selectedOilStation ? selectedOilStation.displayName : '加油站'}} 边缘盒子列表
           <span class="yellowspan">（请从左侧选择加油站）</span>
         </span>
       </div>
       <div class="righttop" *ngIf="selectedOilStation">
         <button nz-button nzType="primary" (click)="addHost()"><i nz-icon nzType="plus-circle"
-            nzTheme="outline"></i>新增分析主机</button>
+            nzTheme="outline"></i>新增边缘盒子</button>
       </div>
     </div>
     <div class="tablebox">
@@ -51,16 +51,18 @@
         <thead>
           <tr>
             <th>ip</th>
+            <th>配置状态</th>
             <th>操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of basicTable.data">
             <td>{{data.hostIPAddress}}</td>
+            <td>!配置状态!</td>
             <td class="operation">
               <a (click)="edit(data)" style="margin-right: 12px;">编辑</a>
               <a (click)="config(data)" style="margin-right: 12px;">配置</a>
-              <a (click)="delete(data)">删除</a>
+              <a class="red" (click)="delete(data)">删除</a>
             </td>
           </tr>
         </tbody>

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

@@ -95,3 +95,6 @@
   margin-top: 16px;
 }
 
+.red:hover{
+  color: red;
+}

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

@@ -85,7 +85,7 @@ export class AnalysisOfTheHostComponent implements OnInit {
 
   }
 
-  //新增分析主机
+  //新增边缘盒子
   addHost() {
     console.log(this.selectedOilStation)
     const modal = this.modal.create({

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

@@ -14,6 +14,7 @@
             <th>密码</th>
             <th>地址</th>
             <th>类型</th>
+            <th>标注情况</th>
             <th>操作</th>
           </tr>
         </thead>
@@ -24,15 +25,17 @@
             <td>{{ item.password }}</td>
             <td>{{ item.uri }}</td>
             <td>{{ item.type | cameraType}}</td>
+            <td>标注情况</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="red" (click)="deleteCamera(item)">删除</span>
             </td>
           </tr>
         </tbody>
       </nz-table>
       <div class="footer">
-        <button nz-button nzType="primary" (click)="connect()">连接</button>
+        <button nz-button nzType="primary" (click)="connect()">下发摄像头配置</button>
       </div>
     </div>
   </div>

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

@@ -132,6 +132,11 @@ export class HostConfigComponent implements OnInit {
     });
   }
 
+  label(item){
+    this.router.navigate(['/system/host/camera/imageLabel'])
+  }
+
+
   connect() {
     let ids = []
     this.listOfData.forEach((item: any) => {
@@ -142,10 +147,12 @@ export class HostConfigComponent implements OnInit {
     }).subscribe({
       next: (data) => {
         console.log('连接状态', data)
+        this.router.navigate(['/system/host/camera/imageList'])
       },
       error: (err) => {
         console.log('连接失败', err)
       },
+
       // complete: () => console.log('complete!'), // not called
     })
 

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

@@ -0,0 +1,13 @@
+<div class="box">
+  <nz-page-header class="site-page-header" (nzBack)="goback()" nzBackIcon nzSubtitle="返回上一页"></nz-page-header>
+  <div class="btnbox">
+    <button nz-button nzType="primary">获取标注底图/更新摄像头图片</button>
+    <button nz-button nzType="primary">标注监控区域</button>
+    <button nz-button nzType="primary" nzDanger>标注禁止区域</button>
+    <button nz-button nzType="primary">保存</button>
+    <button nz-button nzType="primary">完成</button>
+  </div>
+  <div class="imgbox">
+    <img src="../../../assets/images/test/dog.jpg" alt="">
+  </div>
+</div>

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

@@ -0,0 +1,18 @@
+.box {
+  width: 100%;
+  height: 100%;
+  background: #fff;
+  font-size: 15px;
+  color: black;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  overflow-y: auto;
+}
+.btnbox{
+  display: flex;
+  margin-bottom: 8px;
+  button{
+    margin-right: 6px;
+  }
+}

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

@@ -0,0 +1,17 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-image-label2',
+  templateUrl: './image-label2.component.html',
+  styleUrls: ['./image-label2.component.scss']
+})
+export class ImageLabel2Component implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+  goback() {
+    history.go(-1)
+  }
+}

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

@@ -14,7 +14,8 @@
     <div class="nav">
       <ul>
         <li [routerLink]="['/system/organization']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/organization.png" alt="">组织机构管理</li>
-        <li [routerLink]="['/system/host']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/host.png" alt="">分析主机管理</li>
+        <li [routerLink]="['/system/host']"  routerLinkActive="router-link-active"><img src="../../../assets/images/icon/host.png" alt="">边缘盒子管理</li>
+        <li><img src="../../../assets/images/icon/push.png" alt="">边缘盒子监控</li>
       </ul>
     </div>
   </nz-sider>

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

@@ -5,6 +5,7 @@ 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';
 
 
 const routes: Routes = [
@@ -12,6 +13,7 @@ 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: 'plottingImage', component: PlottingImageComponent },
 ];
 

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

@@ -32,9 +32,10 @@ import { PlottingImageComponent } from './plotting-image/plotting-image.componen
 import { cameraType } from '../pipe/cameraTypePipe';
 import { ImageListComponent } from './image-list/image-list.component';
 import { ImageLabelComponent } from './image-label/image-label.component';
+import { ImageLabel2Component } from './image-label2/image-label2.component';
 
 @NgModule({
-  declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, ImageListComponent, ImageLabelComponent, PlottingImageComponent, cameraType],
+  declarations: [OrganizationComponent, NavigationComponent, AddorComponent, EditorComponent, AnalysisOfTheHostComponent, AddhostComponent, EdithostComponent, AddcameraComponent, EditcameraComponent, HostConfigComponent, ImageListComponent, ImageLabelComponent, PlottingImageComponent, cameraType, ImageLabel2Component],
   imports: [
     CommonModule,
     SystemRoutingModule,