From dcbcf482b864cb85aa96eeed0bd9dd13bba19064 Mon Sep 17 00:00:00 2001 From: linjj <850658129@qq.com> Date: Wed, 24 Jan 2024 15:37:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=BD=AE=E5=B7=9E=E4=BA=BA=E5=8C=BB=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E5=80=9F=E9=98=85=E3=80=81=E5=BF=AB=E9=80=9F=E5=BD=92?= =?UTF-8?q?=E8=BF=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/emr/service/CommomService.java | 2 - .../webapp/static/js/font/showRecordFont.js | 1 + .../commomSearch/showRecordIframeBloodFont.js | 116 ------------------ 3 files changed, 1 insertion(+), 118 deletions(-) diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java index f111424..a577f92 100644 --- a/src/main/java/com/emr/service/CommomService.java +++ b/src/main/java/com/emr/service/CommomService.java @@ -228,11 +228,9 @@ public class CommomService { } else if ("file_path".equals(flag)) { root1 = commomVo.getFilePath(); } - String root2 = commomVo.getNewPath(); //组织src List src = new LinkedList<>(); String[] scanPageArr = scanPages.split(","); - String[] sourceArr = sources.split(","); for (int i = 0; i < scanPageArr.length; i++) { String srcStr = ""; if (StringUtils.isNotBlank(scanPageArr[i])) { diff --git a/src/main/webapp/static/js/font/showRecordFont.js b/src/main/webapp/static/js/font/showRecordFont.js index 8f824d3..2efc627 100644 --- a/src/main/webapp/static/js/font/showRecordFont.js +++ b/src/main/webapp/static/js/font/showRecordFont.js @@ -6,6 +6,7 @@ var isIE = function(ver) { } //初始化函数 $(function(){ + console.log() $('.contentDiv').css('height', '100%').css('height', '-=140px'); var ie = isIE(8); if(ie) { diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js index 69f2498..7006053 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecordIframeBloodFont.js @@ -145,122 +145,6 @@ function onloadPdf(scanPages, sources) { var iframe = document.getElementById("iframe1"); -/** - * 加载打印预览所需图片 - */ -//定义打印预览加载图片进度 -function selectPrintPic(patientId, rootPaths, scanPages, sources) { - $.ajax({ - type: 'post', - url: path + "/font/selectPrintPic", - data: { - patientId: patientId, - rootPaths: rootPaths, - names: scanPages, - sources: sources - }, - datType: 'json', - success: function (data) { - if (data.code == 0) { - var resultList = data.data; - if (null != resultList) { - var img = ''; - for (var i = 0; i < resultList.length; i++) { - img += ""; - } - var interval = setInterval(function () { - if ($("#iframeLoad").val() == 1) { - iframe.contentDocument.getElementById("printContainer1").innerHTML = img; - $("#printPicLoaded").val(1); - iframe.contentDocument.getElementById("printLoading").style.display = 'none'; - iframe.contentDocument.getElementById("print").style.display = 'block'; - clearInterval(interval); - } - }, 200); - } - } else { - toastr.error(data.msg); - } - } - }) - //查询进度定时器 - var interval1 = setInterval(function () { - $.ajax({ - type: 'get', - url: path + "/commom/getPrintPicLoading", - data: {patientId: $("#patientId").val()}, - dataType: 'json', - success: function (data) { - if (data.code == 0) { - var value = data.data; - $("#loading").val(value + "%"); - if (value == 100) { - //杀死进度定时器 - clearInterval(interval1); - } - } else { - toastr.error(data.msg); - } - } - }) - }, 100000); -} - -function selectPrintPic2(patientId, scanPages, sources) { - $.ajax({ - type: 'post', - url: path + "/commom/selectPrintPic2", - data: { - patientId: patientId, - names: scanPages, - sources: sources - }, - datType: 'json', - success: function (data) { - if (data.code == 0) { - var resultList = data.data; - if (null != resultList) { - var img = ''; - for (var i = 0; i < resultList.length; i++) { - img += ""; - } - var interval = setInterval(function () { - if ($("#iframeLoad").val() == 1) { - iframe.contentDocument.getElementById("printContainer1").innerHTML = img; - $("#printPicLoaded").val(1); - iframe.contentDocument.getElementById("printLoading").style.display = 'none'; - iframe.contentDocument.getElementById("print").style.display = 'block'; - clearInterval(interval); - } - }, 200); - } - } else { - toastr.error(data.msg); - } - } - }) - //查询进度定时器 - var interval1 = setInterval(function () { - $.ajax({ - type: 'get', - url: path + "/font/getPrintPicLoading", - data: {patientId: $("#patientId").val()}, - dataType: 'json', - success: function (data) { - if (data.code == 0) { - var value = data.data; - $("#loading").val(value + "%"); - if (value == 100) { - //杀死进度定时器 - clearInterval(interval1); - } - } else { - toastr.error(data.msg); - } - } - }) - }, 1000000); -} if (iframe.attachEvent) { iframe.attachEvent("onreadystatechange", function () {