Compare commits
3 Commits
5639f73341
...
02035596d1
| Author | SHA1 | Date | |
|---|---|---|---|
|
02035596d1 | ||
|
|
31f94b047c | ||
|
|
a34f388521 |
@ -2996,6 +2996,7 @@ public class OutputWordUtil {
|
||||
|
||||
// 插入到目标位置（表格下方）
|
||||
targetSection.getParagraphs().insert(targetParaIndex, clonedPara);
|
||||
targetParaIndex++;
|
||||
}
|
||||
|
||||
// 调整后续段落（如矩阵标题）与插入内容的间距
|
||||
|
||||
@ -779,9 +779,22 @@
|
||||
|
||||
function openInfo(type){
|
||||
if(type==="word"){
|
||||
$("#designer_layout").height( $("#designer_layout").height() + 93);
|
||||
// 调整designer_layout的高度，为按钮区域留出空间
|
||||
$("#designer_layout").height($("#designer_layout").height() + 93);
|
||||
// 隐藏流程图相关的缩放和标题区域
|
||||
$(".suofang").hide();
|
||||
$(".newadd_card .title").hide();
|
||||
// 隐藏流程图容器，显示Word文档容器
|
||||
$("#canvas_container").hide();
|
||||
$("#canvas_container_epcWord").empty();
|
||||
$("#canvas_container_epcWord").show();
|
||||
$("#canvas_container_epcWord").css({"width":"100%","height":"100%"});
|
||||
// 调整文档显示区域的宽度和位置
|
||||
$("#on_doc").width("1050px");
|
||||
$('#online_mainDiv').css("left","0px");
|
||||
// 隐藏designer_layout的横向滚动条
|
||||
$("#designer_layout").css("overflow-x","hidden");
|
||||
|
||||
$.ajax({
|
||||
type : "POST",
|
||||
url : "./jd?sid=" + sid
|
||||
@ -790,22 +803,12 @@
|
||||
taskId : taskId
|
||||
},
|
||||
success : function(msg) {
|
||||
|
||||
|
||||
if (msg.result == "ok") {
|
||||
//$.simpleAlert("close");
|
||||
if (msg['data']) {
|
||||
$("#canvas_container").hide();
|
||||
$("#canvas_container_epcWord").empty();
|
||||
$("#canvas_container_epcWord").show();
|
||||
$("#canvas_container_epcWord").css({"width":"100%","height":"100%"});
|
||||
let url = msg['data']['url'];
|
||||
$("#canvas_container_epcWord").append("<iframe id='ifr' src=" + url + "></iframe>");
|
||||
$("#on_doc").width("1050px");
|
||||
$('#online_mainDiv').css("left","0px");
|
||||
$("#ifr").height("100%");
|
||||
$("#ifr").width("100%");
|
||||
$("#designer_layout").css("overflow-x","hidden");
|
||||
}
|
||||
} else {
|
||||
$.simpleAlert("close");
|
||||
@ -814,10 +817,16 @@
|
||||
}
|
||||
});
|
||||
}else{
|
||||
// 恢复流程图相关的缩放和标题区域
|
||||
$(".suofang").show();
|
||||
$(".newadd_card .title").show();
|
||||
// 恢复designer_layout的高度到初始状态（减去之前增加的93px）
|
||||
$("#designer_layout").height($("#designer_layout").height() - 93);
|
||||
// 显示流程图容器，隐藏Word文档容器
|
||||
$("#canvas_container").show();
|
||||
$("#canvas_container_epcWord").hide();
|
||||
// 恢复designer_layout的横向滚动条
|
||||
$("#designer_layout").css("overflow-x","auto");
|
||||
}
|
||||
}
|
||||
|
||||
@ -1144,9 +1153,11 @@
|
||||
</div>
|
||||
<div class="newadd_card">
|
||||
<!-- 新增按钮容器 -->
|
||||
<div id="floating-buttons" class="floating-buttons" style="display: none">
|
||||
<button class="floating-button" onclick="openInfo('epc')" >流程图</button>
|
||||
<button class="floating-button" onclick="openInfo('word')" >文件全文</button>
|
||||
<div class="floating-buttons-container" style="height: 35px; width: 100%; position: relative;">
|
||||
<div id="floating-buttons" class="floating-buttons" style="display: none">
|
||||
<button class="floating-button" onclick="openInfo('epc')" >流程图</button>
|
||||
<button class="floating-button" onclick="openInfo('word')" >文件全文</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="title"><span></span></div>
|
||||
@ -1168,7 +1179,7 @@
|
||||
<div></div>
|
||||
</div>
|
||||
<div class="suofang">
|
||||
<div id="outputFile" style="vertical-align:middle;padding-top:9px;display:none;float: left; width:60%"></div>
|
||||
<div id="outputFile" style="vertical-align:middle;padding-top:60px;display:none;float: left; width:60%; margin-top: 50px;"></div>
|
||||
<div style="font-size: 15px;vertical-align:middle;padding-top:9px;float:right; width: 30%;text-align: right;">
|
||||
<span class="awsui-iconfont" id="showNav" style="margin-right:30px;display: none" awsui-qtip="显示导航" onclick="navOperate('show')">
|
||||
<i class="awsui-iconfont" style="color:#555;"></i>
|
||||
|
||||
@ -11,5 +11,6 @@ public class Constants {
|
||||
public static String openCmd="com.actionsoft.apps.coe.pal.publisher_publish_file_open";
|
||||
|
||||
public static String COE_APP_ID="com.actionsoft.apps.coe.pal";
|
||||
public static String APP_ID="com.awspaas.user.apps.nqms.portal.indexpage";
|
||||
|
||||
}
|
||||
|
||||
@ -245,7 +245,24 @@ public class IndexService {
|
||||
List<JSONObject> processType = service.getFirstProcessPalByPid(wsId, PalCategoryEnum.PROCESS.getKey());
|
||||
String strategy = "战略类";
|
||||
String Operations = "运营类";
|
||||
String SupportAndServices = "支持与服务类";
|
||||
String SupportAndServices = "支持类";
|
||||
String portalZll = SDK.getAppAPI().getProperty(Constants.APP_ID, "portalZll");
|
||||
// 考虑到可能存在的空值和空白字符，推荐使用这种方式
|
||||
Set<String> zllSet = Arrays.stream(portalZll.split(","))
|
||||
.map(String::trim)
|
||||
.filter(StringUtils::isNotBlank)
|
||||
.collect(Collectors.toSet());
|
||||
String portalYyl = SDK.getAppAPI().getProperty(Constants.APP_ID, "portalYyl");
|
||||
Set<String> yylSet = Arrays.stream(portalYyl.split(","))
|
||||
.map(String::trim)
|
||||
.filter(StringUtils::isNotBlank)
|
||||
.collect(Collectors.toSet());
|
||||
String portalZcl = SDK.getAppAPI().getProperty(Constants.APP_ID, "portalZcl");
|
||||
Set<String> zclSet = Arrays.stream(portalZcl.split(","))
|
||||
.map(String::trim)
|
||||
.filter(StringUtils::isNotBlank)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
for (JSONObject type : processType) {
|
||||
String name = type.getString("name");
|
||||
String id = type.getString("id");
|
||||
@ -256,11 +273,11 @@ public class IndexService {
|
||||
if (!name.startsWith(String.valueOf(index))) {
|
||||
continue;
|
||||
}
|
||||
if (index == 1) {
|
||||
if (zllSet.contains(String.valueOf( index))) {
|
||||
group = "strategy";
|
||||
} else if (index > 1 && index <= 7) {
|
||||
} else if (yylSet.contains(String.valueOf( index))) {
|
||||
group = "Operations";
|
||||
} else {
|
||||
} else if (zclSet.contains(String.valueOf( index))) {
|
||||
group = "SupportAndServices";
|
||||
}
|
||||
if (!"1.0".equals(version) && StringUtils.isNotBlank(versionId)) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user