eta1.2.2

src/views/dataSource_manage/components/DelEDBTable.vue

@@ -8,6 +8,7 @@
             ref="tableIns"
             :data="tableData"
             border
+            @sort-change="handleTableSortChange"
         >
             <el-table-column
                 v-for="col in tableColOpts"
@@ -61,6 +62,10 @@ export default {
             pageSize:15,
             page:1,
             total:0,
+            filterState:{
+                sortKey:'',
+                sortType:'',
+            },
 
             showSetTableCols:false,
         }
@@ -75,7 +80,8 @@ export default {
             apiDataSource.GLDelTableList({
                 CurrentIndex:this.page,
                 PageSize:this.pageSize,
-                SortParam:'',
+                SortParam:this.filterState.sortKey,
+                SortType:this.filterState.sortType,
                 CreateTime:''
             }).then(res=>{
                 this.tableLoading=false
@@ -117,6 +123,20 @@ export default {
             this.showSetTableCols=true
         },
 
+        // 筛选项刷新列表
+        handleRefreshList(){
+            this.page=1
+            this.getTableList()
+        },
+
+        // 排序
+        handleTableSortChange({column, prop, order}){
+            console.log(column, prop, order);
+            this.filterState.sortKey=prop
+            this.filterState.sortType=order==='descending'?'desc':order==='ascending'?'asc':''
+            this.handleRefreshList()
+        },
+
         // table说明文案
         getTableHeadTips(key){
             const tipsMap={

src/views/dataSource_manage/components/DetailTable.vue

@@ -52,7 +52,7 @@
                 v-model="filterState.keyword"
                 clearable
                 style="width:250px"
-                @change="handleRefreshList"
+                @input="handleRefreshList"
             />
         </div>
         <img src="~@/assets/img/data_m/set_icon.png" alt="" style="cursor: pointer;" @click="showSetTableCols=true">
@@ -167,6 +167,10 @@ export default {
                 SortParam:this.filterState.sortKey,
                 SortType:this.filterState.sortType,
                 CreateTime:this.filterState.dateVal,
+                TerminalCode:this.filterState.terminalCode?this.filterState.terminalCode.join(','):'',
+                SysUserId:this.filterState.user?this.filterState.user.join(','):'',
+                Frequency:this.filterState.frequency?this.filterState.frequency.join(','):'',
+                KeyWord:this.filterState.keyword
             }).then(res=>{
                 this.tableLoading=false
                 if(res.Ret===200){
@@ -272,6 +276,16 @@ export default {
 }
 </script>
 
+<style lang="scss">
+.detail-table-wrap{
+    .top-wrap{
+        .el-cascader__search-input{
+            min-width: 30px;
+        }
+    }
+}
+
+</style>
 <style lang="scss" scoped>
 .top-wrap{
     display: flex;

src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -8,6 +8,7 @@
             ref="tableIns"
             :data="tableData"
             border
+            @sort-change="handleTableSortChange"
         >
             <el-table-column
                 v-for="col in tableColOpts"
@@ -64,7 +65,9 @@ export default {
             total:0,
             tableLoading:false,
             filterState:{
-                dateVal:this.$moment().format('YYYY-MM-DD')||''
+                dateVal:this.$moment().format('YYYY-MM-DD')||'',
+                sortKey:'',
+                sortType:'',
             },
 
             showSetTableCols:false,
@@ -80,7 +83,8 @@ export default {
             apiDataSource.GLEdbInfoTableList({
                 CurrentIndex:this.page,
                 PageSize:this.pageSize,
-                SortParam:'',
+                SortParam:this.filterState.sortKey,
+                SortType:this.filterState.sortType,
                 CreateTime:this.filterState.dateVal,
             }).then(res=>{
                 this.tableLoading=false
@@ -128,6 +132,14 @@ export default {
             this.showSetTableCols=true
         },
 
+        // 排序
+        handleTableSortChange({column, prop, order}){
+            console.log(column, prop, order);
+            this.filterState.sortKey=prop
+            this.filterState.sortType=order==='descending'?'desc':order==='ascending'?'asc':''
+            this.handleRefreshList()
+        },
+
         // table说明文案
         getTableHeadTips(key){
             const tipsMap={