Browse Source

权要树,

zhuhao 1 year ago
parent
commit
be5f5dcfda

+ 1 - 1
public/专利维权A4.svg

@@ -197,7 +197,7 @@ viewBox='0 0 1684.3281956722863 762.8282085217927'
       <path id="SvgjsPath1213" d="M 0 0L 45.49999999999966 0L 45.49999999999966 40L 0 40Z" stroke="none" fill="none"></path>
       <g id="SvgjsG1214">
         <text id="SvgjsText1215" font-family="思源黑体" text-anchor="end" font-size="13px" width="46px" fill="{{ (己方)专利盘点 , color }}" font-weight="700" align="middle" lineHeight="125%" anchor="end" family="思源黑体" size="13px" weight="700" font-style="" opacity="1" y="0.875" transform="rotate(0)">
-          <tspan id="SvgjsTspan1216" dy="16.25" x="46">
+          <tspan id="SvgjsTspan1216" dy="16.25" x="50">
             <tspan id="SvgjsTspan1217" style="">{{ (己方)专利盘点 , 2 }}</tspan>
           </tspan>
           <tspan id="SvgjsTspan1218" dy="16.25" x="46">

+ 1 - 1
public/侵权纠纷A3.svg

@@ -455,7 +455,7 @@ viewBox='0 0 1640.0001525878906 929.4064331054688'
       <path id="SvgjsPath1845" d="M 0 0L 45.49999999999966 0L 45.49999999999966 40L 0 40Z" stroke="none" fill="none"></path>
       <g id="SvgjsG1846">
         <text id="SvgjsText1847" font-family="思源黑体" text-anchor="end" font-size="13px" width="46px" fill="{{ 侵权分析 , color }}" font-weight="700" align="middle" lineHeight="125%" anchor="end" family="思源黑体" size="13px" weight="700" font-style="" opacity="1" y="0.875" transform="rotate(0)">
-          <tspan id="SvgjsTspan1848" dy="16.25" x="46">
+          <tspan id="SvgjsTspan1848" dy="16.25" x="50">
             <tspan id="SvgjsTspan1849" style="">{{ 侵权分析 , 2 }}</tspan>
           </tspan>
           <tspan id="SvgjsTspan1850" dy="16.25" x="46">

+ 3 - 3
src/api/newApi/patentMining.js

@@ -45,7 +45,7 @@ export default {
   /**
    * 专利挖掘任务查询
    */
-  queryProjectTask(data) {
-    return axios.post("/xiaoshi/projectTask/queryProjectTask", data);
-  },
+  // queryProjectTask(data) {
+  //   return axios.post("/xiaoshi/projectTask/queryProjectTask", data);
+  // },
 };

+ 1 - 1
src/views/components/import/components/importPatent.vue

@@ -132,7 +132,7 @@
                 </div>
             </el-aside>
             <el-main style="padding: 0 20px !important;" >
-                <systemTask ref="systemTask" :importToId="form.importToId"></systemTask>
+                <systemTask ref="systemTask" :importToId="form.importToId" :importToType="form.importToType"></systemTask>
             </el-main>
         </el-container>
     </el-container>

+ 4 - 2
src/views/components/import/task/components/index.vue

@@ -94,13 +94,15 @@ import { downLoad2 } from '@/utils'
 export default {
   components: {},
   props: {
-    importToId: ''
+    importToId: '',
+    importToType: null,
   },
   data() {
     return {
       //固定检索字段
       searchFiled2: {
-        projectId: this.importToId
+        projectId: this.importToType == 2?null:this.importToId,
+        productId: this.importToType == 2?this.importToId:null,
       },
       //检索字段
       searchFiled: [],

+ 4 - 1
src/views/components/import/task/index.vue

@@ -20,7 +20,10 @@ export default {
   computed: {
     importToId(){
         return this.$route.query.importToId
-    }
+    },
+    importToType(){
+        return this.$route.query.importToType
+    },
   },
   created() {},
   mounted() {},

+ 5 - 1
src/views/project/patentDetails/components/patentMessage/PatentRight.vue

@@ -121,8 +121,12 @@ export default {
       })
       this.show = true
       if (this.name == 2 && !this.patent.patentRightTree) {
+        let params = {
+          patentNo: this.patent.patentNo,
+          appNo: this.patent.rowApplicationNo,
+        }
         this.$api
-          .getPatentRightTree({ patentNo: this.patent.patentNo })
+          .getPatentRightTree(params)
           .then((response) => {
             if (response.code == 200) {
               this.$set(this.patent, "patentRightTree", response.data.data);