diff --git a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html index a00baf31..7aa66a55 100755 --- a/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html +++ b/com.actionsoft.apps.coe.pal/template/page/pal.pl.repository.designer.view.portal.html @@ -73,6 +73,28 @@ height: 36px !important; } + + .floating-buttons { + position: absolute; + top: 10px; + left: 10px; + z-index: 1; + } + + .floating-button { + margin-right: 5px; + padding: 5px 10px; + border: none; + border-radius: 4px; + background-color: #4e7ff9; + color: white; + cursor: pointer; + } + + .floating-button:hover { + background-color: #3a68e0; + } + @@ -695,6 +717,13 @@ //$(".headerTab").css("margin-right" , "5%"); changeUrl(); } + + if(methodId=="process.epc" || methodId=="process.flowchart"){//流程类图 + $("#floating-buttons").show(); + }else{ + $("#floating-buttons").hide(); + } + // else { // $(".headerTab").css("margin-right" , "4%"); // } @@ -744,6 +773,48 @@ } + function openInfo(type){ + if(type==="word"){ + $("#designer_layout").height( $("#designer_layout").height() + 93); + $(".suofang").hide(); + $(".newadd_card .title").hide(); + $.ajax({ + type : "POST", + url : "./jd?sid=" + sid + + "&cmd=com.actionsoft.apps.coe.pal_outputreport_output_process_preview", + data : { + 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(""); + $("#on_doc").width("1050px"); + $('#online_mainDiv').css("left","0px"); + $("#ifr").height("100%"); + $("#ifr").width("100%"); + $("#designer_layout").css("overflow-x","hidden"); + } + } else { + $.simpleAlert("close"); + $.simpleAlert(msg['msg'], 'info'); + } + } + }); + }else{ + $(".suofang").show(); + $(".newadd_card .title").show(); + $("#canvas_container").show(); + $("#canvas_container_epcWord").hide(); + } + } + //将文件预览页面嵌入流程模型页面 function changeUrl() { $.ajax({ @@ -758,6 +829,7 @@ //$.simpleAlert("close"); if (msg['data']) { $("#canvas_container").empty(); + $("#canvas_container").removeAttr('style'); $("#canvas_container").css({"width":"100%","height":"100%"}); let url = msg['data']['url']; $("#canvas_container").append(""); @@ -883,6 +955,7 @@ -ms-user-select: text; user-select: text; } .newadd_card { + position: relative; /* 添加相对定位,作为浮动按钮的参考容器 */ float: left; width:70%; background-color: #fff; @@ -1064,6 +1137,12 @@ <#toolbarName>
+ + +
@@ -1071,6 +1150,9 @@ 您的浏览器不支持HTML5,请使用IE9及以上版本,或Chrome、Firefox等浏览器
+
+
+
diff --git a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js index 176ae424..b6a2b54d 100755 --- a/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js +++ b/com.actionsoft.apps.coe.pal/web/com.actionsoft.apps.coe.pal/lib/designer/extend/js/designer.extend.link.view.portal.js @@ -494,6 +494,35 @@ function openDialog(obj) { }); } +/** + * 打开管理要求wps预览页面 + * @param uuid + */ +function openMRWps(uuid){ + $.ajax({ + type : "POST", + url : "./jd?sid=" + + CLB.sid + + "&cmd=com.awspaas.user.apps.yiliwps.previewUrl_mr_read", + data : { + palId : uuid, + }, + success : function(data) { + if(data.result=="ok"){ + if (data.data.content.code === 200) { + //换一种打开方式 + window.open(data.data.content.data.link); + }else{ + $.simpleAlert(data.data.msg, "info", 2000); + } + }else{ + $.simpleAlert(data.msg, "info", 2000); + } + + } + }); +} + Array.prototype.unique = function(){ var res = []; @@ -1556,6 +1585,9 @@ function initProcessDesc() { t += '' +''+tableFlag+''+''; t += ''; } + } else if(obj.name=="管理要求位置"){ + //增加点击事件,打开管理要求的在线文档 + t += '' + value + ''; } else { value = value.replace(/\n/g,'
') if(obj.name == "作废人" && value.indexOf("注销")>0){ @@ -1567,6 +1599,7 @@ function initProcessDesc() { } } + // t += '' + value + ''; // t += ''; }