1

public/reportTemplate/dahua/dahua.txt

@@ -62,9 +62,9 @@
     </div>
     <div class="mainContent">
         <div class="title">一、技术方案的分析</div>
-        <div>
+        <div @click="edit('technicalCase','remark')">
             <div class="title2">1、方案概述</div>
-            <div class="content" @click="edit('technicalCase','remark')">
+            <div class="content" >
                 <div v-if="isEdit('technicalCase','remark')">
                     <myRichText editModel="clean" v-model="reportData.technicalCase.remark" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                 </div>
@@ -89,9 +89,9 @@
                 </el-upload>
             </div>
         </div>
-        <div>
+        <div @click="edit('technicalCase','inventionPoint')">
             <div class="title2">3、主要发明点</div>
-            <div class="content" @click="edit('technicalCase','inventionPoint')">
+            <div class="content">
                 <div v-if="isEdit('technicalCase','inventionPoint')">
                     <myRichText editModel="clean" v-model="reportData.technicalCase.inventionPoint" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                 </div>
@@ -101,13 +101,13 @@
     </div>
     <div class="mainContent">
         <div class="title">二、检索关键词及检索式</div>
-        <div>
+        <div  @click="edit('baseMessage','searchKeyWord')">
             <div class="title2">1、检索关键词</div>
-            <div class="content" @click="edit('baseMessage','searchKeyWord')">
+            <div class="content">
                 <div v-if="isEdit('baseMessage','searchKeyWord')">
                     <myRichText editModel="clean" v-model="reportData.baseMessage.searchKeyWord" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                 </div>
-                <div v-else v-html="getColumnData('baseMessage','searchKeyWord',dataObj.baseMessage.searchKeyWord)"></div>
+                <div v-else v-html="getColumnData('baseMessage','searchKeyWord')"></div>
             </div>
         </div>
         <div>
@@ -151,16 +151,21 @@
                 </table>
             </div>
         </div>
-        <div>
+        <div @click="edit('searchRecord','searchDB')">
             <div class="title2">3、检索数据库</div>
-            <div class="content"></div>
+             <div class="content">
+                <div v-if="isEdit('baseMessage','searchDB')">
+                    <myRichText editModel="clean" v-model="reportData.baseMessage.searchDB" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
+                </div>
+                <div v-else v-html="getColumnData('baseMessage','searchDB',()=>{ var data = this.dataObj.searchRecord; if(!data || data.length == 0){return ""};[...new Set(data.map(i=>this.dbTypes[i.dbType]?'小世系统':i.dbType))].join('、')})"></div>
+            </div>
         </div>
     </div>
     <div class="mainContent">
         <div class="title">三、新颖性和/或创造性评述</div>
-        <div>
+        <div @click="edit('baseMessage','searchResult')">
             <div class="title2">1、检索结果</div>
-            <div class="content" @click="edit('baseMessage','searchResult')">
+            <div class="content" >
                 <div v-if="isEdit('baseMessage','searchResult')">
                     <myRichText editModel="clean" v-model="reportData.baseMessage.searchResult" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
                 </div>
@@ -171,8 +176,11 @@
             <div class="title2">2、检索结果分析</div>
             <div>
                 <div v-for="(item,index) in getCompareRecordData2('array','compareRecord')" :key="index">
-                    <div>
-                        <div v-html="item.compareFile"></div>
+                    <div @click="edit('compareRecord','compareFile',index)">
+                        <div v-if="isEdit('compareRecord','compareFile',index)">
+                            <myRichText editModel="clean" v-model="item.compareFile" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
+                        </div>
+                        <div v-else v-html="item.compareFile"></div>
                     </div>
                     <div v-if="item.compareRecord && item.compareRecord.length>0">
                         <table>
@@ -180,30 +188,66 @@
                                 <td>对比文本</td>
                                 <td>对比说明</td>
                             </tr>
-                            <tr>
-                                <td></td>
-                                <td></td>
+                            <tr style="position: relative;" v-for="(record,ind) in item.compareRecord" :key="ind">
+                                <td @click="edit('compareRecord.compareRecord','compareText',ind)">
+                                    <div v-if="isEdit('compareRecord.compareRecord','compareText',ind)">
+                                        <myRichText editModel="clean" v-model="record.compareText" customStyle="border:none;padding:0" :autoFocus="true" @blur="clearEdit()"></myRichText>
+                                    </div>
+                                    <div v-else v-html="record.compareText"></div>
+                                </td>
+                                <td @click="edit('compareRecord.compareRecord','compareDescription',ind)">
+                                    <div v-if="isEdit('compareRecord.compareRecord','compareDescription',ind)">
+                                        <myRichText editModel="clean" v-model="record.compareDescription" customStyle="border:none;padding:0" :autoFocus="true" @blur="clearEdit()"></myRichText>
+                                    </div>
+                                    <div v-else v-html="record.compareDescription"></div>
+                                </td>
+                                <td style="width:0;padding:0;vertical-align: initial;">
+                                    <span class="funBtn">
+                                        <el-button type="" size="mini" icon="el-icon-plus" circle @click="addCompareRecord(item.compareRecord,ind)"></el-button>
+                                        <el-button size="mini" type="danger" icon="el-icon-delete" circle @click="delCompareRecord(item.compareRecord,ind)"></el-button>
+                                    </span>
+                                </td>
                             </tr>
                         </table>
                     <div>
-                    <div class="content"></div>
+                    <div class="content" @click="edit('compareRecord','analysis',index)">
+                        <div v-if="isEdit('compareRecord','analysis',index)">
+                            <myRichText editModel="clean" v-model="item.analysis" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
+                        </div>
+                        <div v-else v-html="item.analysis"></div>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
     <div class="mainContent">
         <div class="title">三、结论及建议</div>
-        <div>
+        <div @click="edit('baseMessage','analysisAndConclusion')">
             <div class="title2">1、分析结论：</div>
-            <div class="content"></div>
+            <div class="content">
+                <div v-if="isEdit('baseMessage','analysisAndConclusion')">
+                    <myRichText editModel="clean" v-model="reportData.baseMessage.analysisAndConclusion" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
+                </div>
+                <div v-else v-html="getColumnData('baseMessage','analysisAndConclusion',dataObj.baseMessage.preliminaryConclusions)"></div>
+            </div>
         </div>
-        <div>
+        <div @click="edit('baseMessage','applicationAdvice')">
             <div class="title2">2、建议：</div>
-            <div class="content"></div>
+            <div class="content">
+                <div v-if="isEdit('baseMessage','applicationAdvice')">
+                    <myRichText editModel="clean" v-model="reportData.baseMessage.applicationAdvice" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
+                </div>
+                <div v-else v-html="getColumnData('baseMessage','applicationAdvice',dataObj.baseMessage.applicationAdvice)"></div>
+            </div>
         </div>
-        <div>
+        <div @click="edit('baseMessage','writeAdvice')">
             <div class="title2">3、撰写要点建议</div>
-            <div class="content"></div>
+            <div class="content">
+                <div v-if="isEdit('baseMessage','writeAdvice')">
+                    <myRichText editModel="clean" v-model="reportData.baseMessage.writeAdvice" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>
+                </div>
+                <div v-else v-html="getColumnData('baseMessage','writeAdvice',dataObj.baseMessage.writeAdvice)"></div>
+            </div>
         </div>
     </div>
   </div>

public/reportTemplate/noveltyCommon/noveltyCommon.txt

@@ -86,7 +86,7 @@
                     <td>关键词</td>
                     <td>数量</td>
                 </tr>
-                <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{ let dB = {CN:'中国数据库','WD':'全球数据库'}; return {conditions:item2.conditions,totalNum:item2.totalNum,area:dB[item2.dbType]?dB[item2.dbType]:'',dbType:dB[item2.dbType]?'小世系统':item2.dbType}}): [{}])" :key="index">
+                <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{ return {conditions:item2.conditions,totalNum:item2.totalNum,area:this.dbTypes[item2.dbType]?this.dbTypes[item2.dbType]:'',dbType:this.dbTypes[item2.dbType]?'小世系统':item2.dbType}}): [{}])" :key="index">
                     
                     <td @click="edit('searchRecord','area',index)">
                         <div v-if="isEdit('searchRecord','area',index)">

public/reportTemplate/visionox/visionox.txt

@@ -137,7 +137,7 @@
                             <td class="center">关键词</td>
                             <td class="center width_50">数量</td>
                         </tr>
-                        <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{ let dB = {CN:'中国数据库','WD':'全球数据库'}; return {conditions:item2.conditions,totalNum:item2.totalNum,area:dB[item2.dbType]?dB[item2.dbType]:'',dbType:dB[item2.dbType]?'小世系统':item2.dbType}}): [{}])" :key="index">
+                        <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{ return {conditions:item2.conditions,totalNum:item2.totalNum,area:this.dbTypes[item2.dbType]?this.dbTypes[item2.dbType]:'',dbType:this.dbTypes[item2.dbType]?'小世系统':item2.dbType}}): [{}])" :key="index">
                             <td @click="edit('searchRecord','area',index)">
                                 <div v-if="isEdit('searchRecord','area',index)">
                                     <myRichText editModel="clean" v-model="item.area" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>

public/reportTemplate/weixinnuo-chenxian/weixinnuo-chenxian.txt

@@ -99,7 +99,7 @@
                             <td class="center">关键词</td>
                             <td class="center width_50">数量</td>
                         </tr>
-                        <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{ let dB = {CN:'中国数据库','WD':'全球数据库'}; return {conditions:item2.conditions,totalNum:item2.totalNum,area:dB[item2.dbType]?dB[item2.dbType]:'',dbType:dB[item2.dbType]?'小世系统':item2.dbType}}): [{}])" :key="index">
+                        <tr style="position: relative;" v-for="(item,index) in getColumnData('searchRecord',null,(dataObj.searchRecord && dataObj.searchRecord.length>0)?dataObj.searchRecord.map(item2=>{ return {conditions:item2.conditions,totalNum:item2.totalNum,area:this.dbTypes[item2.dbType]?this.dbTypes[item2.dbType]:'',dbType:this.dbTypes[item2.dbType]?'小世系统':item2.dbType}}): [{}])" :key="index">
                             <td @click="edit('searchRecord','area',index)">
                                 <div v-if="isEdit('searchRecord','area',index)">
                                     <myRichText editModel="clean" v-model="item.area" customStyle="border:none;padding:0" :autoFocus="true" @blur="saveMessage"></myRichText>

src/views/noveltySearch/components/exportReport/components/mixins.js

@@ -48,6 +48,10 @@ export default{
             },
             hasCopy:{
 
+            },
+            dbTypes:{
+                CN:'中国数据库',
+                'WD':'全球数据库'
             }
         }
     },
@@ -189,11 +193,39 @@ export default{
                             analysis:'',
                             compareRecord:[]
                         }
+                        var num = 1
+                        if(item.noveltyCompareRecordVOS && item.noveltyCompareRecordVOS.length>0){
+                            var patent = await that.getPatentMessage(item.patentNo)
+                            var abstractStr = ''
+                            if(patent.abstractStr){
+                                var patentObj = patent.abstractStr.find(item => {
+                                    return item.if_origin
+                                })
+                                if (patentObj) {
+                                    abstractStr = obj.text_content
+                                }
+                            }
+                            
+                            item.noveltyCompareRecordVOS.forEach(i=>{
+                                var obj = {
+                                    index:num,
+                                    compareText:abstractStr?`[摘要原文]${abstractStr}`:'',
+                                    compareDescription:i.markNoteText
+                                }
+                                compareRecord1.compareRecord.push(obj)
+                                num+=1
+                            })
+                        }
                         var data = compareRecord[item.patentNo]||[]
                         if(data.length>0){
                             data.forEach((i,ind)=>{
+                                if(ind == 0){
+                                    if(i.generalRemark){
+                                        compareRecord1.analysis = i.generalRemark
+                                    }
+                                }
                                 var obj = {
-                                    index:ind+1,
+                                    index:num,
                                     compareText:`[${i.markSelectField}]${i.markSelectText}`,
                                     compareDescription:""
                                 }
@@ -203,6 +235,7 @@ export default{
                                 }
                                 obj.compareDescription = str
                                 compareRecord1.compareRecord.push(obj)
+                                num+=1
                             })
                         }
                         data.push(compareRecord1)
@@ -214,9 +247,12 @@ export default{
                             str = `${str}${item.compareFile}<br>`
                             if(item.compareRecord.length>0){
                                 item.compareRecord.forEach(i=>{
-                                    str = `${str}  ${i.compareText}（${i.compareDescription}）`
+                                    str = `${str}  ${i.compareText}（${i.compareDescription}）<br>`
                                 })
                             }
+                            if(item.analysis){
+                                str = `${str}  ${item.analysis}<br>`
+                            }
                         })
                         this.setColumnData(str,field,property)
                     }else{