合并分支 'dev_third_stage' 到 'master'

Dev third stage

查看合并请求 laws-nio/laws-weilai!167

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<SarFileCompareInf
                 double compareSimilarity = 0.0;
                 if (null != leftTxt && !leftTxt.isEmpty()) {
                     for (int j = 0; j < rightItemList.size(); j++) {
+                        if(null == rightItemList.get(j).getTargetStand()){
+                            rightItemList.get(j).setTargetStand(-1);
+                        }
                         String rightTxt = rightItemList.get(j).getItemsText();
                         if (null != rightTxt && !rightTxt.isEmpty()) {
                             double similarity = CompHanLPUtils.findSimilarity(leftTxt.trim(), rightTxt.trim());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/utils/DiffUtils.java

@@ -2229,6 +2229,9 @@ public class DiffUtils {
     }
 
     public List<String> getHtmlDiffStr(String text1,String text2){
+        text1 = text1.replaceAll("<img.*\\>", "");
+        text2 = text2.replaceAll("<img.*\\>", "");
+
         LinkedList<Diff> diffs = diff_main(text1, text2);
         //定义输出结果
         String LResultStr="";

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationItemResultEOServiceImpl.java

@@ -331,6 +331,10 @@ public class LawsTechnologyEvaluationItemResultEOServiceImpl extends ServiceImpl
 						}
 					}
 
+					if(StringUtils.isNotEmpty(itemContent)){
+						itemContent = itemContent.replaceAll("<p>","").replaceAll("</p>","\r\n");
+					}
+
 					dataRow.createCell(2).setCellValue(itemContent);
 					dataRow.createCell(3).setCellValue(exportData.get(dataIndex).getEvaluatorName());
 					dataRow.createCell(4).setCellValue(exportData.get(dataIndex).getEvaluationMethodsName());

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

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

jero-web/src/views/parameter/parameterexport/index.vue

@@ -44,10 +44,10 @@
         :columns="columns"
       >
         <span slot="projectName" slot-scope="text,record" :title="text">
-            {{ text && text.length > 15 ? text.slice(0, 14) + '...' : text }}
+            {{ text }}
         </span>
         <span slot="templateName" slot-scope="text,record" :title="text">
-            {{ text && text.length > 25 ? text.slice(0, 21) + '...' : text }}
+            {{ text }}
         </span>
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" v-has="'report:exportTemplate:edit'" @click="edit(record)">{{$t('edit')}}</a>
@@ -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'
         },
         {