zhuliu vor 1 Jahr
Ursprung
Commit
5b568afd28

+ 5 - 5
src/views/components/import/conditionImport/searchResult.vue

@@ -430,11 +430,11 @@ export default {
         var params = {
           appNo: item.rowApplicationNo,
         }
-        this.$api.getPictureGuid(params).then(response => {
-          if (response.code == 200) {
-            this.$set(item, 'pictureGuid', response.data)
-          }
-        })
+        // this.$api.getPictureGuid(params).then(response => {
+        //   if (response.code == 200) {
+        //     this.$set(item, 'pictureGuid', response.data)
+        //   }
+        // })
         this.$api.getLegalStatus(params).then(response => {
           if (response.code == 200) {
             this.$set(item, 'legalStatus', response.data)

+ 7 - 0
src/views/project/patentCollection/components/mixins/index.js

@@ -57,6 +57,13 @@ export const projectData = {
     handleClick(row, index) {
       var location = (index + 1) + ((this.queryParams.current - 1) * this.queryParams.size)
       this.$emit('clickPatentNo', row, location)
+      if(row.showPopover){
+        this.$set(row,'showPopover',false)
+        this.$nextTick(()=>{
+          this.$set(row,'showPopover',true)
+        })
+      }
+      
     },
     changeSelect(patent) {
       const index1 = this.patentNoList.indexOf(patent.patentNo)

+ 17 - 6
src/views/project/patentCollection/components/views/Table.vue

@@ -33,7 +33,7 @@
                     <div class="patent-abstract-image text-align_center">
                       <el-image fit="contain" :src="outside?scope.row.pictureGuid:$commonJS.checkViewer(scope.row.pictureGuid)" 
                         :preview-src-list="[outside?scope.row.pictureGuid:$commonJS.checkViewer(scope.row.pictureGuid)]" style="vertical-align:middle;"
-                        :style="{ width: scope.row.imgWidth ? scope.row.imgWidth : '100%', height: scope.row.imgHeight ? scope.row.imgHeight : '100%' }">
+                        >
                         <div slot="error" class="image-slot">
                           <img src="https://www.patentstar.com.cn/img/Common/nopic.jpg" alt="" style="">
                         </div>
@@ -49,15 +49,15 @@
                   </td>
                 </tr>
               </table>
-              <template v-if="scope.row.ifSearch" slot="reference">
+              <template  slot="reference">
                 <el-link  type="primary" @click="handleClick(scope.row, scope.$index)">
                   <span v-html="getView(scope.row, item.value, item.type)"></span>
                 </el-link>
               </template>
-              <template v-else slot="reference">
+              <!-- <template v-else slot="reference">
                   <span v-html="getView(scope.row, item.value, item.type)"></span>
                   <span>(未匹配到专利)</span>
-              </template>
+              </template> -->
               
             </el-popover>
           </div>
@@ -138,7 +138,18 @@ export default {
   },
   methods: {
     showPopover(row){
+      if(this.outside && !row.showPopover){
+        var params = {
+          appNo: row.rowApplicationNo,
+        }
+        this.$api.getPictureGuid(params).then(response => {
+          if (response.code == 200) {
+            this.$set(row, 'pictureGuid', response.data)
+          }
+        })
+      }
       this.$set(row,'showPopover',true)
+      
     },
     // 排序
     sortChange({ column, prop, order }) {
@@ -189,8 +200,8 @@ export default {
     height: 150px;
     line-height: 150px;
 
-    img {
-      width: 100%;
+    .el-image {
+      width:100%;
       height: 100%;
     }
   }

+ 14 - 9
src/views/project/patentDetails/components/patentMessage/PatentBasic.vue

@@ -61,9 +61,8 @@
       </el-col>
       <el-col :span="6">
          <el-card shadow="never" class="text-align_center " style="margin-top:50px;" data-type="附图">
-          <div style="height: 200px;" class="picture">
-            <el-image fit="contain
-" :src="outside?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)" :preview-src-list="[outside?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)]" :style="{width:patent.imgWidth?patent.imgWidth:'100%',height:patent.imgHeight?patent.imgHeight:'100%'}">
+          <div  class="picture">
+            <el-image  fit="contain" style="vertical-align:middle;" :src="outside?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)" :preview-src-list="[outside?patent.pictureGuid:$commonJS.checkViewer(patent.pictureGuid)]" >
               <div slot="error" class="image-slot">
                 <img @click="exportData('4')" src="https://www.patentstar.com.cn/img/Common/nopic.jpg" alt="" >
               </div>
@@ -84,8 +83,8 @@
                   <el-descriptions-item label="申请日"><div class="patent-basic-value"  v-html="getViewDom(patent.appDate,'申请日')"></div></el-descriptions-item>
                   <el-descriptions-item label="公开号"><div class="patent-basic-value" v-html="getViewDom(patent.publicNo,'公开号')"></div></el-descriptions-item>
                   <el-descriptions-item label="公开日"><div class="patent-basic-value"  v-html="getViewDom(patent.publicDate,'公开日')"></div></el-descriptions-item>
-                  <el-descriptions-item label="授权号" v-if="patent.publicAccreditNo"><div class="patent-basic-value"  v-html="getViewDom(patent.grantNo,'授权号')"></div></el-descriptions-item>
-                  <el-descriptions-item label="授权日" v-if="patent.publicAccreditDate"><div class="patent-basic-value"  v-html="getViewDom(patent.grantDate,'授权日')"></div></el-descriptions-item>
+                  <el-descriptions-item label="授权号" v-if="patent.grantNo"><div class="patent-basic-value"  v-html="getViewDom(patent.grantNo,'授权号')"></div></el-descriptions-item>
+                  <el-descriptions-item label="授权日" v-if="patent.grantDate"><div class="patent-basic-value"  v-html="getViewDom(patent.grantDate,'授权日')"></div></el-descriptions-item>
                   <el-descriptions-item label="优先权" v-if="patent.priorityNo"><div class="patent-basic-value"  v-html="getViewDom(patent.priorityNo,'优先权')+ '&nbsp;&nbsp;&nbsp;&nbsp;' +getViewDom(patent.priorityDate)"></div></el-descriptions-item>
                 </el-descriptions>
               </el-tab-pane>
@@ -102,7 +101,7 @@
               <el-tab-pane label="相关人" name="0">
                 <el-descriptions :column="1">
                   <el-descriptions-item label="申请人" labelStyle="width:90px" v-if="patent.applicant" contentStyle="display:flex;flex-direction: row;flex-wrap: wrap;justify-content: flex-start;">
-                   <div class="patent-basic-value" v-for="item in patent.applicant" :key="item">
+                   <div class="patent-basic-value" v-for="(item,index) in patent.applicant" :key="index">
                     <div class="margin-right_10">
                       <span v-html="getViewDom(item,'申请人')"></span>
                       <span v-if="item.shortName" v-html="'(标:'+getViewDom(item.shortName,'申请人')+')'"></span>
@@ -113,7 +112,7 @@
                    <div class="patent-basic-value" v-if="patent.applicantAddr" v-html="getViewDom(patent.applicantAddr.address,'申请人地址')"></div>
                 </el-descriptions-item>
                <el-descriptions-item label="权利人" labelStyle="width:90px" v-if="patent.rightHolder" contentStyle="display:flex;flex-direction: row;flex-wrap: wrap;justify-content: flex-start;">
-                 <div class="patent-basic-value" v-for="item in patent.rightHolder" :key="item">
+                 <div class="patent-basic-value" v-for="(item,index) in patent.rightHolder" :key="index">
                   <div class="margin-right_10">
                     <span v-html="getViewDom(item,'权利人')"></span>
                     <span v-if="item.shortName" v-html="'(标:'+getViewDom(item.shortName,'权利人')+')'"></span>
@@ -218,7 +217,12 @@ export default {
   }
 }
 </script>
-
+<style lang="scss" scoped>
+.picture{
+  height:200px;
+  width:250px;
+}
+</style>
 <style lang="scss">
 
 .patent-basic {
@@ -227,7 +231,8 @@ export default {
   // height:calc(100% + 30px) ;
   // padding-bottom: 10px;
   .el-image {
-    width: 100%;
+    height:100%;
+    width:100%;
   }
   .patent-basic-label {
     color: #6b6868;

+ 3 - 3
src/views/project/patentDetails/index.vue

@@ -6,14 +6,14 @@
     <div class="height_100 content">
       <my-View :showView="showView">
         <div slot="left" style="width:100%">
-          <notPatentDetails v-if="evidenceType == 1" :projectId="projectId" :signPatentNo="signPatentNo" :reportType="reportType" :evidence="evidenceData"></notPatentDetails>
+          <notPatentDetails v-if="evidenceType == 1 " :projectId="projectId" :signPatentNo="signPatentNo" :reportType="reportType" :evidence="evidenceData"></notPatentDetails>
           <!-- <Patent-Details :patentNo="patentNo" :projectId="projectId" :taskId="taskId"></Patent-Details> -->
           <component v-else :is='components' :patentNo="(signPatentNo && showView)?signPatentNo:patentNo" :value="showView" :evidence="evidenceData" :outside="outside" :projectType="projectType" :lock="signPatentNo?true:false" :signPatentNo="signPatentNo"  :projectId="projectId" :taskId="taskId"
             :reportType="reportType" :isResult="isResult"></component>
         </div>
         <div slot="right" style="width:100%">
-          <notPatentDetails v-if="evidenceType == 1" :projectId="projectId" :signPatentNo="signPatentNo" :reportType="reportType" :evidence="evidenceData"></notPatentDetails>
-          <Patent-Details v-else :patentNo="patentNo" :outside="outside" :value="showView" :projectType="projectType" :evidence="evidenceData" :signPatentNo="signPatentNo" :reportType="reportType" :projectId="projectId" :taskId="taskId"></Patent-Details>
+          <notPatentDetails v-if="evidenceType == 1 && showView" :projectId="projectId" :signPatentNo="signPatentNo" :reportType="reportType" :evidence="evidenceData"></notPatentDetails>
+          <Patent-Details v-else-if="showView" :patentNo="patentNo" :outside="outside" :value="showView" :projectType="projectType" :evidence="evidenceData" :signPatentNo="signPatentNo" :reportType="reportType" :projectId="projectId" :taskId="taskId"></Patent-Details>
         </div>
       </my-View>
     </div>