优化

RMS-FrontEnd/src/assets/css/activeDiv.scss

@@ -6,7 +6,7 @@
         width: 100%;
         height: 100%;
         margin: 10px 0px;
-        overflow: hidden;
+        overflow: auto;
         box-shadow: -1px 9px 10px 3px rgba(0, 0, 0, 0.11);
     }
     /*左侧div样式*/

RMS-FrontEnd/src/views/components/articles/ContrastIndex.vue

@@ -64,7 +64,7 @@
               </div>
               <div class="resize2" title="收缩侧边栏" v-show="(radio == 2 || radio == 3) && activeMenu != activeMenu2"><p><span>˙</span><span>˙</span><span>˙</span></p></div>
               <div class="resize1" title="收缩侧边栏" v-show="(radio == 4 || radio == 5) && activeMenu != activeMenu2"><span>⋮</span></div>
-            <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:0}"  style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
+            <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:'280px'}"  style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
               <component :is="activeMenu2" :project-id="projectId" :patent="patent" :patent-id="patentId" :pdfType1="(patent.pdf && patent.pdf.length>0)?patent.pdf[0].type:2" :sign="true"></component>
             </div>
             </div>
@@ -457,6 +457,7 @@ export default {
 </script>
 
 <style lang="scss">
+@import '@/assets/css/activeDiv.scss';
 .content-main{
   width:80% !important ;
   background-color: skyblue !important;

RMS-FrontEnd/src/views/components/articles/components/PatentBasic.vue

@@ -59,7 +59,15 @@
       <el-col :span="6">
          <el-card shadow="never" class="text-align_center" style="margin-top:50px" data-type="附图">
           <!-- <el-image :src="getImagePath(patent.abstractPath)" :preview-src-list="[getImagePath(patent.abstractPath)]" style="height: 200px;"></el-image> -->
-          <el-image :src="getImagePath1(patent)" :preview-src-list="[getImagePath1(patent)]" style="height: 200px;"></el-image>
+          <el-image :src="getImagePath1(patent)" :preview-src-list="[getImagePath1(patent)]" style="height: 200px;">
+            <div slot="error" class="image-slot">
+              <el-image :src="getErrorImage(patent)" :preview-src-list="[getErrorImage(patent)]">
+                <div slot="error" class="image-slot">
+                  <img src="https://www.patentstar.com.cn/img/Common/nopic.jpg" alt="" style="height: 200px;">
+                </div>
+              </el-image>
+            </div>
+          </el-image>
         </el-card>
         </el-col>
     </el-row>

RMS-FrontEnd/src/views/components/articles/components/mixins.js

@@ -30,6 +30,9 @@ export const commonMixins = {
       if(Object.keys(patent).length==0){
         return ''
       }
+      if(!patent.abstractPath){
+        return this.getErrorImage(patent)
+       }
       return this.$p2 + patent.abstractPath
       // var cc =  patent.publicNo.substring(0,2)
       // if(cc != 'CN'){
@@ -45,6 +48,21 @@ export const commonMixins = {
       // }
       // return a
     },
+    getErrorImage(patent){
+      if(Object.keys(patent).length==0){
+        return ''
+      }
+      var cc =  patent.publicNo.substring(0,2)
+      if(patent.publicAccreditDate){
+        var date = patent.publicAccreditDate.replace(/-/g,'')
+      }else{
+        var date = patent.publicDate.replace(/-/g,'')
+      }
+        var NR = patent.publicNo.substring(2,patent.publicNo.length)
+        var KD = patent.publicNo.substring(patent.publicNo.length-2,patent.publicNo.length)
+        var a = 'http://worldwide.espacenet.com/espacenetImage.jpg?flavour=firstPageClipping&locale=en_EP&FT=D&date='+ date +'&CC='+ cc +'&NR='+ NR +'&KD='+ KD +'&bg='
+      return a
+    }
   }
 }
 

RMS-FrontEnd/src/views/components/articles/index.vue

@@ -93,7 +93,7 @@
                   </div>
                   <div class="resize2" title="收缩侧边栏"  v-show="(radio == 2 || radio == 3) && activeMenu != activeMenu2"><p><span>˙</span><span>˙</span><span>˙</span></p></div>
                   <div class="resize1" title="收缩侧边栏"  v-show="(radio == 4 || radio == 5) && activeMenu != activeMenu2"><span>⋮</span></div>
-                  <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:0}" style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
+                  <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:'280px'}" style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
                     <component :is="activeMenu2" :project-id="projectId" :patent="patent" :patent-id="patentId" :pdfType1="(patent.pdf && patent.pdf.length>0)?patent.pdf[0].type:2" :sign="true"></component>
                   </div>
                 </div>
@@ -267,7 +267,7 @@ export default {
       showPositionTop:0,
       showPositionLeft:0,
       ban:0,
-      pNo:'',
+      pNo:this.patentNo,
       message:"1",
       fix:false,
       fix2:false,
@@ -393,6 +393,7 @@ export default {
   watch:{
     patentNo(val){
       this.patentNo1= val
+      this.pNo = val
     },
     value(val){
       this.value = val

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

@@ -106,7 +106,7 @@
                   </div>
                   <div class="resize2" title="收缩侧边栏"  v-show="(radio == 2 || radio == 3) && activeMenu != activeMenu2"><p><span>˙</span><span>˙</span><span>˙</span></p></div>
                   <div class="resize1" title="收缩侧边栏"  v-show="(radio == 4 || radio == 5) && activeMenu != activeMenu2"><span>⋮</span></div>
-                  <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:0}" style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
+                  <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:'280px'}" style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
                     <component :is="activeMenu2" :project-id="projectId" :patent="patent" :patent-id="patentId" :pdfType1="(patent.pdf && patent.pdf.length>0)?patent.pdf[0].type:2" :sign="true"></component>
                   </div>
                 </div>

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

@@ -90,9 +90,7 @@
               </p>
               <div v-else style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview" contenteditable="true" 
                 v-html="scope.row.explainText"  @input="saveValue($event.target.innerHTML)"  @click="saveValue($event.target.innerHTML)"
-                @blur="getValue(scope.row,'explainText')"  v-on:paste="handlePaste($event,scope.row,'explainText')">
-                <!-- {{scope.row.explainText}} -->
-              </div>
+                @blur="getValue(scope.row,'explainText')"  v-on:paste="handlePaste($event,scope.row,'explainText')"></div>
             </template>
           </el-table-column>
           <el-table-column  prop="targetDescription" align="center" label="标的说明(可粘贴图片)" min-width="300px">
@@ -102,9 +100,7 @@
               </div> -->
               <div style="width:100%;outline: #dcdfe6;border:1px solid #DCDFE6;border-radius:5px" id="preview" contenteditable="true" 
                 v-html="scope.row.targetDescription"  @input="saveValue($event.target.innerHTML)"  @click="saveValue($event.target.innerHTML)"
-                @blur="getValue(scope.row,'targetDescription')"  v-on:paste="handlePaste($event,scope.row,'targetDescription')">
-                <!-- {{scope.row.explainText}} -->
-              </div>
+                @blur="getValue(scope.row,'targetDescription')"  v-on:paste="handlePaste($event,scope.row,'targetDescription')"> </div>
             </template>
           </el-table-column>
          
@@ -521,12 +517,22 @@
           if (this.tableData[i].compareDescription2 ==undefined) {
             this.tableData[i].compareDescription2=''
           }
-          if (this.tableData[i].targetDescription!=this.tableData[i].targetDescription2||this.tableData[i].compareDescription!=this.tableData[i].compareDescription2||this.tableData[i].compareResult != this.tableData[i].compareResult2) {
-            this.tableData[i].isDelShow=1
-          } else {
-            this.tableData[i].isDelShow=0
-            //console.log(2);
+          if(this.tableData[i].targetDescription2!='' || this.tableData[i].compareDescription2!='' || this.tableData[i].compareResult2!=''){
+            if (this.tableData[i].targetDescription!=this.tableData[i].targetDescription2||this.tableData[i].compareDescription!=this.tableData[i].compareDescription2||this.tableData[i].compareResult != this.tableData[i].compareResult2) {
+              this.tableData[i].isDelShow=1
+            } else {
+              this.tableData[i].isDelShow=0
+              //console.log(2);
+            }
+          }else{
+            this.tableData[i].isDelShow = 0
           }
+          // if (this.tableData[i].targetDescription!=this.tableData[i].targetDescription2||this.tableData[i].compareDescription!=this.tableData[i].compareDescription2||this.tableData[i].compareResult != this.tableData[i].compareResult2) {
+          //   this.tableData[i].isDelShow=1
+          // } else {
+          //   this.tableData[i].isDelShow=0
+          //   //console.log(2);
+          // }
         }
         //console.log(this.tableData);
       },
@@ -609,11 +615,14 @@
           if (row.compareDescription2 ==undefined) {
             row.compareDescription2=''
           }
-        if (row.targetDescription!=row.targetDescription2||row.compareDescription!=row.compareDescription2||row.compareResult != row.compareResult2) {
+          if(row.targetDescription2!=''||row.compareDescription2!=''||row.compareResult2!=''){
+            if (row.targetDescription!=row.targetDescription2||row.compareDescription!=row.compareDescription2||row.compareResult != row.compareResult2) {
 
-          return 'success-rowCheck';
+            return 'success-rowCheck';
 
-        }
+          }
+          } 
+        
       },
       //拆分权要
       splitPatentRight() {//patentRightVos
@@ -812,7 +821,9 @@
       handleClick(row) {
         row.targetDescription=row.targetDescription2
         row.compareDescription=row.compareDescription2
-        row.compareResult = Number(row.compareResult2)
+        if(row.compareResult2!=''){
+          row.compareResult = Number(row.compareResult2)
+        }
         this.$message.success("修改成功,请进行保存")
       },
       // 全部修改

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

@@ -30,7 +30,7 @@
                                 <el-upload ref="upload"  action="#" :auto-upload="false" multiple :on-change="handleChangeUpload"  list-type="picture" :show-file-list="false">
                                     <span style="display:flex;flex-direction:row;flex-wrap:wrap;">
                                         <span class="avatar" v-if="product.reportFiles" v-for="(item,index) in product.reportFiles" style="margin-left:10px">
-                                            <span class="deleteImg">
+                                            <span class="deleteImg" v-if="isEdit">
                                                 <span> 
                                                     <i class="el-icon-zoom-in" @click.stop="handlePictureCardPreview1(item)"></i>
                                                     <i class="el-icon-delete" @click.stop="handleRemove1(index)" v-if="!noEdit1"></i>

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

@@ -51,7 +51,7 @@
               </div>
               <div class="resize2" title="收缩侧边栏" v-show="(radio == 2 || radio == 3) && activeMenu != activeMenu2"><p><span>˙</span><span>˙</span><span>˙</span></p></div>
               <div class="resize1" title="收缩侧边栏" v-show="(radio == 4 || radio == 5) && activeMenu != activeMenu2"><span>⋮</span></div>
-            <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:0}" style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
+            <div v-show="radio != 1 && activeMenu != activeMenu2" class="mid1" :style="{height:(radio == 4 || radio == 5)?height:'280px'}" style="width:450px;height:280px;border:1px solid #E4E7ED;margin:10px;overflow-y:auto;overflow-x: hidden;">
               <component :is="activeMenu2" :project-id="projectId" :patent="patent" :patent-id="patentId" :pdfType1="(patent.pdf && patent.pdf.length>0)?patent.pdf[0].type:2" :sign="true"></component>
             </div>
             </div>