zhuliu 11 months ago
parent
commit
c399c1aae0

+ 1 - 1
public/reportTemplate/dahua/dahua.txt

@@ -200,7 +200,7 @@
                                     </div>
                                     <div v-else v-html="record.compareDescription"></div>
                                 </td>
-                                <td style="width:0;padding:0;vertical-align: initial;">
+                                <td style="width:0;padding:0;vertical-align: initial;border-right:0">
                                     <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>

+ 1 - 2
src/views/noveltySearch/components/exportReport/components/mixins.js

@@ -174,7 +174,6 @@ export default{
                 if(property){
                     data = data[property]
                 }
-                console.log(data)
                 return data
             }
             var key = field + '-' + property
@@ -194,6 +193,7 @@ export default{
                             analysis:'',
                             compareRecord:[]
                         }
+                        data.push(compareRecord1)
                         var num = 1
                         if(item.noveltyCompareRecordVOS && item.noveltyCompareRecordVOS.length>0){
                             var patent = await that.getPatentMessage(item.patentNo)
@@ -239,7 +239,6 @@ export default{
                                 num+=1
                             })
                         }
-                        data.push(compareRecord1)
                         
                     })
                     if(type == 'string'){