Merge branch 'techPool_818'

src/views/custom_manage/etaTrialList/config.js

@@ -29,6 +29,9 @@ export const etaTrialColumn = [
     key:'LastLoginTime',
     label:'最近一次登录时间',
     minWidth:'120'
+  },{
+    key:'LastLoginDuration',
+    label:'最近一次登录时长',
   },{
     key:'LoginNum',
     label:'累计登录次数',

src/views/custom_manage/etaTrialList/etaTrialList.vue

@@ -184,7 +184,7 @@ export default {
       tableLoading:false,//表格loading
       sortKeys:[
         'Expiration','ModifyTime','LastLoginTime','ActiveTime',
-        'IndexNum','ChartNum','LoginNum'
+        'IndexNum','ChartNum','LoginNum','LastLoginDuration'
       ],//需要排序的字段
       SortParam:'',//排序字段
       SortType:'',//升序降序
@@ -273,7 +273,7 @@ export default {
     },
     sortChangeHandle({prop,order}){
       this.SortParam = prop
-      this.SortType = order==='ascending'?'asc':'desc'
+      this.SortType = order?order==='ascending'?'asc':'desc':''
       this.currentPage=1
       this.getTableData()
     },