zhuhao hai 1 ano
pai
achega
e0818ee51b

+ 6 - 0
src/api/newApi/task.js

@@ -75,6 +75,12 @@ export default {
     return axios.get("/xiaoshi/projectTask/queryAuditHistory", {params});
   },
   /**
+   * 专利挖掘任务的编辑
+   */
+  updateTask(data) {
+    return axios.post("/xiaoshi/projectTask/updateTask", data);
+  },
+  /**
    * 任务完成、取消、同意、缺少资料等状态的修改
    */
   updateTaskStatus(params) {

+ 1 - 0
src/views/analyse/custom/components/Tabs/Data.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 数据 -->
   <div class="custom-analyse-data">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="一维数据" name="2">

+ 1 - 0
src/views/analyse/custom/components/Tabs/Item.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 分析项 -->
   <div class="custom-analyse-tabs-item">
     <el-collapse v-model="activeItem2">
       <el-collapse-item v-for="menu in treeList" :name="menu.id">

+ 1 - 0
src/views/analyse/custom/components/Tabs/Line.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 辅助线 -->
   <div class="custom-analyse-tabs-line">
     <el-form :model="form" label-width="60px" label-position="left" class="line-form">
       <el-form-item label="开启">

+ 1 - 0
src/views/analyse/custom/components/Tabs/Style.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 样式 -->
   <div class="custom-analyse-tabs-style">
     <el-collapse v-model="activeNames">
       <el-collapse-item title="类型" name="0">

+ 4 - 1
src/views/analyse/custom/index.vue

@@ -182,6 +182,7 @@ export default {
     reset() {
 
     },
+    // 获取???
     getPatentListNum() {
       this.$api.getPatentListNum({patentKey: this.patentKey}).then(async (response) => {
         this.patentNum = response.data
@@ -218,9 +219,11 @@ export default {
         }
       })
     },
+    // 获取需要进行的每一个分析项
     async getTreeList() {
       this.loading = true
-      const response = await this.$api.getCustomTree({projectId: this.projectId})
+      const response = await this.$api.getCustomTree({ projectId: this.projectId })
+      // 获取到的数据存
       this.$store.commit('SET_CHART_TREE', response.data)
       this.setChildren(this.treeList, 'isDisabled')
       this.loading = false

+ 1 - 1
src/views/patentMining/components/dialog/createTask.vue

@@ -119,7 +119,7 @@ export default {
               }
             })
           } else {
-            this.$api.editTask(this.form).then(res => {
+            this.$api.updateTask(this.form).then(res => {
               if (res.code == 200) {
                 this.$message.success('编辑任务成功')
                 this.$emit('isCreate', '编辑成功')

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 89 - 82
src/views/project/patentCollection/components/mixins/index.js


+ 11 - 11
src/views/project/patentCollection/components/views/Abstract.vue

@@ -44,11 +44,11 @@
                 <div class="patent-abstract-title">
                   <el-link :disabled="!$permission('/workspace/details')"
                     :class="$permission('/workspace/details') ? '' : 'jinzhi'" type="success"
-                    @click.native="handleLink(patent, index)">
+                    @click.native="handleClick(patent, index)">
                     <span v-html="getView(patent, 'patentNo')"></span>
                   </el-link>
                   <el-tag class="margin-left_10" type="primary" effect="dark" size="small" v-if="patent.simpleStatus">{{
-                    patent.simpleStatus }}</el-tag>
+                    simple_status[patent.simpleStatus] }}</el-tag>
                 </div>
                 <div style="font-size: 13px;">
                   <el-row>
@@ -88,12 +88,12 @@
                     <el-col :span="24">
                       <span class="patent-abstract_label">权利人:</span>
                       <span class="patent-abstract_text" v-if="patent.rightHolder">
-                        <span v-for="(item) in patent.rightHolder.filter(a => a.dataType === 1)" :key="item.name">
+                        <!-- <span v-for="(item) in patent.rightHolder.filter(a => a.dataType === 1)" :key="item.name"> -->
                           <el-link type="primary">
-                            <span v-html="getView(item.name)"></span>
+                            <span v-html="getView(patent,'rightHolder')"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </span>
+                        <!-- </span> -->
                       </span>
                     </el-col>
                   </el-row>
@@ -101,12 +101,12 @@
                     <el-col :span="24">
                       <span class="patent-abstract_label">申请人:</span>
                       <span class="patent-abstract_text" v-if="patent.applicant">
-                        <span v-for="(item) in patent.applicant.filter(a => a.dataType === 2)" :key="item.name">
+                        <!-- <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>
+                            <span v-html="getView(patent,'applicant')"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </span>
+                        <!-- </span> -->
                       </span>
                     </el-col>
                   </el-row>
@@ -114,12 +114,12 @@
                     <el-col :span="24">
                       <span class="patent-abstract_label">发明人:</span>
                       <span class="patent-abstract_text">
-                        <span v-for="(item) in patent.inventor" :key="item.name">
+                        <!-- <span v-for="(item) in patent.inventor" :key="item.name">-->
                           <el-link type="primary">
-                            <span v-html="getView(item.name)"></span>
+                            <span v-html="getView(patent, 'inventor')"></span>
                           </el-link>
                           <span class="patent-abstract_semicolon">;</span>
-                        </span>
+                        <!-- </span>  -->
                       </span>
                     </el-col>
                   </el-row>

+ 1 - 1
src/views/project/patentCollection/components/views/Picture.vue

@@ -11,7 +11,7 @@
 
               <el-link :disabled="!$permission('/workspace/details')"
                 :class="$permission('/workspace/details') ? '' : 'jinzhi'" :type="item.read === 1 ? 'success' : 'danger'"
-                @click.native.prevent="handleLink(item, index)">
+                @click.native.prevent="handleClick(item, index)">
                 <span v-html="getView(item, 'patentNo')"></span>
               </el-link>
 

+ 3 - 1
src/views/project/patentCollection/index.vue

@@ -578,11 +578,13 @@ export default {
       // this.chartLoading = true
       // const key = await this.saveSelectPatent(false)
       // this.chartLoading = false
+      let key = '6da6c3df8b54450aac71617dce3e8a71'
+      // this.$store.commit('SET_PATENT_KEY', key)
       const router = this.$router.resolve({
         path: '/customChart',
         query: {
           projectId: this.projectId,
-          // key: key
+          key: key
         }
       })
       window.open(router.href, '_blank');