Merge branch 'web-v2' into web-v2-pro

src/views/safetyCheck/dataStatistics/laboratoryStatistics.vue

@@ -77,10 +77,10 @@
     <el-table  border :data="tableList" ref="multipleTable"
                :row-key="getRowKeys"
                @select="select" @select-all="selectAll">
-      <el-table-column type="selection" width="50" align="center"/>
-      <el-table-column label="序号" align="center"  type="index" width="60" />
-      <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200"/>
-      <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180"/>
+      <el-table-column type="selection" width="50" align="center" fixed/>
+      <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+      <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
+      <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180" fixed/>
       <el-table-column label="房间号" align="center" prop="roomNumber" show-overflow-tooltip width="100"/>
       <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="180"/>
       <el-table-column label="安全分类" align="center" prop="typeName" show-overflow-tooltip width="100"/>
@@ -272,6 +272,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__fixed{
+    margin-top:-1px;
+    margin-left:-1px;
+    height:100%!important;
+  }
+  ::v-deep .el-table__fixed-body-wrapper{
+    height: calc(100% - 48px);
+    overflow-y: auto;
+    pointer-events: none;
+    cursor: default;
+  }
   .laboratoryStatistics{
     flex:1;
     display: flex;

src/views/safetyCheck/dataStatistics/safetyHazardStatistics.vue

@@ -77,10 +77,10 @@
     <el-table  border :data="tableList" ref="multipleTable"
                :row-key="getRowKeys"
                @select="select" @select-all="selectAll">
-      <el-table-column type="selection" width="50" align="center"/>
-      <el-table-column label="序号" align="center"  type="index" width="60" />
-      <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip width="200"/>
-      <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200"/>
+      <el-table-column type="selection" width="50" align="center" fixed/>
+      <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+      <el-table-column label="计划任务" align="center" prop="title" show-overflow-tooltip width="200" fixed/>
+      <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="200" fixed/>
       <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="180"/>
       <el-table-column label="房间号" align="center" prop="subRoom" show-overflow-tooltip width="100"/>
       <el-table-column label="楼栋" align="center" prop="buildName" show-overflow-tooltip width="180"/>
@@ -272,6 +272,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__fixed{
+    margin-top:-1px;
+    margin-left:-1px;
+    height:100%!important;
+  }
+  ::v-deep .el-table__fixed-body-wrapper{
+    height: calc(100% - 48px);
+    overflow-y: auto;
+    pointer-events: none;
+    cursor: default;
+  }
   .safetyHazardStatistics{
     flex:1;
     display: flex;

src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -72,9 +72,9 @@
       </div>
       <div class="content-box">
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
-          <el-table-column label="序号" align="center"  type="index" width="60" />
-          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220">
+          <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250" fixed/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220" fixed>
             <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
           </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
@@ -313,6 +313,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__fixed{
+    margin-top:-1px;
+    margin-left:-1px;
+    height:100%!important;
+  }
+  ::v-deep .el-table__fixed-body-wrapper{
+    height: calc(100% - 48px);
+    overflow-y: auto;
+    pointer-events: none;
+    cursor: default;
+  }
   .selfInspectionManagement{
     flex: 1;
     display: flex !important;

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -67,9 +67,9 @@
       </div>
       <div class="content-box">
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
-          <el-table-column label="序号" align="center"  type="index" width="60" />
-          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220">
+          <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250" fixed/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220" fixed>
             <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
           </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
@@ -304,6 +304,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__fixed{
+    margin-top:-1px;
+    margin-left:-1px;
+    height:100%!important;
+  }
+  ::v-deep .el-table__fixed-body-wrapper{
+    height: calc(100% - 48px);
+    overflow-y: auto;
+    pointer-events: none;
+    cursor: default;
+  }
   .selfInspectionManagement{
     flex: 1;
     display: flex !important;

src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -72,9 +72,9 @@
       </div>
       <div class="content-box">
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
-          <el-table-column label="序号" align="center"  type="index" width="60" />
-          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220">
+          <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250" fixed/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220" fixed>
             <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
           </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
@@ -311,6 +311,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__fixed{
+    margin-top:-1px;
+    margin-left:-1px;
+    height:100%!important;
+  }
+  ::v-deep .el-table__fixed-body-wrapper{
+    height: calc(100% - 48px);
+    overflow-y: auto;
+    pointer-events: none;
+    cursor: default;
+  }
   .inspectionManagement{
     flex: 1;
     display: flex !important;

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -67,9 +67,9 @@
       </div>
       <div class="content-box">
         <el-table  border :data="tableList" ref="multipleTable" @sort-change="sortChange">
-          <el-table-column label="序号" align="center"  type="index" width="60" />
-          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250"/>
-          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220">
+          <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
+          <el-table-column label="计划标题" align="center" prop="title" show-overflow-tooltip width="250" fixed/>
+          <el-table-column label="实验室" align="center" prop="subjectName" show-overflow-tooltip width="220" fixed>
             <template slot-scope="scope">{{scope.row.roomNumber?scope.row.subjectName+'-'+scope.row.roomNumber:scope.row.subjectName}}</template>
           </el-table-column>
           <el-table-column label="学院" align="center" prop="collegeName" show-overflow-tooltip width="150"/>
@@ -304,6 +304,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__fixed{
+    margin-top:-1px;
+    margin-left:-1px;
+    height:100%!important;
+  }
+  ::v-deep .el-table__fixed-body-wrapper{
+    height: calc(100% - 48px);
+    overflow-y: auto;
+    pointer-events: none;
+    cursor: default;
+  }
   .selfInspectionManagement{
     flex: 1;
     display: flex !important;