diff --git a/digital-future-summit/src/app/implementation/layout/layout.component.html b/digital-future-summit/src/app/implementation/layout/layout.component.html
index 9387429..f6ade10 100644
--- a/digital-future-summit/src/app/implementation/layout/layout.component.html
+++ b/digital-future-summit/src/app/implementation/layout/layout.component.html
@@ -76,7 +76,7 @@
+ class="box box-assistant" (click)="jumpToSystem('data_assistantX')">
高管数智助理
@@ -98,7 +98,7 @@
+ class="box box-SSO_mes" (click)="jumpToSystem('SSO_mesX')">
智能生产控制
diff --git a/digital-future-summit/src/app/implementation/layout/layout.component.less b/digital-future-summit/src/app/implementation/layout/layout.component.less
index a6b171f..1fc1c83 100644
--- a/digital-future-summit/src/app/implementation/layout/layout.component.less
+++ b/digital-future-summit/src/app/implementation/layout/layout.component.less
@@ -44,9 +44,8 @@
.container .box {
position: absolute;
z-index: 1000;
- font-size: large;
+ font-size: 14px;
text-align: center;
- padding: 10px 10px;
cursor: pointer;
display: none;
// border: 1px solid #ddd;
@@ -54,6 +53,8 @@
/* 添加过渡效果 */
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
/* 添加阴影效果 */
+ border-radius: 10px;
+ /* 添加圆角边,可以指定具体的像素值 */
}
.container .box:hover {
diff --git a/digital-future-summit/src/app/implementation/layout/layout.component.ts b/digital-future-summit/src/app/implementation/layout/layout.component.ts
index 1998d55..539b3ac 100644
--- a/digital-future-summit/src/app/implementation/layout/layout.component.ts
+++ b/digital-future-summit/src/app/implementation/layout/layout.component.ts
@@ -10,11 +10,11 @@ import {
Renderer2,
} from "@angular/core";
import {
- DigiMiddlewareAuthApp,
- DigiMiddlewareAuthUser,
+ DigiMiddlewareAuthApp
} from "app/config/app-auth-token";
import { CommonService } from "../service/common.service";
-import { NzPopconfirmComponent } from 'ng-zorro-antd/popconfirm';
+import { NzMessageService } from "ng-zorro-antd/message";
+
@Component({
selector: "app-layout",
@@ -27,6 +27,8 @@ export class LayoutComponent implements OnInit, AfterViewInit {
queryDisplayList = [];
USER_ID = "";
+ USER_TOKEN = "";
+
dragEnable: boolean = false;
isDragging: boolean = false;
@@ -64,7 +66,8 @@ export class LayoutComponent implements OnInit, AfterViewInit {
constructor(
private commonService: CommonService,
private el: ElementRef,
- private renderer: Renderer2
+ private renderer: Renderer2,
+ private message: NzMessageService
) { }
ngOnInit(): void {
this.systemMaps = systemList;
@@ -80,7 +83,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
*/
initSystemBySemcSSO() {
const DwUserInfo = JSON.parse(sessionStorage.getItem("DwUserInfo"));
-
+ this.USER_TOKEN = DwUserInfo.token;
this.USER_ID = DwUserInfo.userId;
this.dragEnable =
this.USER_ID === "dongsk@digiwin.com" || this.USER_ID === "M00020";
@@ -89,7 +92,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
const headers = {
"Digi-Middleware-Auth-App": DigiMiddlewareAuthApp,
- "Digi-Middleware-Auth-User": DigiMiddlewareAuthUser,
+ "Digi-Middleware-Auth-User": this.USER_TOKEN,
};
const url =
this.commonService.semcUrl + "/tenant/semc/applink/queryDisplayList";
@@ -142,7 +145,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
},
{
"Digi-Middleware-Auth-App": DigiMiddlewareAuthApp,
- "Digi-Middleware-Auth-User": DigiMiddlewareAuthUser,
+ "Digi-Middleware-Auth-User": this.USER_TOKEN,
}
)
.then((res) => {
@@ -179,6 +182,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
}
if (this.systemMaps[key] == null) {
+ this.message.error(`${key} 未集成`);
return;
}
@@ -192,7 +196,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
const headers = {
"Digi-Middleware-Auth-App": DigiMiddlewareAuthApp,
- "Digi-Middleware-Auth-User": DigiMiddlewareAuthUser,
+ "Digi-Middleware-Auth-User": this.USER_TOKEN,
};
// 单点登录
@@ -352,7 +356,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
this.divContent,
{
"Digi-Middleware-Auth-App": DigiMiddlewareAuthApp,
- "Digi-Middleware-Auth-User": DigiMiddlewareAuthUser,
+ "Digi-Middleware-Auth-User": this.USER_TOKEN
}
)
.then((res) => {