dedsudiyu 2 년 전
부모
커밋
89ca27b5a9

+ 2 - 2
src/views/safetyCheck/dataStatistics/checkIndexStatistics.vue

@@ -177,7 +177,7 @@
         if(this.userFlg){
           //院级
           hiddenDataItemsSubList(obj).then(response => {
-            this.total = response.total;
+            this.total = response.data.total;
             this.tableList = response.data.records;
           });
           hiddenDataItemsSubListTop(objTop).then(response => {
@@ -186,7 +186,7 @@
         }else{
           //校级
           dataStatisticsItemsList(obj).then(response => {
-            this.total = response.total;
+            this.total = response.data.total;
             this.tableList = response.data.records;
           });
           dataStatisticsItemsListTop(objTop).then(response => {

+ 8 - 5
src/views/safetyCheck/dataStatistics/laboratoryStatistics.vue

@@ -75,7 +75,7 @@
       搜索到实验室总数 {{numData.sumTotal}},存在危险源的实验室数 {{numData.hazardSubjectTotal}},危险源总数 {{numData.hazardTotal}}<span v-for="item in numData.classListVo">,{{item.levelName}} {{item.amount}}</span>
     </div>
     <el-table  border :data="tableList" ref="multipleTable"
-               :row-key="getRowKeys"
+               tooltip-effect="dark" :row-key="getRowKeys"
                @select="select" @select-all="selectAll">
       <el-table-column type="selection" width="50" align="center" fixed/>
       <el-table-column label="序号" align="center"  type="index" width="60" fixed/>
@@ -165,7 +165,7 @@
           obj.endTime = "";
         }
         dataStatisticsSubList(obj).then(response => {
-          this.total = response.total;
+          this.total = response.data.total;
           this.tableList = response.data.records;
         });
         dataStatisticsSubListTop(obj).then(response => {
@@ -232,6 +232,8 @@
       },
       // 单选
       select (selection, row) {
+        console.log('selection',selection)
+        console.log('row',row)
         if (selection.some(el => { return row.id === el.id })) {
           if (row.children) {
             this.setChildren(row.children, true)
@@ -272,16 +274,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__body-wrapper{
+    padding-bottom: 8px;
+  }
   ::v-deep .el-table__fixed{
     margin-top:-1px;
     margin-left:-1px;
-    height:100%!important;
+    height:calc(100% - 8px)!important;
   }
   ::v-deep .el-table__fixed-body-wrapper{
     height: calc(100% - 48px);
     overflow-y: auto;
-    pointer-events: none;
-    cursor: default;
   }
   .laboratoryStatistics{
     flex:1;

+ 5 - 4
src/views/safetyCheck/dataStatistics/safetyHazardStatistics.vue

@@ -167,7 +167,7 @@
           obj.endTime = "";
         }
         dataStatisticsHazardList(obj).then(response => {
-          this.total = response.total;
+          this.total = response.data.total;
           this.tableList = response.data.records;
         });
         dataStatisticsHazardListTop(obj).then(response => {
@@ -272,16 +272,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__body-wrapper{
+    padding-bottom: 8px;
+  }
   ::v-deep .el-table__fixed{
     margin-top:-1px;
     margin-left:-1px;
-    height:100%!important;
+    height:calc(100% - 8px)!important;
   }
   ::v-deep .el-table__fixed-body-wrapper{
     height: calc(100% - 48px);
     overflow-y: auto;
-    pointer-events: none;
-    cursor: default;
   }
   .safetyHazardStatistics{
     flex:1;

+ 4 - 3
src/views/safetyCheck/laboratorySelfTest/selfInspectionManagement/index.vue

@@ -313,16 +313,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__body-wrapper{
+    padding-bottom: 8px;
+  }
   ::v-deep .el-table__fixed{
     margin-top:-1px;
     margin-left:-1px;
-    height:100%!important;
+    height:calc(100% - 8px)!important;
   }
   ::v-deep .el-table__fixed-body-wrapper{
     height: calc(100% - 48px);
     overflow-y: auto;
-    pointer-events: none;
-    cursor: default;
   }
   .selfInspectionManagement{
     flex: 1;

+ 4 - 3
src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -304,16 +304,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__body-wrapper{
+    padding-bottom: 8px;
+  }
   ::v-deep .el-table__fixed{
     margin-top:-1px;
     margin-left:-1px;
-    height:100%!important;
+    height:calc(100% - 8px)!important;
   }
   ::v-deep .el-table__fixed-body-wrapper{
     height: calc(100% - 48px);
     overflow-y: auto;
-    pointer-events: none;
-    cursor: default;
   }
   .selfInspectionManagement{
     flex: 1;

+ 4 - 3
src/views/safetyCheck/schoolInspection/inspectionManagement/index.vue

@@ -311,16 +311,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__body-wrapper{
+    padding-bottom: 8px;
+  }
   ::v-deep .el-table__fixed{
     margin-top:-1px;
     margin-left:-1px;
-    height:100%!important;
+    height:calc(100% - 8px)!important;
   }
   ::v-deep .el-table__fixed-body-wrapper{
     height: calc(100% - 48px);
     overflow-y: auto;
-    pointer-events: none;
-    cursor: default;
   }
   .inspectionManagement{
     flex: 1;

+ 4 - 3
src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -304,16 +304,17 @@
 </script>
 
 <style scoped lang="scss">
+  ::v-deep .el-table__body-wrapper{
+    padding-bottom: 8px;
+  }
   ::v-deep .el-table__fixed{
     margin-top:-1px;
     margin-left:-1px;
-    height:100%!important;
+    height:calc(100% - 8px)!important;
   }
   ::v-deep .el-table__fixed-body-wrapper{
     height: calc(100% - 48px);
     overflow-y: auto;
-    pointer-events: none;
-    cursor: default;
   }
   .selfInspectionManagement{
     flex: 1;