diff --git a/pom.xml b/pom.xml index 46112dc3..718cee11 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,12 @@ ${project.basedir}/src/main/webapp/WEB-INF/lib/anysign-components-2.1.6-RELEASE.jar + + com.itextpdf + kernel + 7.1.11 + + cn.org.bjca.anysign anysign-components-bean diff --git a/src/main/java/com/emr/controller/BatchExportController.java b/src/main/java/com/emr/controller/BatchExportController.java new file mode 100644 index 00000000..1808262b --- /dev/null +++ b/src/main/java/com/emr/controller/BatchExportController.java @@ -0,0 +1,44 @@ +package com.emr.controller; + +import com.emr.service.BatchExportService; +import com.emr.vo.ExportTaskVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * @ClassName BatchExportController + * @Description 批量导出接口 + * @Author linjj + * @Date 2024/4/12 11:16 + * @Version 1.0 + */ +@Controller +@RequestMapping("/batch/export") +public class BatchExportController { + + @Autowired + private BatchExportService batchExportService; + + @RequestMapping(value = "/exportPdf") + public String faults(Model model) { + return "batchExport/batchExpoer"; + } + + /** + * @description: 查询所有任务 + * @params: taskState + * @return: ExportTaskVo + * @author linjj + * @date: 2024/4/12 11:40 + */ + @ResponseBody + @RequestMapping(value = "/selectAll") + public List selectAll(int taskState) { + return batchExportService.selectAll(taskState); + } +} diff --git a/src/main/java/com/emr/controller/unfileMedicalController.java b/src/main/java/com/emr/controller/unfileMedicalController.java index 0a5b3a55..58bcc9bb 100644 --- a/src/main/java/com/emr/controller/unfileMedicalController.java +++ b/src/main/java/com/emr/controller/unfileMedicalController.java @@ -6,10 +6,13 @@ */ package com.emr.controller; +import com.emr.dto.DownloadPdfBloodDto; import com.emr.entity.Archive_Master_Vo; import com.emr.entity.OffsetLimitPage; import com.emr.service.Archive_MasterService; +import com.emr.service.DownloadPdfBloodService; import com.emr.service.Emr_DictionaryService; +import com.emr.service.ExportZdAssortService; import com.emr.util.ThreadExcelUtils; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -41,6 +44,9 @@ public class unfileMedicalController { @Autowired private Emr_DictionaryService emrDictionaryService; + @Autowired + private DownloadPdfBloodService downloadPdfBloodService; + @RequestMapping(value = "/unfileMedicals") public String faults(Model model) { return "unfileMedicalDir/unfileMedicalList"; @@ -234,12 +240,16 @@ public class unfileMedicalController { e.printStackTrace(); } - - } + @RequestMapping(value = "downloadPdfBlood", produces = {"text/json;charset=UTF-8"}) + @ResponseBody + public void downloadPdfBlood(HttpServletResponse response,DownloadPdfBloodDto dto) throws Exception { + downloadPdfBloodService.downloadPdfBlood(response,dto); + } + } diff --git a/src/main/java/com/emr/dao/BatchExportMapper.java b/src/main/java/com/emr/dao/BatchExportMapper.java new file mode 100644 index 00000000..4576dffc --- /dev/null +++ b/src/main/java/com/emr/dao/BatchExportMapper.java @@ -0,0 +1,18 @@ +package com.emr.dao; + +import com.emr.vo.ExportTaskVo; + +import java.util.List; + +/** + * @InterfaceName BatchExportMapper + * @Description 国家病历批量导出接口 + * @Author linjj + * @Date 2024/4/12 11:44 + * @Version 1.0 + */ +public interface BatchExportMapper { + + //查询所有任务 + List selectAll(int taskState); +} diff --git a/src/main/java/com/emr/dao/ExportZdAssortMapper.java b/src/main/java/com/emr/dao/ExportZdAssortMapper.java new file mode 100644 index 00000000..1675fce8 --- /dev/null +++ b/src/main/java/com/emr/dao/ExportZdAssortMapper.java @@ -0,0 +1,16 @@ +package com.emr.dao; + +import com.emr.entity.Zd_Assort; +import com.emr.vo.ExportPdfVo; +import com.emr.vo.ExportZdAssortVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ExportZdAssortMapper { + + ListgetPdfPath(String masterId); + + ListselectAll(); + +} \ No newline at end of file diff --git a/src/main/java/com/emr/dto/DownloadPdfBloodDto.java b/src/main/java/com/emr/dto/DownloadPdfBloodDto.java new file mode 100644 index 00000000..60cc2501 --- /dev/null +++ b/src/main/java/com/emr/dto/DownloadPdfBloodDto.java @@ -0,0 +1,21 @@ +package com.emr.dto; + +import lombok.Data; +import org.apache.ibatis.annotations.Param; + +/** + * @ClassName DownloadPdfBloodDto + * @Description 导出pdf Dto + * @Author linjj + * @Date 2024/4/10 17:11 + * @Version 1.0 + */ +@Data +public class DownloadPdfBloodDto { + private String masterId; + + private String inpNo; + + private String dischargeDateTime; + +} diff --git a/src/main/java/com/emr/service/BatchExportService.java b/src/main/java/com/emr/service/BatchExportService.java new file mode 100644 index 00000000..efaf2fc0 --- /dev/null +++ b/src/main/java/com/emr/service/BatchExportService.java @@ -0,0 +1,24 @@ +package com.emr.service; + +import com.emr.vo.ExportPdfVo; +import com.emr.vo.ExportTaskVo; +import com.itextpdf.kernel.pdf.PdfDocument; +import com.itextpdf.kernel.pdf.PdfReader; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.List; + +/** + * @InterfaceName BatchExportService + * @Description 国家病历批量导出接口 + * @Author linjj + * @Date 2024/4/12 11:40 + * @Version 1.0 + */ +public interface BatchExportService { + //查询所有任务 + List selectAll(int taskState); + +} diff --git a/src/main/java/com/emr/service/DownloadPdfBloodService.java b/src/main/java/com/emr/service/DownloadPdfBloodService.java new file mode 100644 index 00000000..49e1a8db --- /dev/null +++ b/src/main/java/com/emr/service/DownloadPdfBloodService.java @@ -0,0 +1,17 @@ +package com.emr.service; + +import com.emr.dto.DownloadPdfBloodDto; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @InterfaceName downloadPdfBloodService + * @Author linjj + * @Date 2024/4/10 17:02 + * @Version 1.0 + */ +public interface DownloadPdfBloodService { + + void downloadPdfBlood(HttpServletResponse response,DownloadPdfBloodDto dto) throws Exception; +} diff --git a/src/main/java/com/emr/service/ExportZdAssortService.java b/src/main/java/com/emr/service/ExportZdAssortService.java new file mode 100644 index 00000000..4289ae2c --- /dev/null +++ b/src/main/java/com/emr/service/ExportZdAssortService.java @@ -0,0 +1,23 @@ +package com.emr.service; + +import com.emr.vo.ExportPdfVo; +import com.emr.vo.ExportZdAssortVo; + +import java.util.List; + +/** + * @InterfaceName ExportZdAssortServe + * @Author linjj + * @Date 2024/4/10 16:59 + * @Version 1.0 + */ +public interface ExportZdAssortService { + + + + ListgetPdfPath(String masterID); + + ListselectAll(); + + +} diff --git a/src/main/java/com/emr/service/ipml/BatchExportServiceImpl.java b/src/main/java/com/emr/service/ipml/BatchExportServiceImpl.java new file mode 100644 index 00000000..ebd3431c --- /dev/null +++ b/src/main/java/com/emr/service/ipml/BatchExportServiceImpl.java @@ -0,0 +1,33 @@ +package com.emr.service.ipml; + +import com.emr.dao.BatchExportMapper; +import com.emr.service.BatchExportService; +import com.emr.vo.ExportPdfVo; +import com.emr.vo.ExportTaskVo; +import com.itextpdf.kernel.pdf.PdfDocument; +import com.itextpdf.kernel.pdf.PdfReader; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.util.List; + +/** + * @ClassName BatchExportServiceImpl + * @Description 国家病历批量导出实现类 + * @Author linjj + * @Date 2024/4/12 11:41 + * @Version 1.0 + */ +@Service +public class BatchExportServiceImpl implements BatchExportService { + @Autowired + BatchExportMapper batchExportMapper; + @Override + public List selectAll(int taskState) { + return batchExportMapper.selectAll(taskState); + } + +} diff --git a/src/main/java/com/emr/service/ipml/DownloadPdfBloodServiceImpl.java b/src/main/java/com/emr/service/ipml/DownloadPdfBloodServiceImpl.java new file mode 100644 index 00000000..ffa75270 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/DownloadPdfBloodServiceImpl.java @@ -0,0 +1,206 @@ +package com.emr.service.ipml; + + +import com.emr.dto.DownloadPdfBloodDto; +import com.emr.service.DownloadPdfBloodService; +import com.emr.service.ExportZdAssortService; + +import com.emr.vo.ExportPdfVo; +import com.itextpdf.text.Document; +import com.itextpdf.text.pdf.*; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + + + + +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +@Service +public class DownloadPdfBloodServiceImpl implements DownloadPdfBloodService { + @Autowired + ExportZdAssortService exportZdAssortService; + + @Value("${export_pdf_hospital_info}") + private String flieName; + + + @Override + public void downloadPdfBlood(HttpServletResponse response, DownloadPdfBloodDto dto) throws Exception { + String fileName; + try { + //组织导出文件名 + fileName = exportFlieName(dto); + } catch (ParseException e) { + throw new RuntimeException(e); + } + //查询当前患者需要打印的pdf + List pdfPathList = exportZdAssortService.getPdfPath(dto.getMasterId()); + downPdfResponse(fileName,response); + exportPdf(response, pdfPathList); + } + + private static void exportPdf(HttpServletResponse response, List pdfPathList) { + //上一个目录名称 + String lastOutline = null; + //是否增加标签 + boolean outFlag = true; + //标签顺序 + Integer outNum = 1; + Integer pageNum=1; + Document document = new Document(); + PdfCopy writer = null; + try { + writer = new PdfCopy(document, response.getOutputStream()); + document.open(); + PdfContentByte cb = writer.getDirectContent(); + cb.setFontAndSize(BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.NOT_EMBEDDED), 12); + cb.beginText(); + cb.showTextAligned(PdfContentByte.ALIGN_CENTER, "目录", 300, 780, 0); + cb.endText(); + // 创建目录 + PdfOutline root = cb.getRootOutline(); + for (int i = 0; i < pdfPathList.size(); i++) { + try { + String assortName = pdfPathList.get(i).getAssortName(); + if (StringUtils.isNotBlank(lastOutline) && lastOutline.equals(assortName)) { + outFlag = false; + } + if (StringUtils.isBlank(lastOutline)) { + lastOutline = assortName; + outFlag=true; + } + if (!lastOutline.equals(assortName)){ + lastOutline = assortName; + outFlag=true; + } + PdfReader reader = new PdfReader(pdfPathList.get(i).getPdfPath()); + int n = reader.getNumberOfPages(); + for (int s = 1; s <= n; s++) { + PdfImportedPage page = writer.getImportedPage(reader, s); + writer.addPage(page); + } + if (outFlag) { + //目录跳转页面内容设置。 + PdfAction action = PdfAction.gotoLocalPage(pageNum, new PdfDestination(PdfDestination.FIT), writer); + //标题目录 + String title = outNum+"."+pdfPathList.get(i).getAssortName(); + new PdfOutline(root, action, title, false); + outNum++; + } + pageNum =pageNum+getPageNum(pdfPathList.get(i)); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + if (document != null) { + document.close(); + } + } + } + + + private void downPdfResponse(String pdfName, HttpServletResponse response) { + try { + pdfName = java.net.URLEncoder.encode(pdfName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException(e); + } + response.reset(); + response.setContentType("application/pdf"); + response.setHeader("content-disposition", "attachment; filename=" + pdfName + ".pdf"); + } + + + +// private static void mulFile2One(HttpServletResponse response, DownloadPdfBloodDto dto, List pdfPathList, String fileName) { +// //获取需要导出pdf +// List filePaths = pdfPathList.stream().map(ExportPdfVo::getPdfPath).collect(Collectors.toList()); +// if (!filePaths.isEmpty()) { +// //标签顺序 +// Integer outNum = 1; +// // pdf合并工具类 +// Document document = null; +// PdfCopy copy = null; +// PdfWriter writer; +// try { +// writer = PdfWriter.getInstance(document, response.getOutputStream());//创建编写器（PDF类型） +// fileName = java.net.URLEncoder.encode(fileName, "UTF-8"); +// response.reset(); +// response.setCharacterEncoding("utf-8"); +// response.setContentType("application/pdf"); +// response.setHeader("Content-Disposition", "attachment; filename=" + fileName + ".pdf"); +// document = new Document(new PdfReader(filePaths.get(0)).getPageSize(1)); +// copy = new PdfCopy(document, response.getOutputStream()); +// document.open(); +// for (int i = 0; i < pdfPathList.size(); i++) { +// PdfReader reader = new PdfReader(pdfPathList.get(i).getPdfPath()); +// ByteArrayOutputStream bos = new ByteArrayOutputStream(); +// PdfReader pdfReader = null; +// int n = reader.getNumberOfPages(); +// for (int j = 1; j <= n; j++) { +// document.newPage(); +// PdfImportedPage page = copy.getImportedPage(reader, j); +// copy.addPage(page); +// } +// if (null != pdfReader) { +// pdfReader.close(); +// } +// reader.close(); +// try { +// bos.flush(); +// bos.close(); +// } catch (Exception e) { +// //e.printStackTrace(); +// } +// } +// } catch (Exception e) { +// //e.printStackTrace(); +// } finally { +// if (null != document) { +// document.close(); +// } +// } +// +// } +// } + + private String exportFlieName(DownloadPdfBloodDto dto) throws ParseException { + SimpleDateFormat originalFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat targetFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = originalFormat.parse(dto.getDischargeDateTime()); + String formattedDate = targetFormat.format(date); + return flieName + "_" + dto.getInpNo() + "_" + formattedDate; + } + private static int getPageNum(ExportPdfVo obj) { + FileInputStream is; + com.itextpdf.kernel.pdf.PdfReader pdfReader = null; + int pages = 0; + //创建File类 + File file = new File(obj.getPdfPath()); + //判断文件是否存在 + if (file.exists()) { + try { + is = new FileInputStream(file); + pdfReader = new com.itextpdf.kernel.pdf.PdfReader(is); + com.itextpdf.kernel.pdf.PdfDocument redDocument = new com.itextpdf.kernel.pdf.PdfDocument(pdfReader); + pages = redDocument.getNumberOfPages(); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + return pages; + } + + +} diff --git a/src/main/java/com/emr/service/ipml/ExportZdAssortServiceImpl.java b/src/main/java/com/emr/service/ipml/ExportZdAssortServiceImpl.java new file mode 100644 index 00000000..952d6ba5 --- /dev/null +++ b/src/main/java/com/emr/service/ipml/ExportZdAssortServiceImpl.java @@ -0,0 +1,34 @@ +package com.emr.service.ipml; + +import com.emr.dao.ExportZdAssortMapper; +import com.emr.dao.Zd_AssortMapper; +import com.emr.service.ExportZdAssortService; +import com.emr.vo.ExportPdfVo; +import com.emr.vo.ExportZdAssortVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName ExportZdAssortServiceImpl + * @Author linjj + * @Date 2024/4/10 17:00 + * @Version 1.0 + */ +@Service +public class ExportZdAssortServiceImpl implements ExportZdAssortService { + + @Autowired + private ExportZdAssortMapper exportZdAssortMapper; + + @Override + public List getPdfPath(String masterID) { + return exportZdAssortMapper.getPdfPath(masterID); + } + + @Override + public List selectAll() { + return exportZdAssortMapper.selectAll(); + } +} diff --git a/src/main/java/com/emr/util/PageNumUtils.java b/src/main/java/com/emr/util/PageNumUtils.java new file mode 100644 index 00000000..834a3d30 --- /dev/null +++ b/src/main/java/com/emr/util/PageNumUtils.java @@ -0,0 +1,24 @@ +package com.emr.util; + +import com.emr.vo.ExportPdfVo; + +import com.itextpdf.kernel.pdf.PdfDocument; +import com.itextpdf.kernel.pdf.PdfReader; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; + +/** + * @ClassName PageNumUyils + * @Description 获取页码工具 + * @Author linjj + * @Date 2024/4/12 12:18 + * @Version 1.0 + */ +public class PageNumUtils { + + + //获取pdf页数 + +} diff --git a/src/main/java/com/emr/vo/ExportPdfVo.java b/src/main/java/com/emr/vo/ExportPdfVo.java new file mode 100644 index 00000000..d41c49ff --- /dev/null +++ b/src/main/java/com/emr/vo/ExportPdfVo.java @@ -0,0 +1,19 @@ +package com.emr.vo; + +import lombok.Data; + +/** + * @ClassName ExportPdfVo + * @Description 导出pdf返回 + * @Author linjj + * @Date 2024/4/11 8:47 + * @Version 1.0 + */ +@Data +public class ExportPdfVo { + + private String pdfPath; + private String assortID; + private String assortSort; + private String assortName; +} diff --git a/src/main/java/com/emr/vo/ExportTaskVo.java b/src/main/java/com/emr/vo/ExportTaskVo.java new file mode 100644 index 00000000..a08456f7 --- /dev/null +++ b/src/main/java/com/emr/vo/ExportTaskVo.java @@ -0,0 +1,26 @@ +package com.emr.vo; + +import lombok.Data; + +/** + * @ClassName ExportTaskVo + * @Description 导出任务主表 + * @Author linjj + * @Date 2024/4/12 11:37 + * @Version 1.0 + */ +@Data +public class ExportTaskVo { + //批次id + private int id; + //开始时间 + private String startTime; + //结束时间 + private String endTime; + //0未开始1正在下载2下载完成 + private int taskState; + //完成数量 + private int completeNum; + //需求数量 + private int needNum; +} diff --git a/src/main/java/com/emr/vo/ExportZdAssortVo.java b/src/main/java/com/emr/vo/ExportZdAssortVo.java new file mode 100644 index 00000000..22942c80 --- /dev/null +++ b/src/main/java/com/emr/vo/ExportZdAssortVo.java @@ -0,0 +1,19 @@ +package com.emr.vo; + +import lombok.Data; + +/** + * @ClassName ExportZdAssortVo + * @Description 导出分段详情 + * @Author linjj + * @Date 2024/4/10 16:52 + * @Version 1.0 + */ +@Data +public class ExportZdAssortVo { + + private String assortId; + private String assortName; + private String assortSort; + private String exportFlag; +} diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index c29aad63..80c1eac9 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -17,3 +17,5 @@ oracleUrl = 10.6.0.150:1521/jhemr oracleUserName = jswzh oraclePassWord = jswzh123 + + diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 9d86ac92..305253da 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -83,4 +83,7 @@ pdfWater = \u5E7F\u4E1C\u533B\u79D1\u5927\u5B66\u9644\u5C5E\u533B\u9662 PdfIsError = C:\\Users\\Administrator\\Desktop\\test\\test070802 -waterTifToJpgPath = D:/jiashi/tifToJpgLoad/ \ No newline at end of file +waterTifToJpgPath = D:/jiashi/tifToJpgLoad/ + +#\u5bfc\u51fa\u4fe1\u606f\u683c\u5f0f\u9700\u8981\u4e3aunicode\u683c\u5f0f\u4e0d\u7136\u4f1a\u4e71\u7801 +export_pdf_hospital_info = \u5e7f\u4e1c\u7701_\u5e7f\u4e1c\u533b\u79d1\u5927\u5b66\u9644\u5c5e\u533b\u9662 \ No newline at end of file diff --git a/src/main/resources/mapper/BatchExpoerMapper.xml b/src/main/resources/mapper/BatchExpoerMapper.xml new file mode 100644 index 00000000..3e447b03 --- /dev/null +++ b/src/main/resources/mapper/BatchExpoerMapper.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/ExportZdAssortMapper.xml b/src/main/resources/mapper/ExportZdAssortMapper.xml new file mode 100644 index 00000000..c2b1a7f6 --- /dev/null +++ b/src/main/resources/mapper/ExportZdAssortMapper.xml @@ -0,0 +1,22 @@ + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/batchExport/batchExpoer.jsp b/src/main/webapp/WEB-INF/views/batchExport/batchExpoer.jsp new file mode 100644 index 00000000..eda4dfa7 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/batchExport/batchExpoer.jsp @@ -0,0 +1,446 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> + + + + 国家病历批量导出 + + + + + + <%@include file="../../jspf/comm.jspf" %> + + + + +
+ + +
+
+
+ + +
+ +
+
+ +
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index ee696e65..f0175bd8 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -78,7 +78,6 @@ } - .divCss4 { border-top: 1px solid #e5e5e5; width: 97.5%; @@ -100,6 +99,7 @@ /*color: gainsboro;*/ color: #c1c3c4; } + .labCss3 { /*color: gainsboro;*/ color: #060606; @@ -145,10 +145,10 @@ margin-left: -10px; } - #ztree{ + #ztree { overflow-x: hidden; overflow-y: auto; - max-height: calc(60vh ); + max-height: calc(60vh); !important; } @@ -182,20 +182,24 @@ !important; } - .img_div{ - overflow-y:auto; overflow-x:hidden; height:calc(75vh); + .img_div { + overflow-y: auto; + overflow-x: hidden; + height: calc(75vh); !important; } - .img_div2{ - overflow-y:auto; overflow-x:hidden; height:calc(75vh); + .img_div2 { + overflow-y: auto; + overflow-x: hidden; + height: calc(75vh); !important; } #imgDelPageModal .modal-content { margin-left: 5%; width: calc(200%); /*margin-left:-15%;*/ - height: calc(90vh ); + height: calc(90vh); overflow-x: hidden; overflow-y: auto; !important; @@ -461,22 +465,22 @@ } - #assortNameQX{ - width:600px; + #assortNameQX { + width: 600px; !important; } - #tableQX{ + #tableQX { text-overflow: ellipsis; white-space: nowrap; /* width:100%;*/ - overflow:auto; + overflow: auto; !important; } - #QXInfoModal .modal-content { + #QXInfoModal .modal-content { margin-left: 5%; width: calc(210%); height: calc(100vh - 80px); @@ -494,15 +498,15 @@ } - .formCss{ - margin-top:0px; - margin-left:20px; + .formCss { + margin-top: 0px; + margin-left: 20px; } - .tjCss{ - margin-left:10px; - margin-right:20px; - height:auto; + .tjCss { + margin-left: 10px; + margin-right: 20px; + height: auto; } @@ -544,9 +548,10 @@ <%--<%––%>--%> <%--<%––%>--%> <%----%> -
@@ -568,8 +573,10 @@ <%--<%––%>--%> <%--<%––%>--%> <%----%> - <%----%>
@@ -650,7 +657,7 @@ <%----%> -
- +
@@ -1308,7 +1322,8 @@ - + "; img_div.append(img_html); } } @@ -1646,12 +1662,12 @@ for (var j = 0; j < fileList.length; j++) { //通过图片名判断图片在数组中的位置然后删除 // console.log(fileList[j].name + "111"); - if(fileList[j].name!=undefined) - if (fileList[j].name == filename) { - fileList.splice(j, 1); - id--; - break; - } + if (fileList[j].name != undefined) + if (fileList[j].name == filename) { + fileList.splice(j, 1); + id--; + break; + } } files = fileList; var id = $(r).parent().attr('id'); @@ -1694,13 +1710,13 @@ //遍历数组 for (var j = 0; j < fileList.length; j++) { //通过图片名判断图片在数组中的位置然后删除 - if(fileList[j].name!=undefined) - if (fileList[j].name == filename) { - fileList.splice(j, 1); - id--; - files = fileList; - break; - } + if (fileList[j].name != undefined) + if (fileList[j].name == filename) { + fileList.splice(j, 1); + id--; + files = fileList; + break; + } } } @@ -1735,7 +1751,8 @@ //初始化类别 var selectStr = ""; - var assortIdArr=[]; + var assortIdArr = []; + function getAssortFun() { $.ajax({ url: "${path}/zdAssort/getAssort", @@ -1744,10 +1761,10 @@ async: true, success: function (result) { if (result != null && result.length > 0) { - assortIdArr=[]; + assortIdArr = []; selectStr = "