Merge branch 'feature-demo'

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: [],

digital-future-summit/src/app/implementation/layout/layout.component.html

@@ -98,7 +98,7 @@
 
 
     <div id="SSO_mes" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
-      class="box box-SSO_mes" (click)="jumpToSystem('SSO_mes')">
+      class="box box-SSO_mes" (click)="jumpToSystem('SSO_mesX')">
       <span>智能生产控制</span>
     </div>
 
@@ -114,8 +114,9 @@
     </div> -->
 
     <div id="E10-T100" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)" class="box box-ET"
-      nz-popconfirm nzPopconfirmTitle="请您选择系统E10 OR T100 ?" (nzOnConfirm)="jumpToSystem('T100')"
-      (nzOnCancel)="jumpToSystem('SSO_E10229')" nzPopconfirmPlacement="bottom" nzOkText="T00 ERP" nzCancelText="E10 ERP" nzIcon="appstore">
+      nz-popconfirm nzPopconfirmTitle="请您选择系统 E10 OR T100 ?" (nzOnConfirm)="jumpToSystem('T100')"
+      (nzOnCancel)="jumpToSystem('SSO_E10229')" nzPopconfirmPlacement="top" nzOkText="T00 ERP" nzCancelText="E10 ERP"
+      nzIcon="appstore">
       <span>精益数字化管理</span>
     </div>
 
@@ -123,6 +124,20 @@
       (click)="jumpToSystem('SSO_PLM')">
       <span>高效设计研发</span>
     </div>
+
+    <div id="download" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
+      class="box box-download" (click)="jumpToSystem('download')">
+      <span>资料下载</span>
+    </div>
+
+    <nz-modal [(nzVisible)]="isDownloadVisible" nzTitle="扫描二维码下载资料"   (nzOnCancel)="handleModelCancel()"
+    nzCentered="true" nzMask="true" nzMaskClosable="true" nzCancelText="关闭" nzOkDisabled="true" nzFooter="感谢您的关注">
+      <ng-container *nzModalContent>
+        <div style="text-align: center; width: 100%;">
+        <img src="../../../assets/summit/dowload-code.png"  />
+      </div>
+      </ng-container>
+    </nz-modal>
   </div>
 
 </div>

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;
-}
+}
+
+.container .box-download {
+  top: 270px;
+  right: 0px;
+  width: 150px;
+}
+

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;
+  }
 }

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: "智驱工作台",