1

src/views/components/import/conditionImport/searchResult.vue

@@ -530,8 +530,13 @@ export default {
           let records = response.data.data
           if(params.semanteme){
             records.forEach(item=>{
-              var score = (item.score * 100 + '').substring(0, 5)
-              item.score =  Number(score)
+              if(!item.score){
+                item.score =  'error'
+              }else{
+                var score = (item.score * 100 + '').substring(0, 5)
+                item.score =  Number(score)
+              }
+              
             })
           }
           this.tableData = records
@@ -642,7 +647,7 @@ export default {
         return
       }
       this.tableData.forEach(item=>{
-        var params = {
+        let params = {
           projectId:this.projectId,
           patentScoreDTOList:[]
         }
@@ -657,6 +662,10 @@ export default {
         this.$api.getPatentSimilarMess(params).then(response=>{
           if(response.code == 200){
             var data = response.data.patentScoreDTOList
+            if(!data){
+              this.$set(item, 'score', 'error')
+              return
+            }
             for(var i = 0;i<this.tableData.length;i++){
               var item1 = this.tableData[i]
               var index = data.findIndex(j=>{
@@ -666,9 +675,13 @@ export default {
                 var score = (data[index].score * 100 + '').substring(0, 5)
                 this.$set(item1, 'score', Number(score))
                 data.splice(index,1)
+              }else{
+                this.$set(item1, 'score', 'error')
               }
             }
           }
+        }).catch(error=>{
+          this.$set(item, 'score', 'error')
         })
       })
       return

src/views/project/patentCollection/components/views/Abstract.vue

@@ -62,6 +62,7 @@
                     <el-tag class="margin-left_10" style="cursor: pointer;" type="primary" effect="plain" size="small"  v-if="noveltySearch && noveltyIsRemark(patent)" @click="openAddRemark(patent)">已标注</el-tag>
                     <div v-if="(outside&&noveltySearch) || semanteme" style="display:inline-block;width:300px;margin-left:20px;height:20px" >
                       <span v-if="!patent.score || patent.score == 'NaN'" style="font-size:12px;">相关度加载中<i class="el-icon-loading"></i></span>
+                      <span v-else-if="patent.score == 'error'" style="font-size:12px;"></span>
                       <el-progress v-else style="display:inline-block;width:300px;margin-left:20px;" text-color="#000000" :text-inside="true" :stroke-width="20"  :percentage="patent.score"  :color="customColors" ></el-progress>
                     </div>
                     

src/views/project/patentCollection/components/views/Picture.vue

@@ -29,7 +29,10 @@
             <div class="noWrap" v-html="getView(item, 'title')"></div>
           </myTooltip>
           <div v-if="(outside&&noveltySearch) || semanteme">
-            <span>相关度</span><span v-if="!item.score"><i class="el-icon-loading"></i></span><el-progress v-else style="display:inline-block;width:calc(100% - 50px);margin-left:10px;" :text-inside="true" :stroke-width="20"  :percentage="item.score"  :color="customColors" ></el-progress>
+            <span>相关度：</span>
+            <span v-if="!item.score"><i class="el-icon-loading"></i></span>
+            <span v-else-if="item.score == 'error'">无</span>
+            <el-progress v-else style="display:inline-block;width:calc(100% - 50px);margin-left:10px;" :text-inside="true" :stroke-width="20"  :percentage="item.score"  :color="customColors" ></el-progress>
           </div>
         </div>
         <div class="picture text-align_center" style="height: 200px;width:100%;line-height:200px;">

src/views/project/patentCollection/components/views/Table.vue

@@ -101,12 +101,13 @@
       </el-table-column>
       <el-table-column v-if="(outside&&noveltySearch) || semanteme" label="相关度" width="100" fixed="right">
         <template slot-scope="scope">
-          <el-progress v-if="scope.row.score" :text-inside="true" :stroke-width="20"  :percentage="scope.row.score"  :color="customColors"></el-progress>
+          <el-progress v-if="scope.row.score && scope.row.scope!='error'" :text-inside="true" :stroke-width="20"  :percentage="scope.row.score"  :color="customColors"></el-progress>
+          <span v-else-if="scope.row.score == 'error'"></span>
           <span v-else style="font-size:12px;">相关度加载中<i class="el-icon-loading"></i></span>
         </template>
       </el-table-column>
     </el-table>
-    <addRemark ref="addRemark" :projectId="projectId" v-on="$listeners"></addRemark>
+    <addRemark ref="addRemark" :projectId="projectId" v-on="$listeners" v-if="noveltySearch"></addRemark>
   </div>
 </template>
 

src/views/report/components/checkPatent/checkPatent.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 选择专利弹窗 -->
   <div>
-    <el-dialog title="选择专利" :visible.sync="dialogVisible" width="800px" :before-close="handleClose">
+    <el-dialog title="选择专利" :visible.sync="dialogVisible" width="800px" @close="handleClose()" :close-on-click-modal="false" :append-to-body="true">
       <el-container>
         <el-header style="display: flex;align-items: center;">
           <slot name="head">
@@ -14,7 +14,7 @@
           </slot>
           
         </el-header>
-        <el-main style="height:calc(100vh - 300px)">
+        <el-main style="height:calc(100vh - 350px)">
           <Table :column="column" :tableData="tableData" :queryParams="queryParams" :refresh="refresh" v-loading="loading"
             :patentNoList.sync="patentNoList" :projectId="projectId" @on-sort="handleSort"></Table>
         </el-main>

src/views/report/components/productResult/productResult.vue

@@ -105,7 +105,7 @@
     <teamwork ref="teamwork" :projectId="projectId" :reportType="reportType"></teamwork>
 
     <!-- 选择专利弹窗 -->
-    <checkPatent ref="checkPatent" @checkPatentList="checkPatentList" sign="teamwork"
+    <checkPatentDialog ref="checkPatent" @checkPatentList="checkPatentList" sign="teamwork"
        :compareResult="compareResult" :tableData2="tableData2">
       <div slot="head">
         <el-select v-model="compareResult" clearable @change="changePatent" placeholder="请选择对比结果">
@@ -113,20 +113,20 @@
           </el-option>
         </el-select>
       </div>
-    </checkPatent>
+    </checkPatentDialog>
 
   </div>
 </template>
 
 <script>
 import CreateReport from '@/views/report/components/dialog/addAndEditReport.vue'
-import checkPatent from '../checkPatent/checkPatent.vue'
+import checkPatentDialog from '../checkPatent/checkPatent.vue'
 import teamwork from "@/views/report/components/dialog/teamwork.vue"
 import splitPage from '../splitPage/splitPage.vue'
 export default {
   components: {
     CreateReport,
-    checkPatent,
+    checkPatentDialog,
     teamwork,
     splitPage
   },