修复 对话框被侧边菜单栏遮住的bug,调整appMain的 z-index
This commit is contained in:
@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
|
|||||||
// 创建axios实例
|
// 创建axios实例
|
||||||
const service = axios.create({
|
const service = axios.create({
|
||||||
baseURL: process.env.BASE_API, // api 的 base_url
|
baseURL: process.env.BASE_API, // api 的 base_url
|
||||||
timeout: 10000 // 请求超时时间
|
timeout: 900000 // 请求超时时间
|
||||||
})
|
})
|
||||||
|
|
||||||
// request拦截器
|
// request拦截器
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<div ref="editor" style="text-align:left;margin: 5px;">
|
<div ref="editor" style="text-align:left;margin: 5px">
|
||||||
<h3 style="text-align: center;">欢迎使用 wangEditor 富文本编辑器!</h3>
|
<h3 style="text-align: center;">欢迎使用 wangEditor 富文本编辑器!</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<li>富文本中图片上传使用的是sm.ms图床,支持上传到七牛云:<a style="color: #42b983" target="_blank" href="https://sm.ms/">sm.ms</a></li>
|
<li>富文本中图片上传使用的是sm.ms图床,支持上传到七牛云:<a style="color: #42b983" target="_blank" href="https://sm.ms/">sm.ms</a></li>
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ export default {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.app-main {
|
.app-main {
|
||||||
|
z-index: 88;
|
||||||
/*84 = navbar + tags-view = 50 +34 */
|
/*84 = navbar + tags-view = 50 +34 */
|
||||||
min-height: calc(100vh - 84px);
|
min-height: calc(100vh - 84px);
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-scrollbar style="z-index: 10000000" wrap-class="scrollbar-wrapper">
|
<el-scrollbar wrap-class="scrollbar-wrapper">
|
||||||
<el-menu
|
<el-menu
|
||||||
:show-timeout="200"
|
:show-timeout="200"
|
||||||
:default-active="$route.path"
|
:default-active="$route.path"
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-dialog :visible.sync="dialog" style="margin-left: 100px" title="异常详情" top="0" width="85%">
|
<el-dialog :append-to-body="true" :visible.sync="dialog" title="异常详情" top="0" width="85%">
|
||||||
<span>
|
<span>
|
||||||
{{ errorInfo }}
|
{{ errorInfo }}
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog :append-to-body="true" :visible.sync="dialog" style="margin-left: 50px;" title="执行日志" width="1040px">
|
<el-dialog :append-to-body="true" :visible.sync="dialog" title="执行日志" width="88%">
|
||||||
<!-- 搜索 -->
|
<!-- 搜索 -->
|
||||||
<div class="head-container">
|
<div class="head-container">
|
||||||
<el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
|
<el-input v-model="query.value" clearable placeholder="输入任务名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="toQuery"/>
|
||||||
@@ -10,12 +10,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<!--表格渲染-->
|
<!--表格渲染-->
|
||||||
<el-table v-loading="loading" :data="data" size="small" border style="width: 100%;margin-top: -10px;">
|
<el-table v-loading="loading" :data="data" size="small" border style="width: 100%;margin-top: -10px;">
|
||||||
<el-table-column :show-overflow-tooltip="true" prop="jobName" width="90px" label="任务名称"/>
|
<el-table-column :show-overflow-tooltip="true" prop="jobName" label="任务名称"/>
|
||||||
<el-table-column :show-overflow-tooltip="true" prop="beanName" width="110px" label="Bean名称"/>
|
<el-table-column :show-overflow-tooltip="true" prop="beanName" label="Bean名称"/>
|
||||||
<el-table-column :show-overflow-tooltip="true" prop="methodName" width="110px" label="执行方法"/>
|
<el-table-column :show-overflow-tooltip="true" prop="methodName" label="执行方法"/>
|
||||||
<el-table-column :show-overflow-tooltip="true" prop="params" width="120px" label="参数"/>
|
<el-table-column :show-overflow-tooltip="true" prop="params" width="120px" label="参数"/>
|
||||||
<el-table-column :show-overflow-tooltip="true" prop="cronExpression" width="120px" label="cron表达式"/>
|
<el-table-column :show-overflow-tooltip="true" prop="cronExpression" label="cron表达式"/>
|
||||||
<el-table-column prop="createTime" label="异常详情" width="100px">
|
<el-table-column prop="createTime" label="异常详情" width="110px">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-show="scope.row.exceptionDetail" size="mini" type="text" @click="info(scope.row.exceptionDetail)">查看详情</el-button>
|
<el-button v-show="scope.row.exceptionDetail" size="mini" type="text" @click="info(scope.row.exceptionDetail)">查看详情</el-button>
|
||||||
</template>
|
</template>
|
||||||
@@ -32,7 +32,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
<el-dialog :visible.sync="errorDialog" append-to-body style="margin-left: 100px" title="异常详情" width="85%">
|
<el-dialog :visible.sync="errorDialog" append-to-body title="异常详情" width="85%">
|
||||||
<span>
|
<span>
|
||||||
{{ errorInfo }}
|
{{ errorInfo }}
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
Reference in New Issue
Block a user