增加退出接口

proxy.config.json

 {
   "/asset/*": {
-    "target": "http://localhost:8081",
+    "target": "http://192.168.19.171:8082",
     "secure": false,
     "logLevel": "debug",
     "changeOrigin": true

src/app/layout/default/user/user.component.ts

-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, Inject } from "@angular/core";
 import { Router } from "@angular/router";
+import { APIService } from "src/app/service/layout/service/api.service";
+import { SocialService, ITokenService, DA_SERVICE_TOKEN } from "@delon/auth";
 @Component({
   selector: "app-user",
   templateUrl: "./user.component.html",
@@ -9,13 +11,22 @@ export class UserComponent implements OnInit {
   data = [];
   currentArr = []; // 收起
   remainArr = []; //更多
-  constructor(private router: Router) {}
+  constructor(
+    private router: Router,
+    @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService,
+    private apiSrv: APIService
+  ) {}
 
   ngOnInit() {}
   jumpPassword() {
     this.router.navigateByUrl("/admin/user/password");
   }
   logout() {
-    this.router.navigateByUrl("/passport/login");
+    this.apiSrv.logout().subscribe((r: any) => {
+      if (r.success == "1") {
+        this.tokenService.clear();
+        this.router.navigateByUrl("/passport/login");
+      }
+    });
   }
 }

src/app/layout/passport/login/login.component.html

@@ -10,6 +10,7 @@
       <a Button [type]="'primary'" [size]="'large'" (onClick)="submit()">
         登录
       </a>
+
     </ListItem>
   </List>
-</form>
+</form>
\ No newline at end of file

src/app/layout/passport/login/login.component.ts

@@ -6,6 +6,7 @@ import { HttpClient } from "@angular/common/http";
 import { catchError } from "rxjs/operators";
 import { of } from "rxjs";
 import { StartupService } from "../../service/startup.service";
+import { APIService } from "src/app/service/layout/service/api.service";
 
 @Component({
   selector: "passport-login",
@@ -23,7 +24,8 @@ export class UserLoginComponent {
     private socialService: SocialService,
     @Inject(DA_SERVICE_TOKEN) private tokenService: ITokenService,
     private startupSrv: StartupService,
-    private http: HttpClient
+    private http: HttpClient,
+    private apiSrv: APIService
   ) {
     this.form = fb.group({
       userName: [null, [Validators.required, Validators.minLength(4)]],
@@ -44,7 +46,6 @@ export class UserLoginComponent {
   // #endregion
 
   submit() {
-    document.cookie = "";
     this.error = "";
     console.log(this.form.value);
     // 默认配置中对所有HTTP请求都会强制 [校验](https://ng-alain.com/auth/getting-started) 用户 Token
@@ -79,7 +80,7 @@ export class UserLoginComponent {
           this.startupSrv.load().then(() => {
             let url = this.tokenService.referrer!.url || "/";
             if (url.includes("/passport")) url = "/";
-            this.router.navigateByUrl(url);
+            this.router.navigateByUrl("/admin");
           });
         },
         error => {

src/app/routes/assets/assets-used/checkPlan/check-result/check-result.component.html

 <div class="result-example">
-  <Result [img]="img1" [message]="message1" [title]="'已完成'">
+  <Result [img]="img1" [message]="message1" [title]=" isSuccess?'成功':'失败'" [buttonText]="'继续盘点'" [buttonType]="'primary'"
+    (onButtonClick)="onclick()">
     <ng-template #img1>
-      <Icon class="spe" [type]="'check-circle'" [color]="'#1F90E6'"></Icon>
+      <Icon class="spe" [type]="isSuccess?'check-circle':'cross-circle-o'" [color]=" isSuccess?'#1F90E6':'#F13642'">
+      </Icon>
     </ng-template>
     <ng-template #message1>
-      <div></div>
+      <div>{{msg}}</div>
     </ng-template>
   </Result>
 </div>
\ No newline at end of file

src/app/routes/assets/assets-used/checkPlan/check-result/check-result.component.scss

@@ -8,3 +8,8 @@
   height: 60px;
   display: block;
 }
+
+:host /deep/ .am-result .am-result-title {
+  font-size: 21px !important;
+  color: #000 !important;
+}
\ No newline at end of file

src/app/routes/assets/assets-used/checkPlan/check-result/check-result.component.ts

-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
 
 @Component({
-  selector: 'app-check-result',
-  templateUrl: './check-result.component.html',
-  styleUrls: ['./check-result.component.scss'],
+  selector: "app-check-result",
+  templateUrl: "./check-result.component.html",
+  styleUrls: ["./check-result.component.scss"]
 })
 export class CheckResultComponent implements OnInit {
+  isSuccess: boolean;
+  msg = "";
+  constructor(private activeRoute: ActivatedRoute, private router: Router) {}
 
-  constructor() { }
-
-  ngOnInit() {}
-
+  ngOnInit() {
+    this.isSuccess = this.activeRoute.snapshot.queryParams["isSuccess"];
+    this.msg = this.activeRoute.snapshot.queryParams["msg"];
+  }
+  onclick() {
+    this.router.navigateByUrl("/admin");
+  }
 }

src/app/routes/check/qrScan/qrScan/qr-scan.component.ts

@@ -32,7 +32,7 @@ export class QrScanComponent implements OnInit, OnDestroy {
   }
   loadingToast(id) {
     const toast = Toast.loading("Loading...", 1000, () => {
-      this.router.navigate(["/admin/assets-used/checkPlanAdd", id]);
+      this.router.navigate(["/admin/assets-used/checkPlanAdd", id, ""]);
     });
   }
   ngOnDestroy() {

src/app/service/layout/service/api.service.ts

@@ -64,6 +64,8 @@ const CheckSave = "asset/a/asset/checkPlan/save/result";
 const Upload = "asset/a/sys/file/webupload/upload";
 const assetsUrl = "asset/a/asset/checkPlan/infoData";
 
+const logoutUrl = "asset/a/logout";
+
 @Injectable({
   providedIn: "root"
 })
@@ -270,4 +272,8 @@ export class APIService {
   getAssets(param, id) {
     return this.basePost(assetsUrl + "/?id=" + id, param);
   }
+
+  logout() {
+    return this.http.get(logoutUrl + "?__ajax=true");
+  }
 }