优化无效分析对比任务弹框

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

@@ -17,9 +17,9 @@
         :span-method="objectSpanMethod"
         v-loading="loading"
         :height="tableHeight - 25"
-        style="min-width: 100%; margin-top: 20px;overflow:auto">
+        style="width: 100%; margin-top: 20px;overflow:auto">
 
-        <el-table-column prop="pRightName" label="权要"  align="center"  width="200px">
+        <el-table-column prop="pRightName" label="权要"  align="center" >
           <template slot-scope="scope">  
             <el-tooltip class="item" effect="dark" :content="scope.row.pContent" placement="top">
               <!-- <span>{{scope.row.pContent}}</span> -->
@@ -28,7 +28,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="content" label="特征" align="center" width="300px">
+        <el-table-column prop="content" label="特征" align="center" >
           <template slot-scope="scope" >
             <div>
               <el-checkbox-group v-model="selected" v-if="isSelect">
@@ -45,7 +45,7 @@
           </template>
         </el-table-column>
         
-        <el-table-column  prop="explainText" align="center" label="解释" min-width="300px">
+        <el-table-column  prop="explainText" align="center" label="解释" >
           <template slot-scope="scope">   
           
             <!-- <div style="width:100%;outline: #dcdfe6" id="preview" contenteditable="true" 
@@ -80,7 +80,7 @@
 import { PatentDetails } from '@/views/components/common/mixins';
 export default{
     mixins:[PatentDetails],
-    props:["reportId",'patentNo','selectedFeatures','selectedFeaturesId'],
+    props:["reportId",'patentNo','selectedFeatures','selectedFeaturesId','height'],
     data() {
         return {
             tableHeight:null,
@@ -135,7 +135,11 @@ export default{
     },
     methods: {
         setHeight() {
-            const offsetTop = window.innerHeight - this.$refs.table.$el.offsetTop - 40
+            var offsetTop = window.innerHeight - this.$refs.table.$el.offsetTop - 40
+            if(this.height){
+                offsetTop = this.height - 40
+            }
+            
             const body = document.querySelector('.el-table__body')
             if (!body) {
                 return false

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

@@ -127,7 +127,7 @@
   
   
 
-  <el-dialog :title="ruleForm.id?'编辑对比':'添加对比'" v-draggable :visible.sync="visible" width="1000px" :before-close="close">
+  <el-dialog :title="ruleForm.id?'编辑对比':'添加对比'" v-draggable :visible.sync="visible" width="1000px" custom-class="checkFile" :before-close="close" :modal="false" :close-on-click-modal="false" :modal-append-to-body="false">
     <el-form :model="ruleForm" ref="ruleForm" label-width="100px" label-position="left">
        
        <!-- <el-form-item label="选择颜色" class="item">
@@ -143,16 +143,6 @@
          <el-input v-model="ruleForm.paresingProcess" placeholder="请输入解析过程" show-word-limit></el-input>
        </el-form-item>
        <el-form-item label="代表图" class="item">
-        <!-- :on-preview="handlePictureCardPreview"
-          :on-remove="handleRemove" -->
-          <!-- action="https://jsonplaceholder.typicode.com/posts/" -->
-        <!-- <el-upload
-          
-          list-type="picture-card"
-          :on-change="handleChange"
-          >
-          <i class="el-icon-plus"></i>
-        </el-upload> -->
         <el-upload ref="upload"  action="#" :auto-upload="false"  :on-change="handleChangeUpload"  list-type="picture" :show-file-list="false">
           <span v-if="dialogImageUrl!=''" class="avatar">
             <span class="deleteImg">
@@ -173,8 +163,8 @@
           &nbsp;&nbsp;</span>
        </el-form-item>
      </el-form>
-     <div style="height:300px;overflow:auto">
-        <Features @getFeatures="getFeatures" :patentNo="signPatentNo" :reportId="reportId" :selectedFeatures="selectedFeatures" :selectedFeaturesId="ruleForm.featureslist"></Features>
+     <div style="height:350px;overflow:auto">
+        <Features @getFeatures="getFeatures" height="350" :patentNo="signPatentNo" :reportId="reportId" :selectedFeatures="selectedFeatures" :selectedFeaturesId="ruleForm.featureslist"></Features>
       </div>
      <div slot="footer" class="dialog-footer">
         <el-button @click="close">取 消</el-button>
@@ -269,8 +259,6 @@ export default {
     return {
       FileVisible: false,
       EvidenceList:[],
-
-
       params:{},
       imgList:[],
       reportType:'',
@@ -478,7 +466,13 @@ export default {
         patentStatus2:this.patentStatus2
       }
     },
-
+    visible(val){
+      if(val){
+        this.$nextTick(() => {
+            document.querySelectorAll('.checkFile')[0].parentNode.classList.add('checkFile1')
+        })
+      }
+    }
   },
   methods: {
     //获取pdf类型
@@ -1124,6 +1118,9 @@ if(index!=-1){
     pointer-events:none;
      .el-dialog{
       pointer-events:auto;
+      .el-dialog__body{
+        padding:0px 20px ;
+      }
     }
   }
   .item .el-form-item__label{
@@ -1138,6 +1135,12 @@ if(index!=-1){
 </style>
 <style lang="scss">
 @import '@/assets/css/activeDiv.scss';
+.checkFile1{
+    pointer-events:none;
+     .el-dialog{
+      pointer-events:auto;
+    }
+  }
 .content-main{
   width:80% !important ;
   background-color: skyblue !important;
@@ -1216,16 +1219,16 @@ if(index!=-1){
     border: 1px dashed #c0ccda;
     font-size: 28px;
     color: #8c939d;
-    width: 148px;
-    height: 148px;
-    line-height: 148px;
+    width: 80px;
+    height:80px;
+    line-height: 80px;
     text-align: center;
   }
  .avatar {
   
   position: relative;
-    width: 148px;
-    height: 148px;
+    width: 80px;
+    height: 80px;
     display: block;
   }
   .avatar:hover .deleteImg {
@@ -1234,8 +1237,8 @@ if(index!=-1){
 .deleteImg {
   display: none;
   font-size: 30px;
-  width: 148px;
-  height: 148px;
+  width:80px;
+  height: 80px;
   background-color:black;
 	opacity: 0.6; 
   position: absolute;