Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/report/FTO/FTOPage/components/PatentFeatures.vue

@@ -111,9 +111,9 @@
               <el-select v-model="scope.row.compareResult" placeholder="请选择">
                 <el-option
                   v-for="item in options"
-                  :key="item.value"
+                  :key="Number(item.value)"
                   :label="item.label"
-                  :value="item.value">
+                  :value="Number(item.value)">
                 </el-option>
               </el-select>
             </template>
@@ -512,7 +512,6 @@
           if (this.tableData[i].compareResult2 ==undefined) {
             this.tableData[i].compareResult2=''
           }else if(this.tableData[i].compareResult2===0) {
-            // console.log(1);
             this.tableData[i].compareResult2+=''
           }
           if (this.tableData[i].targetDescription2 ==undefined) {
@@ -545,7 +544,7 @@
             res.data.patentRightVos[i].compareMessageVOS[m].pRightName = res.data.patentRightVos[i].RightName
             res.data.patentRightVos[i].compareMessageVOS[m].pContentOut = res.data.patentRightVos[i].contentOut
             // res.data.patentRightVos[i].compareMessageVOS[m].CMid = res.data.patentRightVos[i].CMid
-            let a = ['explainText', 'targetDescription', 'compareDescription', 'compareResult']
+            let a = ['explainText', 'targetDescription', 'compareDescription', 'compareResult','compareResult2', 'targetDescription2', 'compareDescription2']
             a.forEach(item => {
               if (!res.data.patentRightVos[i].compareMessageVOS[m].hasOwnProperty(item)) {//hasOwnProperty判断属性是否存在
                 if (item == 'explainText') {
@@ -559,14 +558,29 @@
                     res.data.patentRightVos[i].compareMessageVOS[m][item] = res.data.patentRightVos[i].compareMessageVOS[m].contentOut
                   }
                 }
+                // else {
+                //   if (res.data.patentRightVos[i].compareMessageVOS[m][item] == 0 ) {
+                //     console.log(123,res.data.patentRightVos[i].compareMessageVOS[m][item]);
+                //     // if (res.data.patentRightVos[i].compareMessageVOS[m][item] == 0) {
+                //     //   console.log(123);
+                //     //    res.data.patentRightVos[i].compareMessageVOS[m][item]+=0
+                //     // }
+                   
+                //   }
+                // } 
+                // if (item=='compareResult2'&& res.data.patentRightVos[i].compareMessageVOS[m].compareResult2 == 0) {
+                //   console.log(123);
+                //   res.data.patentRightVos[i].compareMessageVOS[m].compareResult2.toString()
+                // }
               }
             })
+           
 
             this.tableData1.push(res.data.patentRightVos[i].compareMessageVOS[m])
           }
         }
         this.$forceUpdate()
-        //console.log(this.tableData1)
+        // console.log(this.tableData1)
         this.TypeSelect(this.Type)//调用显示权要
         // this.getSpanArr(this.tableData)
         this.loading = false
@@ -586,7 +600,6 @@
           if (row.compareResult2 ==undefined) {
             row.compareResult2=''
           }else if(row.compareResult2===0) {
-            // console.log(1);
             row.compareResult2+=''
           }
           if (row.targetDescription2 ==undefined) {