diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java index c148912d6..c97fca666 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareInfoServiceImpl.java @@ -155,6 +155,9 @@ public class SarFileCompareInfoServiceImpl extends ServiceImpl getHtmlDiffStr(String text1,String text2){ + text1 = text1.replaceAll("", ""); + text2 = text2.replaceAll("", ""); + LinkedList diffs = diff_main(text1, text2); //定义输出结果 String LResultStr=""; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index f0d6c667d..71f10fc1f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -494,7 +494,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl splitStr(String str){ + //检查参数是否合法 + if (null == str || str.equals("")) { + return new ArrayList<>(); + } + int length = 3; + int n = (str.length() + length - 1) / length; //获取整个字符串可以被切割成字符子串的个数 + List list = new ArrayList<>(); + for (int i = 0; i < n; i++) { + if (i < (n - 1)) { + list.add(str.substring(i * length, (i + 1) * length)) ; + } else { + list.add(str.substring(i * length)); + } + } + return list; + } + + /** + * 判断字符串是否完全由数字组成 + * @param str + * @return + */ + public boolean verifyFigure(String str){ + Pattern p = Pattern.compile("[0-9]*"); + Matcher m = p.matcher(str); + return m.matches(); + } + /** + * 判断字符串是否完全由字母组成 + * @param str + * @return + */ + public boolean verifyEn(String str){ + Pattern enPatten = Pattern.compile("^[a-zA-Z]*"); + Matcher enMatch = enPatten.matcher(str); + return enMatch.matches(); + } + /** + * 判断字符串是否完全由数字和字母组成 + * @param str + * @return + */ + public boolean verifyFigureAndEn(String str){ + Pattern figureAndEnPattern = Pattern.compile("[0-9a-zA-Z]{1,}"); + Matcher figureAndEnMatcher = figureAndEnPattern.matcher(str); + return figureAndEnMatcher.matches(); } /** @@ -553,6 +564,9 @@ public class WordUtil { //表格属性 CTTblPr tablePr = table.getCTTbl().addNewTblPr(); + //固定列宽(英文和数字的时候自动换行) + CTTblLayoutType ctTblLayoutType = tablePr.isSetTblLayout() ? tablePr.getTblLayout() : tablePr.addNewTblLayout(); + ctTblLayoutType.setType(STTblLayoutType.FIXED); //表格宽度 CTJc cTJc = tablePr.addNewJc(); //居中 @@ -597,6 +611,9 @@ public class WordUtil { XWPFTable table = document.createTable(newOpinionTemplateEOList.size()+1, 4); //表格属性 CTTblPr tablePr = table.getCTTbl().addNewTblPr(); + //固定列宽(英文和数字的时候自动换行) + CTTblLayoutType ctTblLayoutType = tablePr.isSetTblLayout() ? tablePr.getTblLayout() : tablePr.addNewTblLayout(); + ctTblLayoutType.setType(STTblLayoutType.FIXED); //表格宽度 CTJc cTJc = tablePr.addNewJc(); //居中 @@ -632,6 +649,9 @@ public class WordUtil { XWPFTable table = document.createTable(newStandardTemplateEOList.size()+1, 5); //表格属性 CTTblPr tablePr = table.getCTTbl().addNewTblPr(); + //固定列宽(英文和数字的时候自动换行) + CTTblLayoutType ctTblLayoutType = tablePr.isSetTblLayout() ? tablePr.getTblLayout() : tablePr.addNewTblLayout(); + ctTblLayoutType.setType(STTblLayoutType.FIXED); //表格宽度 CTJc cTJc = tablePr.addNewJc(); //居中 @@ -809,11 +829,29 @@ public class WordUtil { ctTblWidth0.setW(BigInteger.valueOf(2000)); CTTblWidth ctTblWidth1 = table.getRow(number).getCell(1).getCTTc().addNewTcPr().addNewTcW(); ctTblWidth1.setType(STTblWidth.DXA); - ctTblWidth1.setW(BigInteger.valueOf(5000)); + ctTblWidth1.setW(BigInteger.valueOf(6000)); + +// XWPFParagraph para = table.getRow(number).getCell(1).getParagraphs().get(0); +// XWPFRun run = para.createRun();//对某个段落设置格式 +// run.addBreak();//换行 table.getRow(number).getCell(0).setText(fieldName); table.getRow(number).getCell(1).setText(technologyTerritory); + } +// private static void setCell(XWPFTable table, int number, String fieldName,String technologyTerritory) { +// +// table.getRow(number).setHeight(500); +// CTTblWidth ctTblWidth0 = table.getRow(number).getCell(0).getCTTc().addNewTcPr().addNewTcW(); +// ctTblWidth0.setType(STTblWidth.DXA); +// ctTblWidth0.setW(BigInteger.valueOf(2000)); +// CTTblWidth ctTblWidth1 = table.getRow(number).getCell(1).getCTTc().addNewTcPr().addNewTcW(); +// ctTblWidth1.setType(STTblWidth.DXA); +// ctTblWidth1.setW(BigInteger.valueOf(5000)); +// +// table.getRow(number).getCell(0).setText(fieldName); +// table.getRow(number).getCell(1).setText(technologyTerritory); +// } // private static void setCell(XWPFTableRow tableRow, String fieldName,String technologyTerritory) { // // tableRow.setHeight(500); diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index bda28497b..49369bcd8 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -221,7 +221,7 @@ selectedRowrowValue: [], dataSource: [], pageNo: 1, - pageSize: 10, + pageSize: 100, pageSizeOptions: ['100', '200'], total: 0, searchParmes: {}, @@ -505,7 +505,9 @@ getTableListReset() { let params = { paramsManifestId: this.$route.query.id, - userTypes: this.currentPersonRole + userTypes: this.currentPersonRole, + pageNo:this.pageNo, + pageSize:this.pageSize } this.loading = true this.$emit('listReset', '') diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 7bf1cd665..5521247db 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -767,6 +767,11 @@ export default { this.loading = true getAction(this.url.list, params).then(res => { if (res.success) { + if (res.result.pageList.current > 1 && res.result.pageList.records.length == 0) { + this.pageNo = 1 + this.loadData() + return + } this.dataSource = res.result.pageList.records || [] this.authmanage =res.result.auth_manage this.total = res.result.pageList.total diff --git a/jero-web/src/views/parameter/parameterexport/index.vue b/jero-web/src/views/parameter/parameterexport/index.vue index 70e73ed56..b60c0964e 100644 --- a/jero-web/src/views/parameter/parameterexport/index.vue +++ b/jero-web/src/views/parameter/parameterexport/index.vue @@ -44,10 +44,10 @@ :columns="columns" > - {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }} + {{ text }} - {{ text && text.length > 25 ? text.slice(0, 21) + '...' : text }} + {{ text }} {{$t('edit')}} @@ -150,6 +150,7 @@ export default { title: this.$t('templateName'), align: 'center', dataIndex: 'templateName', + ellipsis: true, width: 300, scopedSlots: { customRender: 'templateName' } }, @@ -157,25 +158,29 @@ export default { title: this.$t('contentDescription'), align: 'center', dataIndex: 'description', + ellipsis: true, width: 300, scopedSlots: { customRender: 'projectName' } }, { title: this.$t('status'), align: 'center', - width: 100, + width: 120, + ellipsis: true, dataIndex: 'state_dictText' }, { title: this.$t('creater'), align: 'center', - width: 100, + width: 120, + ellipsis: true, dataIndex: 'createBy' }, { title: this.$t('Latestupdatetime'), align: 'center', width: 180, + ellipsis: true, dataIndex: 'updateTime' }, {