chris před 3 roky
rodič
revize
5ae1549f5c

+ 1 - 0
src/icons/svg/icon-dingshirenwu.svg

@@ -0,0 +1 @@
+<svg t="1641467206588" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4864" width="200" height="200"><path d="M512 0C230.4 0 0 230.4 0 512s230.4 512 512 512 512-230.4 512-512-230.4-512-512-512z m0 960c-249.6 0-448-198.4-448-448s198.4-448 448-448 448 198.4 448 448-198.4 448-448 448z" fill="" p-id="4865"></path><path d="M556.8 518.4V339.2c0-19.2-12.8-32-32-32s-32 12.8-32 32v192c0 6.4 0 19.2 6.4 19.2l198.4 204.8c6.4 6.4 12.8 12.8 25.6 12.8 6.4 0 12.8 0 19.2-6.4 12.8-12.8 12.8-32 0-44.8L556.8 518.4z" fill="" p-id="4866"></path></svg>

+ 8 - 8
src/mock/index.js

@@ -3,10 +3,10 @@ import * as common from './modules/common'
 // import * as jobSchedule from './modules/job-schedule'
 import * as oss from './modules/oss'
 import * as sysConfig from './modules/sys-config'
-import * as sysLog from './modules/sys-log'
-import * as sysMenu from './modules/sys-menu'
-import * as sysRole from './modules/sys-role'
-import * as sysUser from './modules/sys-user'
+// import * as sysLog from './modules/sys-log'
+// import * as sysMenu from './modules/sys-menu'
+// import * as sysRole from './modules/sys-role'
+// import * as sysUser from './modules/sys-user'
 
 // tips
 // 1. 开启/关闭[业务模块]拦截, 通过调用fnCreate方法[isOpen参数]设置.
@@ -15,10 +15,10 @@ fnCreate(common, true)
 // fnCreate(jobSchedule, true)
 fnCreate(oss, true)
 fnCreate(sysConfig, true)
-fnCreate(sysLog, true)
-fnCreate(sysMenu, true)
-fnCreate(sysRole, true)
-fnCreate(sysUser, false)
+// fnCreate(sysLog, true)
+// fnCreate(sysMenu, true)
+// fnCreate(sysRole, true)
+// fnCreate(sysUser, false)
 
 /**
  * 创建mock模拟数据

+ 12 - 6
src/views/modules/job/schedule-log.vue

@@ -16,32 +16,38 @@
       :data="dataList"
       border
       v-loading="dataListLoading"
-      height="460"
+      height="542"
       style="width: 100%;">
       <el-table-column
         prop="logId"
         header-align="center"
         align="center"
-        width="80"
+        min-width="100"
+        :show-tooltip-when-overflow="true"
         label="日志ID">
       </el-table-column>
       <el-table-column
         prop="jobId"
         header-align="center"
         align="center"
-        width="80"
+        min-width="100"
+        :show-tooltip-when-overflow="true"
         label="任务ID">
       </el-table-column>
       <el-table-column
         prop="beanName"
         header-align="center"
         align="center"
+        min-width="120"
+        :show-tooltip-when-overflow="true"
         label="bean名称">
       </el-table-column>
       <el-table-column
         prop="params"
         header-align="center"
         align="center"
+        min-width="160"
+        :show-tooltip-when-overflow="true"
         label="参数">
       </el-table-column>
       <el-table-column
@@ -50,7 +56,7 @@
         align="center"
         label="状态">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.status === 0" size="small">成功</el-tag>
+          <el-tag v-if="Number(scope.row.status) === 0" size="small">成功</el-tag>
           <el-tag v-else @click.native="showErrorInfo(scope.row.logId)" size="small" type="danger" style="cursor: pointer;">失败</el-tag>
         </template>
       </el-table-column>
@@ -64,7 +70,7 @@
         prop="createTime"
         header-align="center"
         align="center"
-        width="180"
+        min-width="160"
         label="执行时间">
       </el-table-column>
     </el-table>
@@ -104,7 +110,7 @@
       getDataList () {
         this.dataListLoading = true
         this.$http({
-          url: this.$http.adornUrl('/user-service/sys/scheduleLog/list'),
+          url: this.$http.adornUrl(`/user-service/sys/scheduleLog/list`),
           method: 'get',
           params: this.$http.adornParams({
             'current': this.pageIndex,