Merge branch 'feature-demo'

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

@@ -97,11 +97,19 @@
     </div>
 
 
-    <div id="SSO_mes" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
-      class="box box-SSO_mes" (click)="jumpToSystem('SSO_mes')">
+    <!-- <div id="SSO_mes" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
+      class="box box-SSO_mes" (click)="jumpToSystem('SSO_SMES_Backend')">
       <span>智能生产控制</span>
+    </div> -->
+
+    <div id="SSO_mes" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)" class="box box-ET"
+      nz-popconfirm nzPopconfirmTitle="请您选择系统 sMOM OR sMES ?" (nzOnConfirm)="jumpToSystem('SSO_SMES')"
+      (nzOnCancel)="jumpToSystem('SSO_SMES_Backend')" nzPopconfirmPlacement="top" nzOkText="sMES" nzCancelText="sMOM"
+      nzIcon="appstore">
+      <span>精益数字化管理</span>
     </div>
 
+
     <!-- <div id="SSO_E10229" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"
       class="box box-E10229" (click)="jumpToSystem('SSO_E10229')">
       <span>E10</span>
@@ -130,12 +138,12 @@
       <span>资料下载</span>
     </div>
 
-    <nz-modal [(nzVisible)]="isDownloadVisible" nzTitle="扫描二维码下载资料"   (nzOnCancel)="handleModelCancel()"
-    nzCentered="true" nzMask="true" nzMaskClosable="true" nzCancelText="关闭" nzOkDisabled="true" nzFooter="感谢您的关注">
+    <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>
+          <img src="../../../assets/summit/dowload-code.png" />
+        </div>
       </ng-container>
     </nz-modal>
   </div>

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

@@ -26,7 +26,7 @@ export class LayoutComponent implements OnInit {
   systemMaps = {};
   queryDisplayList = [];
 
-  exclusionSys = ['', 'SSO_mes']
+  exclusionSys = ['']
 
   USER_ID = "";
 
@@ -255,9 +255,7 @@ export class LayoutComponent implements OnInit {
         )
         .then((res) => {
           if (res && res.response) {
-            window.open(
-              item.url + "/sso-login?userToken=" + res.response.user_token
-            );
+            this.jumpURL(item.url, res.response.user_token);
           }
         });
     } else {
@@ -271,7 +269,7 @@ export class LayoutComponent implements OnInit {
         )
         .then((res) => {
           if (res) {
-            window.open(item.url + "/sso-login?userToken=" + res.user_token);
+            this.jumpURL(item.url, res.user_token);
           }
         });
     }
@@ -392,4 +390,12 @@ export class LayoutComponent implements OnInit {
   handleModelCancel() {
     this.isDownloadVisible = false;
   }
+
+  jumpURL(url: String, token: String) {
+    if (url.includes('/sso-login')) {
+      window.open(url + "&userToken=" + token);
+    } else {
+      window.open(url + "/sso-login?userToken=" + token);
+    }
+  }
 }

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

@@ -19,7 +19,7 @@ export const systemList = {
   BSC: {
     key: "BSC",
     title: "业务中台",
-    url: "https://4mfmfo.axshare.com",
+    url: "https://bm-datademo.digiwincloud.com.cn",
     mockLogin: false,
     ssoLogin: false,
     linkLogin: true,
@@ -110,7 +110,7 @@ export const systemList = {
     sid: 473371184808512,
     id: '20220815',
     name: '合规试制体验环境',
-    url: "https://athena.digiwincloud.com.cn",
+    url: "https://athena.digiwincloud.com.cn/sso-login?routerLink=/todo/task",
     mockLogin: false,
     ssoLogin: false,
   },