:lipstick: Updating the UI and style files.

src/const/crud/admin/token.js

@@ -16,52 +16,53 @@
  */
 
 const DIC = {
-  vaild: [{
-    label: '否',
-    value: 'false'
-  }, {
-    label: '是',
-    value: 'true'
-  }]
+    vaild: [{
+        label: '否',
+        value: 'false'
+    }, {
+        label: '是',
+        value: 'true'
+    }]
 }
 export const tableOption = {
-  'border': true,
-  'index': true,
-  'indexLabel': '序号',
-  'stripe': true,
-  'menuAlign': 'center',
-  'align': 'center',
-  'addBtn': false,
-  'editBtn': false,
-  'delBtn': false,
-  'dic': [],
-  'column': [{
-    label: '令牌',
-    prop: 'token_value',
-    align: 'center'
-  }, {
-    label: '用户ID',
-    prop: 'user_id',
-    align: 'center'
-  }, {
-    label: '用户名',
-    prop: 'user_name',
-    align: 'center'
-  }, {
-    label: '类型',
-    prop: 'token_type',
-    align: 'center'
-  }, {
-    label: '过期时间',
-    prop: 'expires_in',
-    align: 'center'
-  }, {
-    label: '客户端',
-    prop: 'client_id',
-    align: 'center'
-  }, {
-    label: '授权类型',
-    prop: 'grant_type',
-    align: 'center'
-  }]
+    'border': true,
+    'index': true,
+    'indexLabel': '序号',
+    'stripe': true,
+    'menuAlign': 'center',
+    'align': 'center',
+    'addBtn': false,
+    'editBtn': false,
+    'delBtn': false,
+    'dic': [],
+    'column': [{
+        label: '用户ID',
+        prop: 'user_id',
+        align: 'center'
+    }, {
+        label: '用户名',
+        prop: 'user_name',
+        align: 'center'
+    }, {
+        label: '令牌',
+        prop: 'token_value',
+        align: 'center',
+        'overHidden': true
+    }, {
+        label: '类型',
+        prop: 'token_type',
+        align: 'center'
+    }, {
+        label: '过期时间',
+        prop: 'expires_in',
+        align: 'center'
+    }, {
+        label: '客户端',
+        prop: 'client_id',
+        align: 'center'
+    }, {
+        label: '授权类型',
+        prop: 'grant_type',
+        align: 'center'
+    }]
 }

src/const/crud/daemon/execution-log.js

@@ -14,62 +14,85 @@
  * this software without specific prior written permission.
  * Author: lengleng (wangiegie@gmail.com)
  */
+const DIC = {
+    isSuccess: [{
+        label: '成功',
+        value: 1
+    },
+        {
+            label: '失败',
+            value: 0
+        }
+    ]
+}
 
 export const tableOption = {
-  'border': true,
-  'index': true,
-  'indexLabel': '序号',
-  'stripe': true,
-  'menuAlign': "center",
-  'align': "center",
-  'editBtn': false,
-  'delBtn': false,
-  'addBtn': false,
-  'dic': [],
-  'column': [
-	  {
-      label: 'ID',
-      prop: 'id'
-    },
-	  {
-      label: '任务名称',
-      prop: 'jobName'
-    },
-	  {
-      label: '任务ID',
-      prop: 'taskId'
-    },
-	  {
-      label: '主机名',
-      prop: 'hostname'
-    },
-	  {
-      label: 'IP',
-      prop: 'ip'
-    },
-	  {
-      label: '分片项',
-      prop: 'shardingItem'
-    },
-	  {
-      label: '执行源',
-      prop: 'executionSource'
-    },
-	  {
-      label: '失败原因',
-      prop: 'failureCause'
-    },
-	  {
-      label: '执行结果',
-      prop: 'isSuccess'
-    },
-	  {
-      label: '开始时间',
-      prop: 'startTime'
-    },
-	  {
-      label: '完成时间',
-      prop: 'completeTime'
-    },
-  ]
+    'border': true,
+    'index': true,
+    'indexLabel': '序号',
+    'stripe': true,
+    'menuAlign': "center",
+    'align': "center",
+    'editBtn': false,
+    'delBtn': false,
+    'addBtn': false,
+    'viewBtn':true,
+    'dic': [],
+    'column': [
+        {
+            label: 'ID',
+            prop: 'id',
+            hide: true
+        },
+        {
+            label: '任务名称',
+            prop: 'jobName'
+        },
+        {
+            label: '任务ID',
+            prop: 'taskId',
+            hide: true,
+            overHidden: true
+        },
+        {
+            label: '主机名',
+            prop: 'hostname',
+            hide: true
+        },
+        {
+            label: 'IP',
+            prop: 'ip'
+        },
+        {
+            width: 80,
+            label: '分片项',
+            prop: 'shardingItem'
+        },
+        {
+            label: '执行源',
+            prop: 'executionSource',
+            hide: true
+        },
+        {
+            label: '失败原因',
+            prop: 'failureCause',
+            hide: true
+        },
+        {
+            width: 100,
+            label: '执行结果',
+            prop: 'isSuccess',
+            type: 'select',
+            dicData: DIC.isSuccess,
+        },
+        {
+            label: '开始时间',
+            prop: 'startTime',
+            hide: true
+        },
+        {
+            label: '完成时间',
+            prop: 'completeTime'
+        },
+    ]
 }

src/const/crud/daemon/status-trace-log.js

@@ -17,9 +17,9 @@
 
 const DIC = {
     state: [{
-            label: '准备中',
-            value: 'TASK_STAGING'
-        },
+        label: '准备中',
+        value: 'TASK_STAGING'
+    },
         {
             label: '执行中',
             value: 'TASK_RUNNING'
@@ -39,12 +39,13 @@ export const tableOption = {
     "editBtn": false,
     "delBtn": false,
     "addBtn": false,
+    "viewBtn": true,
     "dic": [],
     "column": [{
-            label: 'ID',
-            prop: 'id',
-            hide: true
-        },
+        label: 'ID',
+        prop: 'id',
+        hide: true
+    },
         {
             label: '作业名称',
             prop: 'jobName',
@@ -73,28 +74,31 @@ export const tableOption = {
         {
             label: '执行类型',
             prop: 'executionType',
-            hide: true,
-            width: 100
+            hide: true
         },
         {
+            width: 100,
             label: '分片项',
             prop: 'shardingItem'
         },
         {
+            width: 100,
             label: '状态',
             prop: 'state',
             type: 'select',
             dicData: DIC.state,
             search: true
         },
-        {
-            label: '创建时间',
-            prop: 'creationTime'
-        },
         {
             label: '消息',
             prop: 'message',
-            width: 100
+            width: 100,
+            overHidden: true,
+            hide: true
+        },
+        {
+            label: '创建时间',
+            prop: 'creationTime'
         }
     ]
-}
+}

src/views/daemon/execution-log/index.vue

@@ -28,13 +28,6 @@
                  @row-update="handleUpdate"
                  @row-save="handleSave"
                  @row-del="rowDel">
-        <template slot="menuLeft">
-          <el-button type="primary"
-                     @click="handleAdd"
-                     size="small"
-                     v-if="permissions.daemon_execution_log_add">新 增</el-button>
-          <br /><br />
-        </template>
         <template slot-scope="scope"
                   slot="menu">
           <el-button type="text"
@@ -78,10 +71,11 @@
         this.tableLoading = true
         fetchList(Object.assign({
           page: page.currentPage,
-          limit: page.pageSize
+          limit: page.pageSize,
+          descs: 'start_time'
         }, params)).then(response => {
-          this.tableData = response.data.records
-          this.page.total = response.data.total
+          this.tableData = response.data.data.records
+          this.page.total = response.data.data.total
           this.tableLoading = false
         })
       },

vue.config.js

@@ -1,4 +1,4 @@
-const url = 'http://zn.huaxiadaowei.com'
+const url = 'http://127.0.0.1:9999'
 module.exports = {
   lintOnSave: true,
   productionSourceMap: false,