diff --git a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java index 21ab16a7..4355b57c 100644 --- a/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java +++ b/com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java @@ -1100,6 +1100,7 @@ public class Report1Gener { if(headerlogo.size()>0){ FormFile formFile = headerlogo.get(0); DCContext dc = SDK.getBOAPI().getFileDCContext(formFile); + dataMap.put("LOGOURL",dc.getFilePath()); InputStream inputStream = SDK.getDCAPI().read(dc); try { // 使用ByteArrayOutputStream来收集InputStream中的数据 diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java index 6dac1251..7a695c10 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java @@ -704,9 +704,9 @@ public class OutputWordUtil { TableCell cellImg = table.getRows().get(0).getCells().get(1); //创建 DocPicture 类的对象 DocPicture picture = new DocPicture(templateDoc); - /* + String logoUrl = dataMap.getString("LOGOURL"); - picture.loadImage(logoUrl);*/ + picture.loadImage(logoUrl); //设置图片大小 picture.setWidth(75); picture.setHeight(90); diff --git a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java index ebc8e6ff..447402a3 100644 --- a/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java @@ -717,6 +717,7 @@ public class Report1Gener { if(headerlogo.size()>0){ FormFile formFile = headerlogo.get(0); DCContext dc = SDK.getBOAPI().getFileDCContext(formFile); + dataMap.put("LOGOURL",dc.getFilePath()); InputStream inputStream = SDK.getDCAPI().read(dc); try { // 使用ByteArrayOutputStream来收集InputStream中的数据 diff --git a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java index fb6f6dc5..5e3b0020 100644 --- a/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java +++ b/com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java @@ -338,6 +338,7 @@ public class Report1Gener { if(headerlogo.size()>0){ FormFile formFile = headerlogo.get(0); DCContext dc = SDK.getBOAPI().getFileDCContext(formFile); + dataMap.put("LOGOURL",dc.getFilePath()); InputStream inputStream = SDK.getDCAPI().read(dc); try { // 使用ByteArrayOutputStream来收集InputStream中的数据 diff --git a/com.awspaas.user.apps.yili.integration/template/page/Department.html b/com.awspaas.user.apps.yili.integration/template/page/Department.html index 95a595b9..7b73160a 100644 --- a/com.awspaas.user.apps.yili.integration/template/page/Department.html +++ b/com.awspaas.user.apps.yili.integration/template/page/Department.html @@ -13,8 +13,10 @@
-
- Chat Bot +
+ Chat Bot + YL-GPT + 智能文件搜索 关闭 -

{{param1}}
@@ -97,9 +98,9 @@
-
+
- + 已选择 暂无发布部门
@@ -111,9 +112,9 @@ }}）
- - 展开 - 折叠 + + 展开 + 折叠
@@ -399,7 +400,7 @@ this.$refs.treeNode.store._getAllNodes()[i].expanded=this.isExpand; } }, - + //右侧树结构 rightTreedatabind() { debugger; @@ -581,7 +582,8 @@ openGptHome() { //let url = "https://chatgpt-uat.dcin-test.digitalyili.com/welcome?from=libchat&lib=ef2b50fd79c52577d51222bc58b231d7&priv=1&sid=" + sid ; //this.fullscreen = window.innerWidth <= 768; // 小屏幕时全屏显示 - this.newPageUrl = "https://yiligpt.x.digitalyili.com/libchat?lib=51682983f4d291acdd6945a9b9e86d5c&priv=1&sid=" + sid; + this.newPageUrl = "https://yiligpt.x.digitalyili.com/libchat?lib=b8e082947190f2aa4fca0d96a5a95ea5&priv=1&sid=" + sid; + document.cookie = "AWSSESSIONID="+sid; this.param1=sid; this.dialogVisible = true; @@ -604,7 +606,7 @@ height:100%; float: left; width: 80%; - min-height: 810px; + min-height: 508px; border-right: 10px solid #eeeeee; padding-right: 20px; box-sizing: border-box; diff --git a/com.awspaas.user.apps.yili.integration/web/com.awspaas.user.apps.yili.integration/css/department1.css b/com.awspaas.user.apps.yili.integration/web/com.awspaas.user.apps.yili.integration/css/department1.css index 44e3781f..5708ca38 100644 --- a/com.awspaas.user.apps.yili.integration/web/com.awspaas.user.apps.yili.integration/css/department1.css +++ b/com.awspaas.user.apps.yili.integration/web/com.awspaas.user.apps.yili.integration/css/department1.css @@ -27,7 +27,7 @@ justify-content: flex-end; display: inline-block; line-height: 30px; - padding-right: 20px; + padding-right: 10px; } .deptInfoDiv-button{ @@ -39,7 +39,7 @@ flex-grow: 1; /* 撑满剩余空间 */ } .button-content{ - margin-top: 20px; + margin-top: 40px; height: 30px; line-height: 35px; display: grid;