优化

src/assets/css/main.scss

@@ -126,7 +126,7 @@
     .el-table__body-wrapper{
       // max-height: calc(100% - 75px);
       // overflow: auto;
-      padding-bottom: 10px;
+      // padding-bottom: 10px;
     }
   }
   .el-table th{

src/views/project/index.vue

@@ -49,7 +49,7 @@
                 :queryParams="queryParams" :column="fieldList" @option="handleOption" @on-sort="handleSort" :handleMessage="handleMessage"></component>
             </div>
           </el-main>
-          <el-footer class="pagination" v-if="[2].indexOf(isOperate) == -1 && this.queryShowType != '2'">
+          <el-footer class="pagination" v-if=" this.queryShowType != '2'">
             <el-pagination backgroundx layout="total,sizes, prev, pager, next, jumper" :current-page.sync="queryParams.current"
               :page-size.sync="queryParams.size" :page-sizes="pageSizes" @current-change="handleCurrentChange" @size-change="handleSizeChange" :total="total">
             </el-pagination>
@@ -91,7 +91,10 @@ export default {
     FieldDrawer
   },
   props: {
-    isOperate: '',
+    isOperate: {
+      type:[String,Number],
+      default:''
+    },
     matterId:{},
     scenarioId:{},
     eventName:'',

src/views/report/components/dialog/addAndEditReport.vue

@@ -830,9 +830,13 @@ export default {
         this.$set(this.form,'actType',1)
         this.$set(this.form, 'matterIds', form.matterId)
         this.form.scenarioIds = form.scenarioId
+        this.onChange()
         this.$set(this.form, 'systemFileList', [])
         this.$set(this.form, 'fileGuids', [])
         this.eventList.disabled = false
+        if(this.form.eventIds && this.form.eventIds.length>0){
+          this.form.eventId = this.form.eventIds[0]
+        }
         if (this.form.eventId) {
           this.eventList.disabled = true
           let params = {

src/views/report/components/index.vue

@@ -37,14 +37,8 @@
 
         </div>
       </el-header>
-      <el-main id="patent-list-container" class="main" v-loading="loading" style="display: flex;">
-        <!-- <div>
-          <el-tabs v-model="tab" tab-position="left" @tab-click="(tab)=>tabChange(tab.name)" style="height:100%">
-            <el-tab-pane label="总表" name="1"></el-tab-pane>
-            <el-tab-pane label="官方无效" name='2'></el-tab-pane>
-          </el-tabs>
-        </div> -->
-        <div style="width:100%;padding-right:5px">
+      <el-main id="patent-list-container" v-loading="loading" >
+        <div class="height_100">
           <component :is="viewType" v-bind="$attrs" v-on="$listeners" :isOperate="isOperate" :tableData="dataList" @tabChange="tabChange" :fixedSearch="fixedSearch"
           :state="state" :queryParams="queryParams" @option="handleOption" @on-sort="handleSort" :groupBy="groupingValue"
           :groupingOption="groupingOption" :commonData="commonData" :searchOption="searchOption" :column="columnList" @params="getParams"></component>

src/views/report/components/view/table.vue

@@ -1,15 +1,6 @@
 <template>
-  <div class="height_100">
-    <div class="height_100" v-DivHeight="getDivHeight">
-      <el-container>
-        <!-- <el-aside width="95px">
-          <el-tabs v-model="tab" tab-position="left" @tab-click="tabClick">
-            <el-tab-pane label="总表" name="1"></el-tab-pane>
-            <el-tab-pane label="官方无效" name='2'></el-tab-pane>
-          </el-tabs>
-        </el-aside> -->
-        <el-main style="padding:0 0 0 10px !important">
-          <el-table :data="tableData" border style="width: 100%" header-row-class-name="custom-table-header"
+  <div class="height_100" style="width:100%" v-DivHeight="getDivHeight">
+          <el-table :data="tableData" border style="max-width: 100%;overflow-x:auto" header-row-class-name="custom-table-header"
           @sort-change="sortChange" v-if="showTable" :height="tableHeight" v-el-table-infinite-scroll="getList" :infinite-scroll-distance="10" 
         :infinite-scroll-disabled="disabled"
             >
@@ -19,7 +10,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :key="item.value" :prop="item.value" :render-header=" $commonJS.renderHeaderMethods" :label="item.name" :sortable="item.ifSort?'custom':false" align="center">
+            <el-table-column v-for="item in column.filter(item=>!item.ifHidden)" :key="item.value" :prop="item.value" :render-header="$commonJS.renderHeaderMethods" :label="item.name" :sortable="item.ifSort?'custom':false" align="center" min-width="80">
               <template slot-scope="scope">
                <div>
                </div>
@@ -70,10 +61,7 @@
             </template>
           </el-table-column>
           </el-table>
-      </el-main>
-      </el-container>
     </div>
-  </div>
 </template>
 
 <script>

src/views/visual/components/drawer/titleDrawer.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="height_100">
       <el-drawer class="custom-drawer-form" size="900px" :with-header="false" :visible.sync="drawer" direction="rtl" :before-close="close" destroy-on-close append-to-body>
           <div style="padding:10px;height:100%">
               <el-tabs v-model="components">