eta1.2.2

src/api/modules/dataSource.js

@@ -52,6 +52,11 @@ const apiDataSource={
     accountSet:params=>{
         return http.post('/data_stat/terminal/status/set',params)
     },
+
+    // 获取终端编码数据
+    terminalCodeArr:params=>{
+        return http.get('/data_stat/terminal/code',{})
+    }
     
 
 }

src/views/dataSource_manage/components/DelEDBTable.vue

@@ -17,6 +17,7 @@
                 :prop="col.ColumnKey"
                 :sortable="col.IsSort===1?'custom':false"
                 align="center"
+                :width="getColWidth(col.ColumnKey)"
             >
                 <template slot="header" slot-scope="scope">
                     <span>{{col.ColumnName}}</span>
@@ -123,6 +124,19 @@ export default {
                 ErDataUpdateDate:'指标数据发生变化的最早日期',
             }
             return tipsMap[key]
+        },
+
+        // 设置列的宽度
+        getColWidth(key){
+            const widthMap={
+                DataUpdateTime:'150px',
+                ErDataUpdateDate:'200px',
+                StartDate:'150px',
+                LatestDate:'150px',
+                CreateTime:'150px'
+            }
+
+            return widthMap[key]
         }
     },
 }

src/views/dataSource_manage/components/DetailTable.vue

@@ -3,19 +3,32 @@
         <div class="top-wrap">
         <div class="filter-box">
             <el-select
+                v-model="filterState.terminalCode"
                 placeholder="终端编码"
                 multiple
                 clearable
-                style="width:200px"
+                collapse-tags
+                style="width:250px"
+                @change="handleRefreshList"
             >
-
+                <el-option
+                    v-for="item in terminalCodeOpts"
+                    :key="item.TerminalCode"
+                    :label="item.Name"
+                    :value="item.TerminalCode"
+                />
             </el-select> 
             <el-cascader
+                v-model="filterState.user"
                 placeholder="创建人"
-                :props="{multiple: true}"
+                :options="sysUserOpts"
+                :props="props"
                 collapse-tags
+                :show-all-levels="false"
                 clearable
-                style="width:200px"
+                @change="handleRefreshList"
+                filterable
+                style="width:250px"
             />
             <el-select
                 v-model="filterState.frequency"
@@ -23,7 +36,8 @@
                 multiple
                 clearable
                 collapse-tags
-                style="width:200px"
+                style="width:250px"
+                @change="handleRefreshList"
             >
                 <el-option
                     v-for="item in frequencyOpt"
@@ -37,7 +51,8 @@
                 prefix-icon="el-icon-search"
                 v-model="filterState.keyword"
                 clearable
-                style="width:200px"
+                style="width:250px"
+                @change="handleRefreshList"
             />
         </div>
         <img src="~@/assets/img/data_m/set_icon.png" alt="" style="cursor: pointer;" @click="showSetTableCols=true">
@@ -57,6 +72,7 @@
                 :prop="col.ColumnKey"
                 :sortable="col.IsSort===1?'custom':false"
                 align="center"
+                :width="getColWidth(col.ColumnKey)"
             >
                 <template slot="header" slot-scope="scope">
                     <span>{{col.ColumnName}}</span>
@@ -99,15 +115,29 @@
 import {apiDataSource} from '@/api/modules/dataSource'
 import {frequencyOpt} from '../utils/config'
 import SetTableCols from './SetTableCols.vue'
+import { departInterence } from "@/api/api.js";
 export default {
     components:{SetTableCols},
     data() {
         return {
             tipsKeysArr:['EdbNameSource','DataUpdateTime','ErDataUpdateDate','NeedRefresh','HasRefresh','SourceUpdateTime'],
             frequencyOpt,
+            terminalCodeOpts:[],
+            sysUserOpts:[],
+            props: {
+                value: "AdminId",
+                label: "RealName",
+                children: "ChildrenList",
+                multiple: true,
+                emitPath:false
+            },
             filterState:{
                 frequency:'',
                 keyword:'',
+                sortKey:'',
+                sortType:'',
+                terminalCode:'',
+                user:[],
                 dateVal:this.$moment().format('YYYY-MM-DD')||''
             },
             checkAll:false,
@@ -124,6 +154,8 @@ export default {
     },
     created() {
         this.getTableColOpts()
+        this.getTerminalCodeOpts()
+        this.getSysUserList()
     },
     methods: {
         //获取表格数据
@@ -132,7 +164,8 @@ export default {
             apiDataSource.GLDetailTableList({
                 CurrentIndex:this.page,
                 PageSize:this.pageSize,
-                SortParam:'',
+                SortParam:this.filterState.sortKey,
+                SortType:this.filterState.sortType,
                 CreateTime:this.filterState.dateVal,
             }).then(res=>{
                 this.tableLoading=false
@@ -181,16 +214,26 @@ export default {
         // 排序
         handleTableSortChange({column, prop, order}){
             console.log(column, prop, order);
+            this.filterState.sortKey=prop
+            this.filterState.sortType=order==='descending'?'desc':order==='ascending'?'asc':''
+            this.handleRefreshList()
         },
 
-        // 表格选择变更
-        handleTableSelectChange(e){
-            this.getTableColOpts()
+        // 获取终端编码数据
+        getTerminalCodeOpts(){
+            apiDataSource.terminalCodeArr().then(res=>{
+                if(res.Ret===200){
+                    this.terminalCodeOpts=res.Data.List||[]
+                }
+            })
         },
 
-        //设置刷新时间弹窗
-        handleShowSetRefreshTime(){
-            this.showSetRefreshTime=true
+        // 获取所有系统用户
+        async getSysUserList() {
+            const res = await departInterence.getQuestionAdminList();
+            if (res.Ret === 200) {
+                this.sysUserOpts = res.Data.List||[];
+            }
         },
 
         handleShowSetTableCol(){
@@ -208,6 +251,22 @@ export default {
                 SourceUpdateTime:'指标最近一次执行刷新任务的时间'
             }
             return tipsMap[key]
+        },
+
+        // 设置列的宽度
+        getColWidth(key){
+            const widthMap={
+                EdbNameSource:'120px',
+                DataUpdateTime:'120px',
+                ErDataUpdateDate:'200px',
+                NeedRefresh:'200px',
+                HasRefresh:'200px',
+                SourceUpdateTime:'120px',
+                SourceUpdateResult:'120px',
+                SourceUpdateFailedReason:'120px'
+            }
+
+            return widthMap[key]
         }
     },
 }

src/views/dataSource_manage/components/EDBInfoChangeTable.vue

@@ -17,6 +17,7 @@
                 :prop="col.ColumnKey"
                 :sortable="col.IsSort===1?'custom':false"
                 align="center"
+                :width="getColWidth(col.ColumnKey)"
             >
                 <template slot="header" slot-scope="scope">
                     <span>{{col.ColumnName}}</span>
@@ -135,6 +136,21 @@ export default {
                 ErDataUpdateDate:'指标数据发生变化的最早日期',
             }
             return tipsMap[key]
+        },
+
+        // 设置列的宽度
+        getColWidth(key){
+            const widthMap={
+                EdbName:'150px',
+                DataUpdateTime:'150px',
+                ErDataUpdateDate:'200px',
+                StartDate:'150px',
+                LatestDate:'150px',
+                CreateTime:'150px',
+                EdbNameSource:'150px'
+            }
+
+            return widthMap[key]
         }
     },
 }

src/views/dataSource_manage/components/StatisticTable.vue

@@ -16,6 +16,7 @@
                 :label="col.ColumnName"
                 :prop="col.ColumnKey"
                 align="center"
+                :width="getColWidth(col.ColumnKey)"
             >
                 <template slot="header" slot-scope="scope">
                     <span>{{col.ColumnName}}</span>
@@ -151,6 +152,17 @@ export default {
                 UpdateSuccessNum:' 今日该终端刷新成功的指标数量'
             }
             return tipsMap[key]
+        },
+
+        // 设置列的宽度
+        getColWidth(key){
+            const widthMap={
+                NeedUpdateNum:'200px',
+                HasUpdateNum:'200px',
+                UpdateSuccessNum:'200px'
+            }
+
+            return widthMap[key]
         }
     },
 }

src/views/dataSource_manage/dataSourceListGL.vue

@@ -97,6 +97,7 @@ export default {
         border: 1px solid #DCDFE6; 
         background-color: #fff;
         min-height: calc(100vh - 380px);
+        padding-bottom: 80px;
     }
 }
 </style>