提示修改

RMS-FrontEnd/src/api/report.js

@@ -111,7 +111,7 @@ export default {
       return axios.post('/report/api/compare/getCompareFile',params)
   },
     
-    //根据报告Id获取FTO专利分页列表
+    //根据报告Id添加FTO专利分页列表
     addFTOCompareFile(params){
       return axios.post('/report/api/compare/addFTOCompareFile',params)
     },
@@ -147,12 +147,12 @@ export default {
     return axios.post('/report/api/task/addAssTask',params)
   },
   
-  //返回任务清单
+  //获取工作协同专利清单
   reTaskPatents(params){
     return axios.post('/report/api/task/reTaskPatents',params)
   },
 
-  //报告详情中任务详情页面返回任务清单
+  //查询任务清单
   ReviewTheTasks(params){
     return axios.post('/report/api/task/reviewTheTasks',params)
   },
@@ -461,7 +461,7 @@ export default {
     return axios.post('/report/api/compareMessage/queryComparedMessage',params)
   },
 
-  //FTO工作协同已对比的专利文件
+  //添加FTO工作协同任务
   addSyneryTask(params){
     return axios.post('/report/api/task/addSyneryTask',params)
   },
@@ -476,7 +476,7 @@ export default {
     return axios.get('/report/api/compareMessage/querySynery',{params})
   },
 
-  //FTO协同对比记录
+  //添加FTO协同对比记录
   addSynery(params){
     return axios.post('/report/api/compareMessage/addSynery',params)
   },
@@ -486,7 +486,7 @@ export default {
     return axios.get('/report/api/compareMessage/queryAllCompareMessage',{params})
   },
 
-  //FTO查找对比结果(带协同结果)
+  //FTO更新对比结果(带协同结果)
   updateCompareMessage(params){
     return axios.post('/report/api/compareMessage/updateCompareMessage',params)
   },

RMS-FrontEnd/src/views/report/Invalid/InvalidPage/Result.vue

@@ -81,7 +81,7 @@
                         placement="bottom"
                         width="200"
                         trigger="click">
-                      <!-- <p style="display:flex;align-items: center"><span>移动到第</span> <el-input-number width="100px" size="small" v-model="num" @change="handleChange" :controls="false" :min="1" :max="tableHeader.length" label="输入需要交换的位置"></el-input-number><span>位</span></p> -->
+                        <p>将本文件（<span style="color:red">{{ item.patentNo }}</span>）作为：</p>
                         <el-tree
                           ref="tree"
                           :data="tableHeader"
@@ -90,20 +90,15 @@
                           :allow-drop="allowDrop"
                           draggable
                           @check-change="handleCheckChange">
-                          <span class="custom-tree-node" slot-scope="{ node, data }"><el-radio v-model="val" @input="changeRadio(item,data)" :label="node.label">D{{tableHeader.findIndex(item=>item.patentNo == data.patentNo)+1}}({{data.patentNo}})</el-radio></span>
+                          <span class="custom-tree-node" slot-scope="{ node, data }"><el-radio v-model="val" @input="changeRadio(item,data)" :label="node.label">D{{tableHeader.findIndex(item=>item.patentNo == data.patentNo)+1}}</el-radio></span>
                         </el-tree>
-                        <!-- <el-button @click="exchange" style="float:right">交换</el-button> -->
+                        <p style="color:red">备注：选择其中一个文件与其交换位置</p>
                         <i class="el-icon-arrow-down el-icon--right" @click="getVal(item)" slot="reference"></i>
                       </el-popover>
                   </template>
                       <template slot-scope="scope" >
-                        <!-- <div v-if="scope.row[item.patentNo]" style="width:calc(100% + 20px);margin-left:-10px">
-                        <table style="width:100%;text-align:left">
-                            <tr v-for="i in scope.row[item.patentNo]">{{i}}</tr>
-                        </table>
-                      </div> -->
                       <div class="" v-if="scope.row[item.patentNo]" style="width:calc(100% + 20px);margin-left:-10px">
-                            <p v-for="i in scope.row[item.patentNo]">{{i.content}} <el-image ref="image" :preview-src-list="imgList" v-if="i.filePath" :src="i.filePath"  style="vertical-align:middle;width:100px" @click="showImage(i.filePath)"></el-image></p>
+                            <p v-for="i in scope.row[item.patentNo]">[{{ i.fields }}]{{i.content}} <el-image ref="image" :preview-src-list="imgList" v-if="i.filePath" :src="i.filePath"  style="vertical-align:middle;width:100px" @click="showImage(i.filePath)"></el-image></p>
                         </div>
                           <!-- <span>{{scope.row[item.patentNo]?scope.row[item.patentNo]:''}}</span> -->
                       </template>
@@ -131,7 +126,7 @@
                         placement="bottom"
                         width="200"
                         trigger="click">
-                      <!-- <p style="display:flex;align-items: center"><span>移动到第</span> <el-input-number width="100px" size="small" v-model="num" @change="handleChange" :controls="false" :min="1" :max="tableHeader.length" label="输入需要交换的位置"></el-input-number><span>位</span></p> -->
+                        <p>将本文件（<span style="color:red">{{ scope.row.patentNo }}</span>）作为：</p>
                         <el-tree
                           ref="tree"
                           :data="tableHeader"
@@ -140,9 +135,9 @@
                           :allow-drop="allowDrop"
                           draggable
                           @check-change="handleCheckChange">
-                          <span class="custom-tree-node" slot-scope="{ node, data }"><el-radio v-model="val" @input="changeRadio(scope.row,data)" :label="node.label">D{{tableHeader.findIndex(item=>item.patentNo == data.patentNo)+1}}({{data.patentNo}})</el-radio></span>
+                          <span class="custom-tree-node" slot-scope="{ node, data }"><el-radio v-model="val" @input="changeRadio(item,data)" :label="node.label">D{{tableHeader.findIndex(item=>item.patentNo == data.patentNo)+1}}</el-radio></span>
                         </el-tree>
-                        <!-- <el-button @click="exchange" style="float:right">交换</el-button> -->
+                        <p style="color:red">备注：选择其中一个文件与其交换位置</p>
                         <i class="el-icon-arrow-down el-icon--right" @click="getVal(scope.row)" slot="reference"></i>
                       </el-popover>
                   </template>
@@ -235,14 +230,14 @@
             </el-checkbox-group>
         </template>
       </el-table-column>
-        <el-table-column v-for="(item, index) in tableHeader" :key="index" show-overflow-tooltip align="center" :min-width="item.length > 7 ? '190' : '110'">
+        <el-table-column v-for="(item, index) in tableHeader" :key="index" show-overflow-tooltip align="center" :min-width="item.length > 7 ? '190' : '170'">
           <template slot="header">
-            <span><el-link type="primary"  @click="editContrast(item.patentNo)">{{item.patentNo}}</el-link></span><el-tag style="font-size:12px;border-radius:50%;" v-if="item.remark">{{item.remark}}</el-tag>
+            <span><el-link type="primary"  @click="editContrast(item.patentNo)">{{item.patentNo}}(D{{ index+1 }})</el-link></span><el-tag style="font-size:12px;border-radius:50%;" v-if="item.remark">{{item.remark}}</el-tag>
             <el-popover
               placement="bottom"
               width="200"
               trigger="click">
-             <!-- <p style="display:flex;align-items: center"><span>移动到第</span> <el-input-number width="100px" size="small" v-model="num" @change="handleChange" :controls="false" :min="1" :max="tableHeader.length" label="输入需要交换的位置"></el-input-number><span>位</span></p> -->
+              <p>将本文件（<span style="color:red">{{ item.patentNo }}</span>）作为：</p>
               <el-tree
                 ref="tree"
                 :data="tableHeader"
@@ -251,9 +246,9 @@
                 :allow-drop="allowDrop"
                 draggable
                 @check-change="handleCheckChange">
-                <span class="custom-tree-node" slot-scope="{ node, data }"><el-radio v-model="val" @input="changeRadio(item,data)" :label="node.label">D{{tableHeader.findIndex(item=>item.patentNo == data.patentNo)+1}}({{data.patentNo}})</el-radio></span>
+                <span class="custom-tree-node" slot-scope="{ node, data }"><el-radio v-model="val" @input="changeRadio(item,data)" :label="node.label">D{{tableHeader.findIndex(item=>item.patentNo == data.patentNo)+1}}</el-radio></span>
               </el-tree>
-              <!-- <el-button @click="exchange" style="float:right">交换</el-button> -->
+              <p style="color:red">备注：选择其中一个文件与其交换位置</p>
               <i class="el-icon-arrow-down el-icon--right" @click="getVal(item)" slot="reference"></i>
             </el-popover>
           </template>
@@ -263,7 +258,7 @@
                  <p v-for="(inc,index) in scope.row[item.patentNo]">
                   <el-checkbox :label="item.patentNo+scope.row[item.patentNo+'_Id'][index]" @change="getFunInfo(scope.row,item.patentNo,index)" v-if="scope.row[item.patentNo]">
                   <!-- <el-input style="width:calc(100% + 20px);margin-left:-10px;word-wrap:break-word;" v-model="i"></el-input>  -->
-                  <span>{{inc.content}}<el-image ref="image" :preview-src-list="imgList" v-if="inc.filePath" :src="inc.filePath"  style="vertical-align:middle;width:100px" @click.prevent="showImage(inc.filePath)"></el-image></span> 
+                  <span>[{{ inc.fields }}]{{inc.content}}<el-image ref="image" :preview-src-list="imgList" v-if="inc.filePath" :src="inc.filePath"  style="vertical-align:middle;width:100px" @click.prevent="showImage(inc.filePath)"></el-image></span> 
                   </el-checkbox>
                 </p>
               </div>
@@ -704,6 +699,7 @@ export default {
                             }
                             a.push({
                               content:item.content,
+                              fields:item.fields,
                               filePath:b
                             })
                             // a.push(item.content)
@@ -716,6 +712,7 @@ export default {
                             }
                             a.push({
                               content:item.content,
+                              fields:item.fields,
                               filePath:b
                             })
                             this.$set(this.tableData[index],[item.patentNo],a)
@@ -747,7 +744,6 @@ export default {
                 })
                 this.getRightList()
                 this.getSpanArr(this.tableData)
-                
                 }
                
             })