Merge branch 'feature-demo'

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

@@ -103,8 +103,8 @@
     </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"
+      nz-popconfirm nzPopconfirmTitle="请您选择 车间配置中心 OR 智能报工终端 ?" (nzOnConfirm)="jumpToSystem('SSO_SMES')"
+      (nzOnCancel)="jumpToSystem('SSO_SMES_Backend')" nzPopconfirmPlacement="top" nzOkText="智能报工终端" nzCancelText="车间配置中心"
       nzIcon="appstore">
       <span>精益数字化管理</span>
     </div>
@@ -141,8 +141,8 @@
     <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 id="QRcode" appDraggable [dragEnable]="dragEnable" (dragEvent)="handleElementDrag($event)"  style="text-align: center; width: 100%;">
+          <img id="imgQRcode" src="../../../assets/summit/QRcode.png"  [style.width.px]="QRcodeStyle.width" [style.height.px]="QRcodeStyle.height" />
         </div>
       </ng-container>
     </nz-modal>

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

@@ -14,6 +14,7 @@ import {
 import { CommonService } from "../service/common.service";
 import { NzMessageService } from "ng-zorro-antd/message";
 import { NzModalService } from "ng-zorro-antd/modal";
+import { he } from "date-fns/locale";
 
 
 @Component({
@@ -68,6 +69,11 @@ export class LayoutComponent implements OnInit {
     widthPercent: "",
   };
 
+  QRcodeStyle = {
+    height: 450,
+    width: 450
+  }
+
   constructor(
     private commonService: CommonService,
     private el: ElementRef,
@@ -162,7 +168,7 @@ export class LayoutComponent implements OnInit {
             // this.renderer.setStyle(sysEL, 'left', item.left);
             // this.renderer.setStyle(sysEL, 'width', item.width);
             // this.renderer.setStyle(sysEL, 'height', item.height);
-            if (sysEL != null) {
+            if (sysEL != null && item.sysId !== 'QRcode') {
               this.renderer.setStyle(sysEL, "top", item.topPercent);
               this.renderer.setStyle(sysEL, "left", item.leftPercent);
               this.renderer.setStyle(sysEL, "width", item.widthPercent);
@@ -183,6 +189,11 @@ export class LayoutComponent implements OnInit {
               }
 
             }
+
+            if (item.sysId === 'QRcode') {
+              this.QRcodeStyle.height = Number(item.height.replace("px", ""));
+              this.QRcodeStyle.width = Number(item.width.replace("px", ""));
+            }
           });
         }
       });
@@ -191,6 +202,13 @@ export class LayoutComponent implements OnInit {
   jumpToSystem(key: string) {
     const DwUserInfo = JSON.parse(sessionStorage.getItem("DwUserInfo"));
 
+    if (key === 'download') {
+      this.isDownloadVisible = true;
+      const sysEL = this.el.nativeElement.querySelector("#imgQRcode");
+      console.log(this.QRcodeStyle);
+      return;
+    }
+
     if (
       DwUserInfo.userId === "dongsk@digiwin.com" ||
       DwUserInfo.userId === "M00020"
@@ -198,10 +216,6 @@ export class LayoutComponent implements OnInit {
       return;
     }
 
-    if (key === 'download') {
-      this.isDownloadVisible = true;
-      return;
-    }
 
     if (this.exclusionSys.includes(key)) {
       this.message.error(`${key} 未集成`);
@@ -287,6 +301,10 @@ export class LayoutComponent implements OnInit {
       this.divContent.sysId = data.id;
     }
 
+    if (data.id === 'QRcode') {
+      return;
+    }
+
     if (data.type !== "mouseup") {
       return;
     }

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

@@ -120,7 +120,7 @@ export const systemList = {
     sid: 484411116737088,
     id: 'SCST100Athena',
     name: 'scs华为云发版测试',
-    url: "https://athena.digiwincloud.com.cn",
+    url: "https://athena.digiwincloud.com.cn/sso-login?routerLink=/report-template",
     mockLogin: false,
     ssoLogin: false,
   }

digital-future-summit/src/assets/i18n/zh_CN/basic.json

@@ -1,5 +1,6 @@
 {
   "prog": {
     "lagrge-home": "大屏首页"
-  }
+  },
+  "app-title": "数智未来峰会"
 }