Merge branch 'product' of http://1.116.113.26:8088/zhuliu/xiaoshi_system into product

src/assets/css/main.scss

@@ -130,4 +130,14 @@
     }
   }
   
-  
+  
+//tab
+.basic_header{
+  padding: 0 !important;
+  width: 100%;
+  align-items: end;
+  border-bottom:0 ;
+  .el-tabs__header{
+    margin: 0;
+  }
+}

src/views/product/components/details/components/index.vue

@@ -122,19 +122,5 @@ import framework from '../../framework/viewIndex.vue'
     },
   };
   </script>
-  <style lang="scss" scoped>
-  .basic_header{
-    padding: 0 !important;
-    width: 100%;
-    align-items: end;
-    border-bottom:0 ;
-  }
-  </style>
-  <style lang="scss">
-    .basic_header{
-        .el-tabs__header{
-            margin: 0;
-        }
-    }
-  </style>
+
   

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

@@ -0,0 +1,54 @@
+<template>
+  <div class="PatentLeft" style="">
+    
+    <div
+      style="display: flex;justify-content: space-evenly;height: 50px;line-height: 50px;border-bottom: 1px solid #ccc;">
+      <div>总专利数量：2篇</div>
+    </div>
+    <div class="left-patentNo">
+      <div>CN202210250237.X</div>
+      <el-tooltip content="一种金属带卷制雨伞管的加工设备" placement="bottom-start">
+        <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">一种金属带卷制雨伞管的加工设备</div>
+      </el-tooltip>
+    </div>
+    <div class="left-patentNo">
+      <div>CN202210250234.6</div>
+      <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">一种雨伞管加工设备</div>
+    </div>
+    
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+     
+    }
+  },
+  mounted() {
+
+  },
+  methods: {
+  
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.PatentLeft{
+  .left-patentNo {
+    border-bottom: 1px solid #ccc;
+    overflow: hidden;
+    padding: 5px 10px;
+    height: 60px;
+    color: #333;
+    font-size: 14px;
+    padding-top: 10px;
+  }
+
+  .left-patentNo:hover {
+    background: #cdd7eb;
+  }
+}
+  </style>

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

@@ -31,7 +31,7 @@
             </el-tooltip>
           </el-header>
           <el-main style="background: #FFFFFF;">
-            <!-- <PatentLeft></PatentLeft> -->
+            <PatentLeft :patentList="patentList"></PatentLeft>
           </el-main>
           <el-footer style="text-align: center;">
             <el-pagination background layout=" prev, pager, next" :current-page.sync="queryParams.current"
@@ -96,8 +96,11 @@
 </template>
 
 <script>
+import PatentLeft from './PatentLeft.vue';
 export default {
-  components: {},
+  components: {
+    PatentLeft
+  },
   props: {
     projectId:{
       default:0
@@ -112,17 +115,38 @@ export default {
             current:1,
             size:10,
         },
-        total:0
+        total:0,
+        patentList:[]
     };
   },
   watch: {},
   computed: {},
   created() {},
-  mounted() {},
+  mounted() {
+    this.getPatentList()
+  },
   methods: {
+    getPatentList(){
+      let params = {
+        ...this.queryParams,//分页信息
+        projectId: this.projectId,
+        // searchQuery: this.$commonJS.objectToString(this.searchOption),//检索条件
+        // orderDTOList: this.sort,//排序信息
+      }
+      this.$api.QueryPatent(params).then(res => {
+        if (res.code == 200) {
+          this.patentList = res.data.data
+          this.total = res.data.total
+        }
+      }).catch(error => {
+        this.patentList = []
+        this.total = 0
+      })
+    },
     //分页
     handleCurrentChange(val){
         this.queryParams.current = val
+        this.getPatentList()
     },
     goBack(){
 

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

@@ -101,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.filter(a => a.dataType === 2)" :key="item.name">
+                   <div class="patent-basic-value" v-for="item in patent.applicant" :key="item">
                     <div class="margin-right_10">
                       <span v-html="getViewDom(item.name,'申请人')"></span>
                       <span v-if="item.shortName" v-html="'(标：'+getViewDom(item.shortName,'申请人')+')'"></span>
@@ -109,10 +109,10 @@
                    </div>
                 </el-descriptions-item>
                 <el-descriptions-item label="申请人地址" labelStyle="width:90px" v-if="patent.applicant">
-                   <div class="patent-basic-value" v-if="patent.applicant.filter(a => a.dataType === 2)[0]" v-html="getViewDom(patent.applicant.filter(a => a.dataType === 2)[0].addressStr,'申请人地址')"></div>
+                   <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.applicant && patent.applicant.filter(a => a.dataType === 1).length>0" contentStyle="display:flex;flex-direction: row;flex-wrap: wrap;justify-content: flex-start;">
-                 <div class="patent-basic-value" v-for="item in patent.applicant.filter(a => a.dataType === 1)" :key="item.name">
+                 <div class="patent-basic-value" v-for="item in patent.applicant.filter(a => a.dataType === 1)" :key="item">
                   <div class="margin-right_10">
                     <span v-html="getViewDom(item.name,'权利人')"></span>
                     <span v-if="item.shortName" v-html="'(标：'+getViewDom(item.shortName,'权利人')+')'"></span>
@@ -124,7 +124,7 @@
                 </el-descriptions-item>
                
                 <el-descriptions-item label="发明人" labelStyle="width:90px" v-if="patent.inventor && patent.inventor.length>0" contentStyle="display:flex;flex-direction: row;flex-wrap: wrap;justify-content: flex-start;">
-                  <div class="patent-basic-value margin-right_10" v-for="item in patent.inventor" :key="item.name" v-html="getViewDom(item.name,'发明人')" ></div>
+                  <div class="patent-basic-value margin-right_10" v-for="item in patent.inventor" :key="item" v-html="getViewDom(item,'发明人')" ></div>
                 </el-descriptions-item>
                 <el-descriptions-item label="代理人" labelStyle="width:90px" v-if="patent.agent && patent.agent.length>0">
                   <div class="patent-basic-value margin-right_10" v-for="item in patent.agent" :key="item"  v-html="getViewDom(item,'代理人')"></div>
@@ -149,7 +149,7 @@
               <el-tab-pane label="分类号" name="0"  v-if="patent.ipc">
                 <el-descriptions :column=1>
                 <el-descriptions-item label="IPC分类号" contentStyle="display:flex;flex-direction: row;flex-wrap: wrap;justify-content: flex-start;">
-                  <div class="patent-basic-value margin-right_10" v-for="item in patent.ipc" :key="item" v-html="getViewDom(item.level5,'IPC分类号')"></div>
+                  <div class="patent-basic-value margin-right_10" v-for="item in patent.ipc" :key="item.level5" v-html="getViewDom(item.level5,'IPC分类号')"></div>
                 </el-descriptions-item>
             </el-descriptions>
               </el-tab-pane>
@@ -263,7 +263,7 @@ export default {
 
 .patent-basic {
   // height: 500px;
-  overflow: auto;
+  overflow-y: auto;
   // height:calc(100% + 30px) ;
   // padding-bottom: 10px;
   .el-image {

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

@@ -1,13 +1,13 @@
 <template>
   <div class="patent-articles-patent-right height_100" @mouseup="mouseup">
     <el-container>
-      <el-header>
-        <el-tabs v-model="name" @tab-click="handleClick">
+      <el-header class="basic_header">
+        <el-tabs v-model="name" @tab-click="handleClick" style="width:100%">
           <el-tab-pane v-for="item in tabs" :key="item.label" :label="item.label"  :name="item.name"></el-tab-pane>
         </el-tabs>
       </el-header>
       <el-main>
-        <div v-if="name != 2" v-html="getViewDom1(patent.rights, '权利要求'+tabItem.label, tabItem.field)" :style="setStyle()" :data-type="'权利要求'+tabItem.label"></div>
+        <div v-if="name != 2" v-html="getViewDom(patent.claim[tabItem.field], '权利要求'+tabItem.label, tabItem.field)" :style="setStyle()" :data-type="'权利要求'+tabItem.label"></div>
         <div v-else>
           <my-view>
             <div slot="left">
@@ -52,23 +52,23 @@ export default {
       tabs:[
         {
           label:'原文',
-          name:0,
+          name:'0',
           field:'content'
         },
         {
           label:'译文',
-          name:1,
+          name:'1',
           field:'contentOut'
         },
         {
           label:'权要树',
-          name:2,
+          name:'2',
           field:'contentOut'
         },
       ],
       tabItem:{
           label:'原文',
-          name:0,
+          name:'0',
           field:'content'
         },
     };
@@ -365,7 +365,7 @@ export default {
 
 <style lang="scss">
 .patent-articles-patent-right {
-  margin-bottom: 20px;
+  // margin-bottom: 20px;
   .common {
     // font-size: 14px;
     margin-top: 0;

src/views/project/patentDetails/components/patentMessage/mixins/index.js

@@ -8,6 +8,11 @@ export const patentDetails={
             }
         },
     },
+    data() {
+        return {
+            name:'0',
+        }
+    },
     computed:{
         textStyle(){
           return this.$store.state.patent.style