-
+
+
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 9cce669..3cd1d45 100644
--- a/digital-future-summit/src/app/implementation/layout/layout.component.ts
+++ b/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;
}
diff --git a/digital-future-summit/src/app/implementation/layout/system.ts b/digital-future-summit/src/app/implementation/layout/system.ts
index aa390d8..5f57103 100644
--- a/digital-future-summit/src/app/implementation/layout/system.ts
+++ b/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,
}
diff --git a/digital-future-summit/src/assets/i18n/zh_CN/basic.json b/digital-future-summit/src/assets/i18n/zh_CN/basic.json
index d13376c..7486666 100755
--- a/digital-future-summit/src/assets/i18n/zh_CN/basic.json
+++ b/digital-future-summit/src/assets/i18n/zh_CN/basic.json
@@ -1,5 +1,6 @@
{
"prog": {
"lagrge-home": "大屏首页"
- }
+ },
+ "app-title": "数智未来峰会"
}
\ No newline at end of file
diff --git a/digital-future-summit/src/assets/summit/QRcode.png b/digital-future-summit/src/assets/summit/QRcode.png
new file mode 100644
index 0000000..ef56bc7
Binary files /dev/null and b/digital-future-summit/src/assets/summit/QRcode.png differ