yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev

Browse Source
This commit is contained in:
zhaol 2024-10-30 16:17:28 +08:00
commit 0401407838
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
com.actionsoft.apps.coe.pal.output.pr/src/com/actionsoft/apps/coe/pal/output/pr/report1/Report1Gener.java
View File

@ -1100,6 +1100,7 @@ public class Report1Gener {
if(headerlogo.size()>0){ if(headerlogo.size()>0){
FormFile formFile = headerlogo.get(0); FormFile formFile = headerlogo.get(0);
DCContext dc = SDK.getBOAPI().getFileDCContext(formFile); DCContext dc = SDK.getBOAPI().getFileDCContext(formFile);
dataMap.put("LOGOURL",dc.getFilePath());
InputStream inputStream = SDK.getDCAPI().read(dc); InputStream inputStream = SDK.getDCAPI().read(dc);
try { try {
// 使用ByteArrayOutputStream来收集InputStream中的数据 // 使用ByteArrayOutputStream来收集InputStream中的数据

4
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/output/util/OutputWordUtil.java
View File

@ -704,9 +704,9 @@ public class OutputWordUtil {
TableCell cellImg = table.getRows().get(0).getCells().get(1); TableCell cellImg = table.getRows().get(0).getCells().get(1);
//创建 DocPicture 类的对象 //创建 DocPicture 类的对象
DocPicture picture = new DocPicture(templateDoc); DocPicture picture = new DocPicture(templateDoc);
/*
String logoUrl = dataMap.getString("LOGOURL"); String logoUrl = dataMap.getString("LOGOURL");
picture.loadImage(logoUrl);*/ picture.loadImage(logoUrl);
//设置图片大小 //设置图片大小
picture.setWidth(75); picture.setWidth(75);
picture.setHeight(90); picture.setHeight(90);

1
com.awspaas.user.apps.coe.pal.output.bd/src/com/awspaas/apps/coe/pal/output/bd/report1/Report1Gener.java
View File

@ -717,6 +717,7 @@ public class Report1Gener {
if(headerlogo.size()>0){ if(headerlogo.size()>0){
FormFile formFile = headerlogo.get(0); FormFile formFile = headerlogo.get(0);
DCContext dc = SDK.getBOAPI().getFileDCContext(formFile); DCContext dc = SDK.getBOAPI().getFileDCContext(formFile);
dataMap.put("LOGOURL",dc.getFilePath());
InputStream inputStream = SDK.getDCAPI().read(dc); InputStream inputStream = SDK.getDCAPI().read(dc);
try { try {
// 使用ByteArrayOutputStream来收集InputStream中的数据 // 使用ByteArrayOutputStream来收集InputStream中的数据

1
com.awspaas.user.apps.coe.pal.output.zd/src/com/awspaas/apps/coe/pal/output/zd/report1/Report1Gener.java
View File

@ -338,6 +338,7 @@ public class Report1Gener {
if(headerlogo.size()>0){ if(headerlogo.size()>0){
FormFile formFile = headerlogo.get(0); FormFile formFile = headerlogo.get(0);
DCContext dc = SDK.getBOAPI().getFileDCContext(formFile); DCContext dc = SDK.getBOAPI().getFileDCContext(formFile);
dataMap.put("LOGOURL",dc.getFilePath());
InputStream inputStream = SDK.getDCAPI().read(dc); InputStream inputStream = SDK.getDCAPI().read(dc);
try { try {
// 使用ByteArrayOutputStream来收集InputStream中的数据 // 使用ByteArrayOutputStream来收集InputStream中的数据

22
com.awspaas.user.apps.yili.integration/template/page/Department.html
View File

@ -13,8 +13,10 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<div id="floatingChatIcon" > <div id="floatingChatIcon" @click="openGptHome" >
<img src="../apps/com.awspaas.user.apps.gpt_interface/img/robot-icon.png" alt="Chat Bot" @click="openGptHome" > <img src="../apps/com.awspaas.user.apps.gpt_interface/img/robot-icon.png" alt="Chat Bot" >
<span style="margin-top: 6px;font-size: 19px;">YL-GPT</span>
<span style="margin-top: 6px;font-size: 11px;">智能文件搜索</span>
<el-dialog <el-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="80%" width="80%"
@ -24,7 +26,6 @@
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="closeDialog">关闭</el-button> <el-button @click="closeDialog">关闭</el-button>
</span> </span>
<p>{{param1}}</p>
</el-dialog> </el-dialog>
</div> </div>
<div id="main"> <div id="main">
@ -97,9 +98,9 @@
</div> </div>
</div> </div>
<!-- 部门信息区域 --> <!-- 部门信息区域 -->
<div class="section" style="font-size: 14px;border: 0px solid #D4F0FF;background-color: #E6F7FF;padding: 2px;margin-left: 7px;"> <div class="section" style="font-size: 14px;border: 0px solid #D4F0FF;background-color: #E6F7FF;padding: 2px 0px 4px;margin-left: 7px;">
<div class="deptInfoDiv" style="padding-left: 4px;"> <div class="deptInfoDiv" style="padding-left: 4px;">
<i slot="reference" class="ico tips"></i> <i style="vertical-align: middle;padding-top: 3px;" slot="reference" class="ico tips"></i>
<span v-if="doesItExist==true" class="limited-text">已选择</span> <span v-if="doesItExist==true" class="limited-text">已选择</span>
<span v-if="doesItExist==false" class="limited-text">暂无发布部门</span> <span v-if="doesItExist==false" class="limited-text">暂无发布部门</span>
</div> </div>
@ -111,9 +112,9 @@
}}）</span> }}）</span>
</div> </div>
<div class="deptInfoDiv-button"> <div class="deptInfoDiv-button">
<el-checkbox v-model="checkedInfo" label="隐藏架构" @change="showOrHideInfo" border size="mini"></el-checkbox> <el-checkbox v-model="checkedInfo" label="隐藏架构" @change="" border size="mini"></el-checkbox>
<el-button type="primary" size="mini" icon="el-icon-arrow-down" v-if="isExpand==false && checkedInfo == false" @click="expandTree">展开</el-button> <el-button style="height: 28px;" type="primary" size="mini" icon="el-icon-arrow-down" v-if="isExpand==false && checkedInfo == false" @click="expandTree">展开</el-button>
<el-button type="primary" size="mini" icon="el-icon-arrow-up" v-if="isExpand==true && checkedInfo == false" @click="foldTree">折叠</el-button> <el-button style="height: 28px;"type="primary" size="mini" icon="el-icon-arrow-up" v-if="isExpand==true && checkedInfo == false" @click="foldTree">折叠</el-button>
</div> </div>
</div> </div>
<div id="processList" v-loading="g_loading" style="width: 100%;overflow-y:auto;" > <div id="processList" v-loading="g_loading" style="width: 100%;overflow-y:auto;" >
@ -581,7 +582,8 @@
openGptHome() { openGptHome() {
//let url = "https://chatgpt-uat.dcin-test.digitalyili.com/welcome?from=libchat&lib=ef2b50fd79c52577d51222bc58b231d7&priv=1&sid=" + sid ; //let url = "https://chatgpt-uat.dcin-test.digitalyili.com/welcome?from=libchat&lib=ef2b50fd79c52577d51222bc58b231d7&priv=1&sid=" + sid ;
//this.fullscreen = window.innerWidth <= 768; // 小屏幕时全屏显示 //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.param1=sid;
this.dialogVisible = true; this.dialogVisible = true;
@ -604,7 +606,7 @@
height:100%; height:100%;
float: left; float: left;
width: 80%; width: 80%;
min-height: 810px; min-height: 508px;
border-right: 10px solid #eeeeee; border-right: 10px solid #eeeeee;
padding-right: 20px; padding-right: 20px;
box-sizing: border-box; box-sizing: border-box;

4
com.awspaas.user.apps.yili.integration/web/com.awspaas.user.apps.yili.integration/css/department1.css
View File

@ -27,7 +27,7 @@
justify-content: flex-end; justify-content: flex-end;
display: inline-block; display: inline-block;
line-height: 30px; line-height: 30px;
padding-right: 20px; padding-right: 10px;
} }
.deptInfoDiv-button{ .deptInfoDiv-button{
@ -39,7 +39,7 @@
flex-grow: 1; /* 撑满剩余空间 */ flex-grow: 1; /* 撑满剩余空间 */
} }
.button-content{ .button-content{
margin-top: 20px; margin-top: 40px;
height: 30px; height: 30px;
line-height: 35px; line-height: 35px;
display: grid; display: grid;