专利清单

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

@@ -23,7 +23,7 @@
         </div>
       </el-header>
       <el-main id="patent-list-container" v-loading="loading">
-        <div>
+        <div class="height_100">
           <component
             ref="patentViewList"
             :is="viewSelected"

src/views/project/patentCollection/components/mixins/index.js

@@ -66,17 +66,23 @@ export const handleData = {
     
   },
   methods: {
-    getViewDom2(row, key, field) {
-      let text = ""
-      const change = row.change
-      text = !change ? row[key][0].text_content : row[key][1].text_content
-      return this.getViewDom(text,field)
-    },
     getView(row,key,type,prop,data) {
       var obj = {
         type: type?type:'String',
         value: key
       }
+        const change = row.change
+        const change2 = row.change2
+        switch (key) {
+          case "title":
+            prop = !change ? "content" : "contentOut"
+            obj.type = 'Object'
+            break
+          case "abstractStr":
+            prop = !change2 ? "content" : "contentOut"
+            obj.type = 'Object'
+            break
+        }
       var text = this.$commonJS.getColumnData(row, obj,prop,data)
       return this.getViewDom(text,key)
     },
@@ -137,7 +143,7 @@ export const handleData = {
     //切换原文译文 
     handleChange(row, key) {
       switch (key) {
-        case "name":
+        case "title":
           row.change = !row.change
           break
         case "abstractStr":

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

@@ -60,7 +60,7 @@
                     <el-col :span="24" v-if="t()">
                       <span class="patent-abstract_label">标题:</span>
                       <span class="patent-abstract_text">
-                        <span v-html="getViewDom2(patent, 'title')"></span>
+                        <span v-html="getView(patent, 'title')"></span>
                         <el-link v-if="projectId" type="primary" @click.native="handleChange(patent, 'title')"
                           style="margin-left: 10px;">
                           <span v-if="!patent.change">切换译文</span>
@@ -93,12 +93,12 @@
                     <el-col :span="24">
                       <span class="patent-abstract_label">权利人:</span>
                       <span class="patent-abstract_text" v-if="patent.applicant">
-                        <template v-for="(item, index) in patent.applicant.filter(a => a.dataType === 1)">
-                          <el-link type="primary">
+                        <span v-for="(item) in patent.applicant.filter(a => a.dataType === 1)" :key="item.name">
+                          <el-link type="primary" >
                             <span v-html="getView(item.name)"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </template>
+                        </span>
                       </span>
                     </el-col>
                   </el-row>
@@ -106,12 +106,12 @@
                     <el-col :span="24">
                       <span class="patent-abstract_label">申请人:</span>
                       <span class="patent-abstract_text" v-if="patent.applicant">
-                        <template v-for="(item, index) in patent.applicant.filter(a => a.dataType === 2)">
-                          <el-link type="primary">
+                        <span v-for="(item) in patent.applicant.filter(a => a.dataType === 2)" :key="item.name">
+                          <el-link type="primary" >
                             <span v-html="getView(item.name)"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </template>
+                        </span>
                       </span>
                     </el-col>
                   </el-row>
@@ -119,12 +119,12 @@
                     <el-col :span="24">
                       <span class="patent-abstract_label">发明人:</span>
                       <span class="patent-abstract_text">
-                        <template v-for="(item, index) in patent.inventor">
+                        <span v-for="(item) in patent.inventor" :key="item.name">
                           <el-link type="primary">
                             <span v-html="getView(item.name)"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </template>
+                        </span>
                       </span>
                     </el-col>
                   </el-row>
@@ -132,12 +132,12 @@
                     <el-col :span="24">
                       <span class="patent-abstract_label">IPC分类号:</span>
                       <span class="patent-abstract_text">
-                        <template v-for="(item, index) in patent.ipcList">
+                        <span v-for="(item) in patent.ipcList" :key="item">
                           <el-link type="primary">
                             <span v-html="getView(item)"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </template>
+                        </span>
                       </span>
                     </el-col>
                   </el-row>
@@ -146,12 +146,12 @@
                       <span class="patent-abstract_label">简单同族:</span>
                       <span class="patent-abstract_text">
                         <!-- <template v-for="(item, index) in patent.family.simple"> -->
-                        <template v-for="(item, index) in patent.simpleFamilyNum">
+                        <span v-for="(item) in patent.simpleFamilyNum" :key="item">
                           <el-link type="primary" @click.native="handleFamily(item)">
                             <span v-html="getView(item)"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </template>
+                        </span>
                       </span>
                     </el-col>
                   </el-row>
@@ -160,12 +160,12 @@
                       <span class="patent-abstract_label">INPADOC同族:</span>
                       <span class="patent-abstract_text">
                         <!-- <template v-for="(item, index) in patent.family.inpadoc"> -->
-                        <template v-for="(item, index) in patent.simpleFamilyNum">
+                        <span v-for="(item) in patent.simpleFamilyNum" :key="item">
                           <el-link type="primary" @click.native="handleFamily(item)">
                             <span v-html="getView(item)"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </template>
+                        </span>
                       </span>
                     </el-col>
                   </el-row>
@@ -174,12 +174,12 @@
                       <span class="patent-abstract_label">PatSnap同族:</span>
                       <span class="patent-abstract_text">
                         <!-- <template v-for="(item, index) in patent.family.patSnap"> -->
-                        <template v-for="(item, index) in patent.simpleFamilyNum">
+                        <span v-for="(item) in patent.simpleFamilyNum" :key="item">
                           <el-link type="primary" @click.native="handleFamily(item)">
                             <span v-html="getView(item)"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </template>
+                        </span>
                       </span>
                     </el-col>
                   </el-row>
@@ -187,7 +187,7 @@
                     <el-col :span="24">
                       <span class="patent-abstract_label">摘要:</span>
                       <div>
-                        <span v-html="getViewDom2(patent, 'abstractStr')"></span>
+                        <span v-html="getView(patent, 'abstractStr')"></span>
                         <el-link v-if="projectId" type="primary" @click.native="handleChange(patent, 'abstractStr')">
                           <span v-if="!patent.change2">切换译文</span>
                           <span v-else>切换原文</span>

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

@@ -2,7 +2,7 @@
   <!-- 图片视图 -->
   <div class="pic">
     <div class="item" style="padding:10px;display: flex;flex-wrap: wrap;">
-      <el-card shadow="hover" v-for="(item, index) in tableData" style="width:200px">
+      <el-card shadow="hover" v-for="(item, index) in tableData" style="width:200px" :key="index">
         <div slot="header"
           style="width: 100%; white-space: nowrap;overflow-x: hidden;text-overflow: ellipsis;font-size:12px;">
           <div>序号：{{ (index + 1) + ((queryParams.current - 1) * queryParams.size) }}</div>
@@ -17,8 +17,8 @@
               </el-link>
 
             </el-checkbox> </span>
-          <el-tooltip effect="dark" :content="getViewDom2(item,'title')" placement="left">
-            <span style="" v-html="getViewDom2(item,'title')"></span>
+          <el-tooltip effect="dark" :content="getView(item,'title')" placement="left">
+            <span style="" v-html="getView(item,'title')"></span>
           </el-tooltip>
         </div>
         <div class="picture text-align_center" style="height: 200px;width:100%;line-height:200px;">

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

@@ -1,6 +1,6 @@
 <template>
-  <div class="patent-table-list-view height_100">
-    <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header"  @sort-change="sortChange">
+  <div class="patent-table-list-view height_100" v-DivHeight="getDivHeight">
+    <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header" :maxHeight="tableHeight" @sort-change="sortChange">
       <el-table-column label="#" width="60" type="index" align="center">
         <template slot-scope="scope">
           <span>{{ (scope.$index + 1) + ((queryParams.current - 1) * queryParams.size) }}</span>
@@ -11,11 +11,49 @@
         :key="item.value" :prop="item.value" :label="item.name" sortable="custom" align="center">
         <template slot-scope="scope">
           <div v-if="['patentNo'].includes(item.value)">
-            <el-link type="primary" @click="handleClick(scope.row, item.value)">
-              <span v-html="$commonJS.getColumnData(scope.row, item)"></span>
+          <el-popover placement="right-start" width="500" trigger="hover" >
+            <table class="patent-popover-table" >
+              <tr>  
+                <td>
+                  <div class="patent-abstract-image text-align_center" >
+                    <el-image :src="$commonJS.checkViewer(scope.row.pictureGuid)" :preview-src-list="[$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>
+                    </el-image>
+                  </div>
+                </td>
+                <td>
+                  <p v-html="getView(scope.row, 'abstractStr')"></p>
+                  <el-link v-if="projectId" type="primary" @click.native="handleChange(scope.row, 'abstractStr')">
+                    <span v-if="!scope.row.change2">切换译文</span>
+                    <span v-else>切换原文</span>
+                  </el-link>
+                </td>
+              </tr>
+            </table>
+            <el-link slot="reference"  type="primary" @click="handleClick(scope.row, item.value)">
+              <span v-html="getView(scope.row, item.value,item.type)"></span>
             </el-link>
+          </el-popover>
           </div>
-          <div v-else v-html="$commonJS.getColumnData(scope.row, item)"></div>
+          <template v-else-if="item.value === 'title'">
+              <span v-html="getView(scope.row, 'title')"></span>
+              <br>
+              <el-link v-if="projectId" type="primary" @click.native="handleChange(scope.row, 'title')">
+                <span v-if="!scope.row.change">切换译文</span>
+                <span v-else>切换原文</span>
+              </el-link>
+            </template>
+            <template v-else-if="item.value === 'abstractStr'">
+              <span v-html="getView(scope.row, 'abstractStr')"></span>
+              <br>
+              <el-link v-if="projectId" type="primary" @click.native="handleChange(scope.row, 'abstractStr')">
+                <span v-if="!scope.row.change2">切换译文</span>
+                <span v-else>切换原文</span>
+              </el-link>
+            </template>
+          <div v-else v-html="getView(scope.row, item.value,item.type)"></div>
         </template>
       </el-table-column>
 
@@ -24,9 +62,10 @@
 </template>
 
 <script>
-import {projectData} from '../mixins/index'
+import {projectData,handleData} from '../mixins/index'
+import { getTableHeight } from '@/views/components/mixins'
 export default {
-  mixins: [projectData],
+  mixins: [projectData,handleData,getTableHeight],
   components: {
 
   },

src/views/project/patentCollection/index.vue

@@ -95,7 +95,7 @@
 
         </el-header>
         <el-main v-loading="loading">
-          <div>
+          <div class="height_100">
             <component ref="patentViewList" :is="viewSelected" @download="handleDownload" @change-read="handleChangeRead"
               :projectId="projectId" :selected.sync="queryParams.selected" :patentNoList.sync="patentNoList"
               :column="customList" @index-setting="handleIndexSetting" @on-sort="handleSort" :queryParams="queryParams"

src/views/project/patentDetails/components/patentDetails.vue

@@ -15,7 +15,7 @@
                       patent.simpleStatus }}</el-tag>
                   </div>
                   <div style="color: #6b6868; font-size: 15px;padding-bottom: 5px;">
-                    <span v-html="getViewDom2(patent, 'name')"></span>
+                    <span v-html="getView(patent, 'title')"></span>
                     <el-link v-if="projectId" type="primary" @click.native="handleChange(patent, 'name')"
                       style="margin-left: 10px;margin-top: -3px;">
                       <span v-if="!patent.change">切换译文</span>

src/views/project/patentDetails/components/patentMessage/PatentBasic.vue

@@ -6,7 +6,7 @@
           <el-col :span="24">
             <el-tabs value="0">
               <el-tab-pane label="摘要" name="0">
-                <p class="common" :data-type="'摘要'+(patent.change2?'译文':'原文')" :style="setStyle()" v-html="getViewDom2(patent, 'abstractStr','摘要'+(patent.change2?'译文':'原文'))"></p>
+                <p class="common" :data-type="'摘要'+(patent.change2?'译文':'原文')" :style="setStyle()" v-html="getView(patent, 'abstractStr','摘要'+(patent.change2?'译文':'原文'))"></p>
                
              <span>
                  <el-link v-if="projectId" type="primary" @click.native="handleChange(patent, 'abstractStr')" >

src/views/report/components/dialog/addAndEditReport.vue

@@ -981,4 +981,11 @@ export default {
 
 };
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss">
+  // .el-input__inner{
+  //   pointer-events: none;
+  // }
+  // .el-input__inner:empty{
+  //   content:'--'
+  // }
+</style>