修改

dsk-operate-ui/package.json

@@ -54,7 +54,7 @@
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
-    "sortablejs": "1.10.2",
+    "sortablejs": "^1.15.0",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",

dsk-operate-ui/src/assets/styles/index.scss

@@ -364,7 +364,10 @@ ul, li {
       background: #DCEBFF;
     }
     .el-table__fixed{
-      bottom:0 !important;
+      //bottom:0 !important;
+      .el-table__body{
+        padding-bottom:16px;
+      }
       tr:nth-child(2n){
         background-color: #F8FBFF;
       }
@@ -394,7 +397,7 @@ ul, li {
       }
     }
   }
-  
+
 }
 .el-table__body tr.hover-row > td.el-table__cell{
   background-color: #DCEBFF;

dsk-operate-ui/src/views/index.vue

@@ -422,7 +422,6 @@ export default {
           cbxmzs:'193',
           cbxmzje:'123',
         },
-
       ],
       gjjlData:[
         {
@@ -672,7 +671,6 @@ export default {
                 global: false
               }
             },
-
           },
           {
             data: this.jyfxData1.map(item => item.dcjzje),

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -31,6 +31,7 @@
           element-loading-text="Loading"
           border
           fit
+          height="640"
           @sort-change="sortChange"
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -36,6 +36,7 @@
           element-loading-text="Loading"
           @sort-change="sortChange"
           border
+          height="640"
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"
           :default-sort = "{prop: 'gdp', order: 'descending'}"
@@ -153,22 +154,12 @@
       this.getYears()
     },
     mounted() {
-      // window.addEventListener("scroll",this.scrolling)
+
     },
     beforeDestroy() {
-      // window.removeEventListener("scroll", this.scrolling);
+
     },
     methods: {
-      scrolling() {
-        // let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
-        // let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
-        // if (scrollTop>138){
-        //   let top = scrollTop-138
-        //   el.style.top = top+'px'
-        // }else{
-        //   el.style.top = 0
-        // }
-      },
       getYears(){
         getYears({}).then(res => {
           this.yearOptions=res.data.reverse();

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue

@@ -96,7 +96,7 @@
         </div>
         <div class="table-item">
           <el-table
-            :data="tableData1"
+            :data="dataList"
             border
             height="430"
             fit
@@ -155,6 +155,7 @@ export default {
         },
       ],
       tableData1:[],
+      dataList:[],
       dataSort:[
         {
           label:'',
@@ -234,13 +235,15 @@ export default {
     getDataByMonth(params){
       countGroupByMonth(params).then(res => {
         this.tableData1=res.data;
-        let companyValue1 = JSON.parse(JSON.stringify(this.tableData1))
-        let arr = this.tableData1.sort((a, b) => {
+        this.dataList=res.data;
+        let dataList=res.data
+        let dataArr = JSON.parse(JSON.stringify(dataList))
+        let arr = dataList.sort((a, b) => {
           return b.count - a.count
         })
-        this.tableData1 = JSON.parse(JSON.stringify(companyValue1))
         this.dataSort=arr;
         this.initChart1()
+        this.dataList = JSON.parse(JSON.stringify(dataArr))
       })
     },
     initChart() {

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -153,6 +153,7 @@
             element-loading-text="Loading"
             @sort-change="sortChange"
             border
+            height="640"
             fit
             highlight-current-row
           >