1

public/reportTemplate/noveltyCommon/noveltyCommon.txt

@@ -187,7 +187,11 @@
                     }
                     if(data.data && data.data.length>0){
                         data.data.forEach((item,index) => {
-                            str = `${str}${num}、${item.markSelectField}“${item.markSelectText}”揭示了“${item.technicalFeature}”${item.markNoteText}<br>`
+                            str = `${str}${num}、${item.markSelectField}“${item.markSelectText}”`
+                            if(item.technicalFeature){
+                                str = `${str}揭示了“${item.technicalFeature}”`
+                            }
+                            str = `${str}${item.markNoteText}<br>`
                             num += 1
                         });
                     }

public/reportTemplate/visionox/visionox.txt

@@ -238,7 +238,28 @@
                         },
                         {
                             field:'compareLiterature.technicalPoints',
-                            type:'string',
+                            type:'function',
+                            useFunction:(data)=>{
+                                var str = ''
+                                var num = 1
+                                if(data.noveltyCompareRecordVOS){
+                                    data.noveltyCompareRecordVOS.forEach((item,index) => {
+                                        str = `${str}${num}、${item.markNoteText}<br>`
+                                        num += 1
+                                    });
+                                }
+                                if(data.data && data.data.length>0){
+                                    data.data.forEach((item,index) => {
+                                        str = `${str}${num}、${item.markSelectField}“${item.markSelectText}”`
+                                        if(item.technicalFeature){
+                                            str = `${str}揭示了“${item.technicalFeature}”`
+                                        }
+                                        str = `${str}${item.markNoteText}<br>`
+                                        num += 1
+                                    });
+                                }
+                                return str
+                            },
                             key:'technicalPoints'
                         },
                         {

src/views/noveltySearch/components/noveltySearchCard.vue

@@ -169,7 +169,7 @@ import createNoveltySearch from './dialog/createNoveltySearch.vue';
       //切换也大小
       handleSizeChange(val){
           this.queryParams.current = 1
-          this.queryParams.size = 10
+          this.queryParams.size = val
           this.getList()
       },
       //排序