diff --git a/digital-future-summit/src/app/implementation/implementation.module.ts b/digital-future-summit/src/app/implementation/implementation.module.ts
index 8d4a4c9..6219d89 100644
--- a/digital-future-summit/src/app/implementation/implementation.module.ts
+++ b/digital-future-summit/src/app/implementation/implementation.module.ts
@@ -26,7 +26,8 @@ import { DW_ORGTREE_MODAL_DEFAULT } from "@webdpt/framework/organize-tree-core";
import { LayoutComponent } from "./layout/layout.component";
// import { themeConfig } from '../config/theme.config';
import { DwMainLayoutModule } from "@webdpt/components/layout";
-import { NzPopconfirmComponent, NzPopconfirmModule } from "ng-zorro-antd/popconfirm";
+import { NzPopconfirmModule } from "ng-zorro-antd/popconfirm";
+import { NzModalModule } from "ng-zorro-antd/modal";
@NgModule({
imports: [
@@ -34,7 +35,8 @@ import { NzPopconfirmComponent, NzPopconfirmModule } from "ng-zorro-antd/popconf
ImplementationRoutingModule,
SharedModule, // 共享模組
DwMainLayoutModule,
- NzPopconfirmModule
+ NzPopconfirmModule,
+ NzModalModule
],
declarations: [LayoutComponent],
providers: [],
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..bb27ac9 100644
--- a/digital-future-summit/src/app/implementation/layout/layout.component.html
+++ b/digital-future-summit/src/app/implementation/layout/layout.component.html
@@ -98,7 +98,7 @@
+ class="box box-SSO_mes" (click)="jumpToSystem('SSO_mesX')">
智能生产控制
@@ -114,8 +114,9 @@
-->
+ nz-popconfirm nzPopconfirmTitle="请您选择系统 E10 OR T100 ?" (nzOnConfirm)="jumpToSystem('T100')"
+ (nzOnCancel)="jumpToSystem('SSO_E10229')" nzPopconfirmPlacement="top" nzOkText="T00 ERP" nzCancelText="E10 ERP"
+ nzIcon="appstore">
精益数字化管理
@@ -123,6 +124,20 @@
(click)="jumpToSystem('SSO_PLM')">
高效设计研发
+
+
+ 资料下载
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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..8521ce2 100644
--- a/digital-future-summit/src/app/implementation/layout/layout.component.less
+++ b/digital-future-summit/src/app/implementation/layout/layout.component.less
@@ -1,7 +1,7 @@
.layout-body {
margin: 0;
padding: 0;
- background: url("../../../assets/img/1122.png") center center no-repeat;
+ background: url("../../../assets/summit/main.png") center center no-repeat;
/* 设置背景图 */
background-size: 100% 100%;
/* 背景图等比例缩小填充整个容器 */
@@ -44,21 +44,27 @@
.container .box {
position: absolute;
z-index: 1000;
- font-size: large;
+ font-size: 14px;
text-align: center;
- padding: 10px 10px;
cursor: pointer;
display: none;
+ // background-color: aqua;
// border: 1px solid #ddd;
- transition: transform 0.3s ease;
+ // transition: transform 0.3s ease;
/* 添加过渡效果 */
- box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
+ // box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
/* 添加阴影效果 */
+ // border-radius: 10px;
+ /* 添加圆角边,可以指定具体的像素值 */
}
-.container .box:hover {
- transform: scale(1.1);
- /* 鼠标放上去时放大 1.1 倍 */
+// .container .box:hover {
+// transform: scale(1.1);
+// /* 鼠标放上去时放大 1.1 倍 */
+// }
+
+.container .box>span {
+ display: none;
}
.container .box-ET {
@@ -134,40 +140,41 @@
top: 550px;
left: 20px;
width: 150px;
- color: darkmagenta;
}
.container .box-assistant {
top: 20px;
right: 0px;
width: 150px;
- color: brown;
}
.container .box-BSC {
top: 70px;
right: 0px;
width: 150px;
- color: brown;
}
.container .box-SSO_mes {
top: 120px;
right: 0px;
width: 150px;
- color: brown;
}
.container .box-SCS {
top: 170px;
right: 0px;
width: 150px;
- color: brown;
}
.container .box-AASK {
top: 220px;
right: 0px;
width: 150px;
- color: brown;
-}
\ No newline at end of file
+}
+
+.container .box-download {
+ top: 270px;
+ right: 0px;
+ width: 150px;
+}
+
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..c82c0a2 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,13 @@ 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";
+import { tr } from "date-fns/locale";
+import { NzModalService } from "ng-zorro-antd/modal";
+
@Component({
selector: "app-layout",
@@ -27,10 +29,14 @@ export class LayoutComponent implements OnInit, AfterViewInit {
queryDisplayList = [];
USER_ID = "";
+ USER_TOKEN = "";
+
dragEnable: boolean = false;
isDragging: boolean = false;
+ isDownloadVisible: boolean = false;
+
layoutUsers = [
"digiwin0001",
"digiwin0002",
@@ -64,7 +70,9 @@ export class LayoutComponent implements OnInit, AfterViewInit {
constructor(
private commonService: CommonService,
private el: ElementRef,
- private renderer: Renderer2
+ private renderer: Renderer2,
+ private message: NzMessageService,
+ private modalService: NzModalService
) { }
ngOnInit(): void {
this.systemMaps = systemList;
@@ -80,44 +88,45 @@ 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";
+ this.dragEnable = this.USER_ID === "dongsk@digiwin.com" || this.USER_ID === "M00020";
console.log(this.dragEnable);
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";
this.commonService
.getRequestWithHeaders(url, headers)
.then((res) => {
- this.queryDisplayList = res.response;
- this.queryDisplayList.forEach((item) => {
- this.systemMaps["SSO_" + item.id] = {
- key: item.id,
- id: item.id,
- title: item.name,
- mockLogin: false,
- ssoLogin: true,
- callBackUrl: item.callBackUrl,
- url: item.cloudwebsite,
- applicationAppId: item.applicationAppId,
- };
-
- // 非管理员加载
- this.divContent.userId = this.USER_ID;
- if (
- this.USER_ID === "dongsk@digiwin.com" ||
- this.USER_ID === "M00020"
- ) {
- this.divContent.userId = "default";
- }
- });
+ if (res && res.response) {
+ this.queryDisplayList = res.response;
+ this.queryDisplayList.forEach((item) => {
+ this.systemMaps["SSO_" + item.id] = {
+ key: item.id,
+ id: item.id,
+ title: item.name,
+ mockLogin: false,
+ ssoLogin: true,
+ callBackUrl: item.callBackUrl,
+ url: item.cloudwebsite,
+ applicationAppId: item.applicationAppId,
+ };
+
+ // 非管理员加载
+ this.divContent.userId = this.USER_ID;
+ if (
+ this.USER_ID === "dongsk@digiwin.com" ||
+ this.USER_ID === "M00020"
+ ) {
+ this.divContent.userId = "default";
+ }
+ });
+ }
// 初始化布局
this.initSysLayout();
@@ -142,7 +151,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) => {
@@ -159,7 +168,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
this.renderer.setStyle(sysEL, "left", item.leftPercent);
this.renderer.setStyle(sysEL, "width", item.widthPercent);
this.renderer.setStyle(sysEL, "height", item.heightPercent);
- this.renderer.setStyle(sysEL, "background-color", 'wheat');
+ // this.renderer.setStyle(sysEL, "background-color", 'wheat');
this.renderer.setStyle(sysEL, "display", 'block');
}
@@ -178,7 +187,13 @@ export class LayoutComponent implements OnInit, AfterViewInit {
return;
}
+ if (key === 'download') {
+ this.isDownloadVisible = true;
+ return;
+ }
+
if (this.systemMaps[key] == null) {
+ this.message.error(`${key} 未集成`);
return;
}
@@ -192,7 +207,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 +367,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) => {
@@ -362,4 +377,8 @@ export class LayoutComponent implements OnInit, AfterViewInit {
}
});
}
+
+ handleModelCancel() {
+ this.isDownloadVisible = false;
+ }
}
diff --git a/digital-future-summit/src/app/implementation/layout/system.ts b/digital-future-summit/src/app/implementation/layout/system.ts
index 9449e73..7b0b47b 100644
--- a/digital-future-summit/src/app/implementation/layout/system.ts
+++ b/digital-future-summit/src/app/implementation/layout/system.ts
@@ -34,6 +34,16 @@ export const systemList = {
mockLogin: false,
ssoLogin: false,
},
+ data_assistant: {
+ key: "data_assistant",
+ title: "高管数智助理",
+ sid: 826480202099712,
+ id: "agiledemohw",
+ name: "高管AI数智助理体验",
+ url: "https://athena.digiwincloud.com.cn",
+ mockLogin: false,
+ ssoLogin: false,
+ },
AASK: {
key: "AASK",
title: "智驱工作台",
diff --git a/digital-future-summit/src/assets/summit/AASK.png b/digital-future-summit/src/assets/summit/AASK.png
new file mode 100644
index 0000000..562e3e8
Binary files /dev/null and b/digital-future-summit/src/assets/summit/AASK.png differ
diff --git a/digital-future-summit/src/assets/summit/AIOT.png b/digital-future-summit/src/assets/summit/AIOT.png
new file mode 100644
index 0000000..539a6de
Binary files /dev/null and b/digital-future-summit/src/assets/summit/AIOT.png differ
diff --git a/digital-future-summit/src/assets/summit/BSC.png b/digital-future-summit/src/assets/summit/BSC.png
new file mode 100644
index 0000000..ddc31d3
Binary files /dev/null and b/digital-future-summit/src/assets/summit/BSC.png differ
diff --git a/digital-future-summit/src/assets/summit/DMP.png b/digital-future-summit/src/assets/summit/DMP.png
new file mode 100644
index 0000000..e5fbde3
Binary files /dev/null and b/digital-future-summit/src/assets/summit/DMP.png differ
diff --git a/digital-future-summit/src/assets/summit/E10-T100.png b/digital-future-summit/src/assets/summit/E10-T100.png
new file mode 100644
index 0000000..719d5b4
Binary files /dev/null and b/digital-future-summit/src/assets/summit/E10-T100.png differ
diff --git a/digital-future-summit/src/assets/summit/EIP.png b/digital-future-summit/src/assets/summit/EIP.png
new file mode 100644
index 0000000..f29f6cd
Binary files /dev/null and b/digital-future-summit/src/assets/summit/EIP.png differ
diff --git a/digital-future-summit/src/assets/summit/KMO.png b/digital-future-summit/src/assets/summit/KMO.png
new file mode 100644
index 0000000..46e3a45
Binary files /dev/null and b/digital-future-summit/src/assets/summit/KMO.png differ
diff --git a/digital-future-summit/src/assets/summit/SCS.png b/digital-future-summit/src/assets/summit/SCS.png
new file mode 100644
index 0000000..37c1850
Binary files /dev/null and b/digital-future-summit/src/assets/summit/SCS.png differ
diff --git a/digital-future-summit/src/assets/summit/SSO_PLM.png b/digital-future-summit/src/assets/summit/SSO_PLM.png
new file mode 100644
index 0000000..04770f7
Binary files /dev/null and b/digital-future-summit/src/assets/summit/SSO_PLM.png differ
diff --git a/digital-future-summit/src/assets/summit/SSO_mes.png b/digital-future-summit/src/assets/summit/SSO_mes.png
new file mode 100644
index 0000000..7546c07
Binary files /dev/null and b/digital-future-summit/src/assets/summit/SSO_mes.png differ
diff --git a/digital-future-summit/src/assets/summit/chatFile.png b/digital-future-summit/src/assets/summit/chatFile.png
new file mode 100644
index 0000000..d3444ec
Binary files /dev/null and b/digital-future-summit/src/assets/summit/chatFile.png differ
diff --git a/digital-future-summit/src/assets/summit/data_assistant.png b/digital-future-summit/src/assets/summit/data_assistant.png
new file mode 100644
index 0000000..0784734
Binary files /dev/null and b/digital-future-summit/src/assets/summit/data_assistant.png differ
diff --git a/digital-future-summit/src/assets/summit/dowload-code.png b/digital-future-summit/src/assets/summit/dowload-code.png
new file mode 100644
index 0000000..1553d2e
Binary files /dev/null and b/digital-future-summit/src/assets/summit/dowload-code.png differ
diff --git a/digital-future-summit/src/assets/summit/download.png b/digital-future-summit/src/assets/summit/download.png
new file mode 100644
index 0000000..9d3b195
Binary files /dev/null and b/digital-future-summit/src/assets/summit/download.png differ
diff --git a/digital-future-summit/src/assets/summit/equipmentCloud.png b/digital-future-summit/src/assets/summit/equipmentCloud.png
new file mode 100644
index 0000000..d3bc732
Binary files /dev/null and b/digital-future-summit/src/assets/summit/equipmentCloud.png differ
diff --git a/digital-future-summit/src/assets/summit/iPaaS.png b/digital-future-summit/src/assets/summit/iPaaS.png
new file mode 100644
index 0000000..d8a6e28
Binary files /dev/null and b/digital-future-summit/src/assets/summit/iPaaS.png differ
diff --git a/digital-future-summit/src/assets/summit/main-bg.png b/digital-future-summit/src/assets/summit/main-bg.png
new file mode 100644
index 0000000..af7973d
Binary files /dev/null and b/digital-future-summit/src/assets/summit/main-bg.png differ
diff --git a/digital-future-summit/src/assets/summit/main.png b/digital-future-summit/src/assets/summit/main.png
new file mode 100644
index 0000000..af704f1
Binary files /dev/null and b/digital-future-summit/src/assets/summit/main.png differ
diff --git a/digital-future-summit/src/assets/summit/partsCloud.png b/digital-future-summit/src/assets/summit/partsCloud.png
new file mode 100644
index 0000000..69f37fb
Binary files /dev/null and b/digital-future-summit/src/assets/summit/partsCloud.png differ