From 63ae1789e76a29341325551469df3ce9108268b3 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 28 Sep 2022 15:29:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E4=B8=80=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=A1=B5(=E5=8D=95=E7=8B=AC=E5=8D=A0?= =?UTF-8?q?=E7=94=A8=E4=B8=80=E9=A1=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 2f9b7629c..bb694f82a 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 @@ -38,6 +38,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.poi.hssf.usermodel.HeaderFooter; +import org.apache.poi.xwpf.usermodel.BreakType; import org.apache.poi.xwpf.usermodel.ParagraphAlignment; import org.apache.poi.xwpf.usermodel.TOC; import org.apache.poi.xwpf.usermodel.XWPFDocument; @@ -916,6 +917,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl 1){ + document.createParagraph().createRun().addBreak(BreakType.PAGE); + } if(StringUtils.isNotBlank(oneTitle)){ WordUtil.exportWord(document, oneNumber+" "+oneTitle, null, ParagraphAlignment.LEFT, 0, 14, false, true, "Blue Sky Noto Regular","0","一级标题"); @@ -939,6 +944,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl 1){ + document.createParagraph().createRun().addBreak(BreakType.PAGE); + } if(StringUtils.isNotBlank(twoTitle)){ WordUtil.exportWord(document, twoNumber+" "+twoTitle, null, ParagraphAlignment.LEFT, 0, 12, false, true, "Blue Sky Noto Regular","1","二级标题"); From 42dd0b698e74d2fde172bb4e57d086fdcf739285 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 15:47:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PersonnelSelection/index.vue | 163 +++- .../components/problemKnowledgeBaseList.vue | 523 +++++++++++-- .../problemKnowledgeBaseListView.vue | 707 ++++++++++++++++++ .../components/TermInformation.vue | 9 +- 4 files changed, 1329 insertions(+), 73 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 49b1d73c5..0ed9c5187 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -31,11 +31,39 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + import { getAction, postAction } from '@/api/manage' + import XEUtils from 'xe-utils' + import VXETable from 'vxe-table' export default { name: 'index', @@ -65,6 +95,7 @@ loading: true, gData: [], autoExpandParent: true, + checkboxList: [], expandedKeys: [], visible: false, treeVisible: false, @@ -83,15 +114,94 @@ }, methods: { + // loadTree(size) { + // this.loading = true + // setTimeout(() => { + // const trerData = JSON.parse(JSON.stringify(this.gData)) + // // 将树结构拍平，构建列表树结构 + // XEUtils.eachTree(trerData, (item, index, items, paths, parent, nodes) => { + // // 层级 + // item._LEVEL = nodes.length - 1 + // // 是否展开 + // item._EXPAND = false + // // 是否可视 + // item._VISIBLE = !item._LEVEL + // // 是否有子节点 + // item._HAS_CHILDREN = item.children && item.children.length > 0 + // // 是否叶子节点 + // item._IS_LEAF = !item._HAS_CHILDREN + // }) + // this.tree = trerData + // this.refreshTree() + // this.loading = false + // }, 200) + // }, + // // 切换树节点的展开、收缩 + // toggleTreeNode(row) { + // if (row._HAS_CHILDREN) { + // this.setTreeExpand(row, !row._EXPAND) + // } + // }, + // setTreeExpand(row, isExpand) { + // const matchObj = XEUtils.findTree(this.tree, item => item === row) + // row._EXPAND = isExpand + // if (matchObj) { + // XEUtils.eachTree(matchObj.item.children, (item, index, items, path, parent) => { + // item._VISIBLE = parent ? parent._EXPAND && parent._VISIBLE : isExpand + // }) + // } + // this.refreshTree() + // }, + // refreshTree() { + // const treeList = XEUtils.toTreeArray(this.tree) + // this.fullList = treeList + // this.gData = treeList.filter(item => item._VISIBLE) + // }, standardClick() { this.treeVisible = false this.departId = '' this.searchModel = '' this.userIds = [] this.userName = [] - this.queryDepartUserTreeList(1) + // let gData = localStorage.getItem('gData') + // if (gData) { + // this.gData = this.toTree(JSON.parse(gData)) + // this.treeVisible = true + // this.loadTree() + // } else { + this.queryDepartUserTreeList(1) + // } this.visible = true }, + //将数据拼成树形结构 + toTree(config) { + // 删除 所有 children,以防止多次调用 + config.forEach(function(item) { + delete item.children + }) + // 将数据存储为 以 id 为 KEY 的 map 索引数据列 + let map = {} + config.forEach((item) => { + item.label = item.name + item.key = item.id + + item.title = item.name + (item.itemName ? ' ' + item.itemName : '') + map[item.id] = item + }) + let val = [] + config.forEach((item) => { + // 以当前遍历项，的pid,去map对象中找到索引的id + let parent = map[item.parentId] + // 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中 + if (parent) { + (parent.children || (parent.children = [])).push(item) + } else { + //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级 + val.push(item) + } + }) + return val + }, standardDelete() { this.$emit('input', null) this.$forceUpdate() @@ -103,7 +213,7 @@ // }, onCheck(checkedKeys, info) { - this.userIds = checkedKeys.checked + this.userIds = checkedKeys this.userName = [] if (this.userIds.length > 0) { for (let i = 0; i < this.userIds.length; i++) { @@ -227,6 +337,8 @@ gData = '' } this.confirmLoading = true + //queryDepartUserTreeList + //queryUserTreeList postAction('sys/user/queryDepartUserTreeList', { departId: this.departId, json: gData, @@ -234,7 +346,10 @@ }).then((res) => { this.confirmLoading = false if (res.success) { + this.loading = false + // localStorage.setItem('gData', JSON.stringify(res.result)) this.gData = res.result + // this.gData[0].isLeaf = false this.defaultExpandedKeys = [this.departId] if (num == 1) { if (this.userName && this.userName.length == 0) { @@ -312,4 +427,46 @@ height: calc(100% - 60px); overflow: auto; } + + .my-tree { + padding: 0 10px; + /*border: 1px solid #e8eaec;*/ + } + + .my-tree .my-tree-item { + height: 32px; + line-height: 32px; + } + + .my-tree .my-tree-item.has-child .tree-icon { + visibility: visible; + transition: all 0.3s; + } + + .my-tree .my-tree-item.is-expand .tree-icon { + transform: rotate(90deg); + } + + .my-tree .tree-icon { + cursor: pointer; + width: 20px; + line-height: 20px; + text-align: center; + visibility: hidden; + user-select: none; + } + + .caret-right { + margin-right: 4px; + font-size: 14px; + } + + .checkbox { + margin-right: 8px; + } + + ::v-deep .ant-checkbox-group { + width: 100%; + height: 600px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index d22898423..a73a4a075 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -1,20 +1,8 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 6d44acfc8..2a792a313 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -261,16 +261,23 @@ itemId: res.id, itemNum: res.items_num, itemName: res.items_name, - itemContent: res.iterms_conditions + itemContent: res.iterms_conditions, + zhan3_shi4_shun4_xu4: res.zhan3_shi4_shun4_xu4 || '' }) }) } this.dataList = this.ImportFileData.concat(this.dataListData) + this.dataList.sort((a, b) => { + a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + }) this.dataList = [...this.dataList] }, getPersonnelList(res) { this.ImportFileData = this.ImportFileData.concat(res) this.dataList = this.dataListData.concat(this.ImportFileData) + this.dataList.sort((a, b) => { + a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + }) this.dataList = [...this.dataList] }, getUUID() { From c2b90c7ff59d36e7e81dc9654032cd0f657b0ca1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 28 Sep 2022 15:53:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?,=E6=AF=8F=E8=A1=8C=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 bb694f82a..789ae882b 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 @@ -736,9 +736,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl