Merge branch 'feature-demo'

digital-future-summit/src/app/implementation/implementation.module.ts

@@ -26,6 +26,7 @@ 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";
 
 @NgModule({
   imports: [
@@ -33,6 +34,7 @@ import { DwMainLayoutModule } from "@webdpt/components/layout";
     ImplementationRoutingModule,
     SharedModule, // 共享模組
     DwMainLayoutModule,
+    NzPopconfirmModule
   ],
   declarations: [LayoutComponent],
   providers: [],

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

@@ -32,7 +32,7 @@
     </table>
   </div>
 
-  <div class="container" [class.hidden]="!showElement">
+  <div class="container">
     <!-- <img class="img" src="../../../assets/img/1122.png" /> -->
 
     <div id="equipmentCloud" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
@@ -75,24 +75,6 @@
       <span>智能工作台</span>
     </div>
 
-
-    <div id="T100" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)" class="box box-T100bs"
-      (click)="jumpToSystem('T100')">
-      <span>T100</span>
-    </div>
-
-    <div id="SSO_E10229" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
-      class="box box-E10229" (click)="jumpToSystem('SSO_E10229')">
-      <span>E10</span>
-    </div>
-
-
-    <div id="SSO_PLM" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)" class="box box-PLM"
-      (click)="jumpToSystem('SSO_PLM')">
-      <span>高效设计研发</span>
-    </div>
-
-
     <div id="data_assistant" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
       class="box box-assistant" (click)="jumpToSystem('data_assistant')">
       <span>高管数智助理</span>
@@ -103,10 +85,6 @@
       <span>业务中台</span>
     </div>
 
-    <div id="SSO_mes" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
-      class="box box-SSO_mes" (click)="jumpToSystem('SSO_mes')">
-      <span>智能生产控制</span>
-    </div>
 
     <div id="SCS" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)" class="box box-SCS"
       (click)="jumpToSystem('SCS')">
@@ -117,6 +95,34 @@
       (click)="jumpToSystem('AASK')">
       <span>智驱中台</span>
     </div>
+
+
+    <div id="SSO_mes" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
+      class="box box-SSO_mes" (click)="jumpToSystem('SSO_mes')">
+      <span>智能生产控制</span>
+    </div>
+
+    <!-- <div id="SSO_E10229" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
+      class="box box-E10229" (click)="jumpToSystem('SSO_E10229')">
+      <span>E10</span>
+    </div> -->
+
+
+    <!-- <div id="T100" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)" class="box box-T100bs"
+      (click)="jumpToSystem('T100')">
+      <span>T100</span>
+    </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">
+      <span>精益数字化管理</span>
+    </div>
+
+    <div id="SSO_PLM" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)" class="box box-PLM"
+      (click)="jumpToSystem('SSO_PLM')">
+      <span>高效设计研发</span>
+    </div>
   </div>
 
 </div>

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

@@ -48,19 +48,36 @@
   text-align: center;
   padding: 10px 10px;
   cursor: pointer;
-  border: 1px solid #ddd;
+  display: none;
+  // border: 1px solid #ddd;
+  transition: transform 0.3s ease;
+  /* 添加过渡效果 */
+  box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
+  /* 添加阴影效果 */
+}
+
+.container .box:hover {
+  transform: scale(1.1);
+  /* 鼠标放上去时放大 1.1 倍 */
+}
+
+.container .box-ET {
+  top: 20px;
+  left: 20px;
+  width: 320px;
+  height: 100px;
 }
 
 .container .box-equipmentCloud {
-  top: 10%;
-  left: 2%;
+  top: 70px;
+  left: 20px;
   width: 320px;
   height: 100px;
 }
 
 .container .box-partsCloud {
-  top: 10%;
-  right: 2%;
+  top: 120px;
+  left: 20px;
   width: 350px;
   height: 100px;
 }
@@ -69,56 +86,48 @@
   top: 170px;
   left: 20px;
   width: 150px;
-  background-color: wheat;
 }
 
 .container .box-chatFile {
   top: 220px;
   left: 20px;
   width: 150px;
-  background-color: wheat;
 }
 
 .container .box-AIOT {
   top: 120px;
   left: 20px;
   width: 150px;
-  background-color: wheat;
 }
 
 .container .box-DMP {
   top: 300px;
   left: 20px;
   width: 150px;
-  background-color: wheat;
 }
 
 .container .box-iPaaS {
   top: 350px;
   left: 20px;
   width: 150px;
-  background-color: wheat;
 }
 
 .container .box-EIP {
   top: 400px;
   left: 20px;
   width: 150px;
-  background-color: wheat;
 }
 
 .container .box-T100bs {
   top: 450px;
   left: 20px;
   width: 150px;
-  background-color: wheat;
 }
 
 .container .box-E10229 {
   top: 500px;
   left: 20px;
   width: 150px;
-  background-color: wheat;
 }
 
 .container .box-PLM {
@@ -126,7 +135,6 @@
   left: 20px;
   width: 150px;
   color: darkmagenta;
-  background-color: wheat;
 }
 
 .container .box-assistant {
@@ -134,7 +142,6 @@
   right: 0px;
   width: 150px;
   color: brown;
-  background-color: wheat;
 }
 
 .container .box-BSC {
@@ -142,7 +149,6 @@
   right: 0px;
   width: 150px;
   color: brown;
-  background-color: wheat;
 }
 
 .container .box-SSO_mes {
@@ -150,7 +156,6 @@
   right: 0px;
   width: 150px;
   color: brown;
-  background-color: wheat;
 }
 
 .container .box-SCS {
@@ -158,7 +163,6 @@
   right: 0px;
   width: 150px;
   color: brown;
-  background-color: wheat;
 }
 
 .container .box-AASK {
@@ -166,8 +170,4 @@
   right: 0px;
   width: 150px;
   color: brown;
-  background-color: wheat;
-}
-.hidden {
-  display: none;
-}
+}

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

@@ -14,6 +14,7 @@ import {
   DigiMiddlewareAuthUser,
 } from "app/config/app-auth-token";
 import { CommonService } from "../service/common.service";
+import { NzPopconfirmComponent } from 'ng-zorro-antd/popconfirm';
 
 @Component({
   selector: "app-layout",
@@ -59,13 +60,12 @@ export class LayoutComponent implements OnInit, AfterViewInit {
     heightPercent: "",
     widthPercent: "",
   };
-  showElement: boolean = false;
 
   constructor(
     private commonService: CommonService,
     private el: ElementRef,
     private renderer: Renderer2
-  ) {}
+  ) { }
   ngOnInit(): void {
     this.systemMaps = systemList;
     this.initSystemBySemcSSO();
@@ -134,7 +134,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
     this.commonService
       .postWithHeaders(
         this.commonService.apiUrl +
-          "/restful/standard/demo/api/517/config/list",
+        "/restful/standard/demo/api/517/config/list",
         {
           userId: this.divContent.userId,
           tenantId: DwUserInfo.tenantId,
@@ -154,12 +154,15 @@ export class LayoutComponent implements OnInit, AfterViewInit {
             // this.renderer.setStyle(sysEL, 'left', item.left);
             // this.renderer.setStyle(sysEL, 'width', item.width);
             // this.renderer.setStyle(sysEL, 'height', item.height);
-
-            this.renderer.setStyle(sysEL, "top", item.topPercent);
-            this.renderer.setStyle(sysEL, "left", item.leftPercent);
-            this.renderer.setStyle(sysEL, "width", item.widthPercent);
-            this.renderer.setStyle(sysEL, "height", item.heightPercent);
-            this.showElement = true;
+            if (sysEL != null) {
+              this.renderer.setStyle(sysEL, "top", item.topPercent);
+              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, "display", 'block');
+            }
           });
         }
       });
@@ -216,7 +219,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
       this.commonService
         .postWithHeaders(
           this.commonService.apiUrl +
-            "/restful/standard/demo/api/default/login",
+          "/restful/standard/demo/api/default/login",
           {
             userId: DwUserInfo.userId,
             tenantId: DwUserInfo.tenantId,
@@ -236,7 +239,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
       this.commonService
         .postWithHeaders(
           this.commonService.iamUrl +
-            "/api/iam/v2/identity/token/refresh/tenant",
+          "/api/iam/v2/identity/token/refresh/tenant",
           { tenantSid: item.sid },
           headers
         )
@@ -303,7 +306,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
       this.renderer.setStyle(sysEL, "width", this.divContent.width);
     }
     if (type === "H") {
-      this.renderer.setStyle(sysEL, "height", this.divContent.width);
+      this.renderer.setStyle(sysEL, "height", this.divContent.height);
     }
   }
 
@@ -345,7 +348,7 @@ export class LayoutComponent implements OnInit, AfterViewInit {
     this.commonService
       .postWithHeaders(
         this.commonService.apiUrl +
-          "/restful/standard/demo/api/517/config/save",
+        "/restful/standard/demo/api/517/config/save",
         this.divContent,
         {
           "Digi-Middleware-Auth-App": DigiMiddlewareAuthApp,

digital-future-summit/src/app/implementation/layout/system.ts

@@ -1,15 +1,5 @@
 /* eslint-disable quotes */
 export const systemList = {
-  EIP: {
-    key: "EIP",
-    title: "智驱工作台",
-    sid: 821224928908288,
-    id: "digiwinSummit",
-    name: "数智未来峰会",
-    url: "https://athena.digiwincloud.com.cn",
-    mockLogin: false,
-    ssoLogin: false,
-  },
   T100: {
     key: "T100",
     title: "T100",
@@ -26,6 +16,34 @@ export const systemList = {
     ssoLogin: false,
     linkLogin: true,
   },
+  BSC: {
+    key: "BSC",
+    title: "业务中台",
+    url: "https://4mfmfo.axshare.com",
+    mockLogin: false,
+    ssoLogin: false,
+    linkLogin: true,
+  },
+  EIP: {
+    key: "EIP",
+    title: "智驱工作台",
+    sid: 821224928908288,
+    id: "digiwinSummit",
+    name: "数智未来峰会",
+    url: "https://athena.digiwincloud.com.cn",
+    mockLogin: false,
+    ssoLogin: false,
+  },
+  AASK: {
+    key: "AASK",
+    title: "智驱工作台",
+    sid: 821224928908288,
+    id: "digiwinSummit",
+    name: "数智未来峰会",
+    url: "https://athena-dev-platform.digiwincloud.com.cn",
+    mockLogin: false,
+    ssoLogin: false,
+  },
   DMP: {
     key: "DMP",
     title: "数据中台",