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 fa42b801f..c309c19a3 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 @@ -886,6 +886,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, @@ -900,6 +902,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, List lawsMonthlyReportTitleTemplateEOS, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index f6aadd8d1..b74545fc0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -42,6 +42,7 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPageSz; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSectPr; +import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTSpacing; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTString; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTStyle; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTblLayoutType; @@ -107,17 +108,17 @@ public class WordUtil { //设置行间距 -// if(!"cover".equals(flag) && !"oneTitle".equals(flag)){ -// CTP ctp = titleParagraph.getCTP(); -// CTPPr ppr = ctp.isSetPPr() ? ctp.getPPr() : ctp.addNewPPr(); -// CTSpacing spacing = ppr.isSetSpacing()? ppr.getSpacing() : ppr.addNewSpacing(); -// spacing.setAfter(BigInteger.valueOf(0)); -// spacing.setBefore(BigInteger.valueOf(0)); + if(!"cover".equals(flag) && !"oneTitle".equals(flag)){ + CTP ctp = titleParagraph.getCTP(); + CTPPr ppr = ctp.isSetPPr() ? ctp.getPPr() : ctp.addNewPPr(); + CTSpacing spacing = ppr.isSetSpacing()? ppr.getSpacing() : ppr.addNewSpacing(); + spacing.setAfter(BigInteger.valueOf(120));//行间距后段为6磅 + spacing.setBefore(BigInteger.valueOf(300));//行间距前段为15磅, 300是通过单位换算来的 // //设置行距类型为 EXACT // spacing.setLineRule(STLineSpacingRule.EXACT); // //1磅数是20 -// spacing.setLine(BigInteger.valueOf(40*20)); -// } +// spacing.setLine(BigInteger.valueOf(1*20)); + } //设置段落左对齐 if (align == null) { diff --git a/jero-web/package.json b/jero-web/package.json index f144b3265..c6b13b18e 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -47,6 +47,7 @@ "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.1", "vue-splitpane": "^1.0.4", + "vue-virtual-scroll-list": "^2.3.4", "vuedraggable": "^2.20.0", "vuex": "^3.1.0", "vxe-table": "2.9.13", diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 81110e8fe..c1a20eec6 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1316,4 +1316,5 @@ module.exports = { viewConsistentAssessment:'View Consistent Assessment', viewAll:'View All', endProcess:'End Process', + thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 915e962fd..6790de6e1 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1417,4 +1417,5 @@ module.exports = { viewConsistentAssessment:'查看一致评估', viewAll:'查看全部', endProcess:'结束流程', + thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单', } \ No newline at end of file diff --git a/jero-web/src/components/virtualNodeTree/tree.vue b/jero-web/src/components/virtualNodeTree/tree.vue index e346d48e3..a98fea522 100644 --- a/jero-web/src/components/virtualNodeTree/tree.vue +++ b/jero-web/src/components/virtualNodeTree/tree.vue @@ -76,7 +76,7 @@ type: Array }, echoData: { - type: Array + type: String }, keeps: { type: Number, @@ -213,7 +213,6 @@ }, []) }, getInitCheckedKeys(datas) { - console.log(datas) let keys = datas.reduce((conn, data) => { if (data.checked != null && data.checked === true) { conn.push(data[this.nodeKey]) @@ -233,11 +232,6 @@ }, getNodeKey(node) { - console.log(node) - console.log(this.echoData) - if (this.echoData.includes(node.id)) { - node.checked = true - } return getNodeKey(this.nodeKey, node.data) }, @@ -589,6 +583,9 @@ ::v-deep .el-tree-node:hover { background: #fff !important; } + ::v-deep .is-focus .el-checkbox__inner{ + border-color: #21c9cc !important; + }