Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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<LawsMonthly
 				false, false, "Blue Sky Noto Regular",null,null,flag);
 		WordUtil.exportWord(document, moth+"\r\n", null, ParagraphAlignment.CENTER, 0, 12,
 				false, true, "Blue Sky Noto Regular",null,null,flag);
+		//添加下一页
+		document.createParagraph().createRun().addBreak(BreakType.PAGE);
 	}
 	//封面
 	private void coverEn(List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS,
@@ -900,6 +902,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 				false, false, "Blue Sky Noto Regular",null,null,flag);
 		WordUtil.exportWord(document, moth+"\r\n", null, ParagraphAlignment.CENTER, 0, 12,
 				false, true, "Blue Sky Noto Regular",null,null,flag);
+		//添加下一页
+		document.createParagraph().createRun().addBreak(BreakType.PAGE);
 	}
 	private void wordContent(List<LawsMonthlyReportWriteEO> lawsMonthlyReportWriteEOS,
 					  List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS,

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) {

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",

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',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1417,4 +1417,5 @@ module.exports = {
   viewConsistentAssessment:'查看一致评估',
   viewAll:'查看全部',
   endProcess:'结束流程',
+  thereForTheCurrentlySelectedData:'当前所选数据暂无标准分解单',
 }

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;
+  }
 </style>
 <style>
   .el-tree {

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue

@@ -458,6 +458,8 @@
                   id: this.formInline.bussDocumentLibraryId.split(',')[index]
                 })
               })
+            } else {
+              this.formInline.standNumber = []
             }
             this.formInline = { ...this.formInline }
           } else {
@@ -575,7 +577,7 @@
         this.$refs.ruleForm.validate(valid => {
           if (valid) {
             let formInline = JSON.parse(JSON.stringify(this.formInline))
-            if (formInline.standNumber && formInline.standNumber.length > 0){
+            if (formInline.standNumber && formInline.standNumber.length > 0) {
               formInline.standNumber = formInline.standNumber.join(',')
             }
             this.loading = true
@@ -805,6 +807,7 @@
     height: 38px;
     margin-right: 10px;
   }
+
   .itemOption {
     display: inline-block;
     width: 100%;

jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue

@@ -14,7 +14,7 @@
         </span>
       </div>
       <div class="content-box-content">
-        <div class="content-box-content-top" v-html="queryForm.content">
+        <div class="content-box-content-top ql-editor" v-html="queryForm.content">
 
         </div>
         <div class="content-box-content-botton">
@@ -102,7 +102,7 @@
           <div class="commentContent-text-one" v-for="(val,index1) in item.problemKnowledgeBaseCommentVOList"
                v-if="item.problemKnowledgeBaseCommentVOList && item.problemKnowledgeBaseCommentVOList.length > 0">
             <div class="commentContent-header">
-<!--              <span class="commentContent-yuan"></span>-->
+              <!--              <span class="commentContent-yuan"></span>-->
               <span class="commentContent-title">{{val.createBy}}</span>
               <span class="commentContent-time">{{val.createTime}}</span>
             </div>
@@ -151,6 +151,10 @@
 
 <script>
   import { getAction, postAction, downloadFile, putAction } from '@/api/manage'
+  import 'quill/dist/quill.core.css'
+  import 'quill/dist/quill.snow.css'
+  import 'quill/dist/quill.bubble.css'
+  import { quillEditor } from 'vue-quill-editor'
   import SelectedBy from '@/components/SelectedBy/index'
   import { mapGetters } from 'vuex'
   import { Base64 } from 'js-base64'
@@ -210,7 +214,7 @@
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
         if (fileSuffix == '.pdf') {
-          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username))
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id + '&userName=' + this.userInfo().username))
         } else if (fileSuffix == '.docx' || fileSuffix == '.doc') {
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
@@ -223,7 +227,7 @@
         }
       },
       download(item) {
-        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id ,userName:this.userInfo().username})
+        downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username })
       },
       getData(val) {
         this.queryBase = val
@@ -426,6 +430,7 @@
       border-bottom: 1px solid #E6E6E9;
       display: flex;
       align-items: center;
+
       .icon-left {
         font-size: 16px;
         margin-right: 6px;
@@ -700,6 +705,7 @@
     display: inline-block;
     margin-left: 3px;
   }
+
   .Required {
     color: red;
     margin-right: 4px;

jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue

@@ -491,7 +491,11 @@
       },
       standardDecompositionDocumentClick() {
         if (this.standardDecomposition && this.standardDecomposition.length > 0) {
-          this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])), this.standardList)
+          if (this.standardDecomposition[0].sarFileSplitInfoList && this.standardDecomposition[0].sarFileSplitInfoList.length > 0) {
+            this.$refs.standardDecompositionSheetRef.getData(JSON.parse(JSON.stringify(this.standardDecomposition[0])), this.standardList)
+          } else {
+            this.$message.warning(this.$t('thereForTheCurrentlySelectedData'))
+          }
         } else {
           this.$message.warning(this.$t('pleaseSelectStandardFirst'))
         }

jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue

@@ -226,7 +226,7 @@
         this.sarFileSplitInfoList = this.standData.sarFileSplitInfoList || []
         this.sarFileSplitInfoList = [...this.sarFileSplitInfoList]
         this.queryParam = {}
-        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
+        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : null
         this.visible = true
         if (this.queryParam.info_id) {
           this.pageNo = 1
@@ -251,7 +251,7 @@
       },
       searchReset() {
         this.queryParam = {}
-        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : ''
+        this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : null
         if (this.queryParam.info_id) {
           this.pageNo = 1
           this.replacePage()

jero-web/src/views/regulationsKanban/components/addModel.vue

@@ -343,7 +343,7 @@
               serialNumber: val.serialNumber,
               TaskKey: val.prehomoTaskDefinitionKey,
               flowType: 3,
-              isDisplay: isTrue,
+              isDisplay: isDisplay,
               id: val.projectLibraryId,
               Sponsor: 'prehomoInitiatorName',
               personLiable: 'prehomoDutyName',
@@ -374,7 +374,7 @@
               projectTaskInventoryId: val.projectLawsInventoryId,
               TaskKey: val.verifyTaskDefinitionKey,
               flowType: 4,
-              isDisplay: isTrue,
+              isDisplay: isDisplay,
               Sponsor: 'verifyInitiatorName',
               personLiable: 'verifyDutyName',
               typeOfDeliverables: 'verifyDeliverableTypeName',