Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
front-backend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
framework
front-backend
Commits
ee1daaaa
Commit
ee1daaaa
authored
Mar 04, 2019
by
zhengjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 对话框被侧边菜单栏遮住的bug,调整appMain的 z-index
parent
97b73676
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
11 deletions
+12
-11
src/utils/request.js
+1
-1
src/views/components/Editor.vue
+1
-1
src/views/layout/components/AppMain.vue
+1
-0
src/views/layout/components/Sidebar/index.vue
+1
-1
src/views/monitor/log/errorLog.vue
+1
-1
src/views/system/timing/module/log.vue
+7
-7
No files found.
src/utils/request.js
View file @
ee1daaaa
...
...
@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
// 创建axios实例
const
service
=
axios
.
create
({
baseURL
:
process
.
env
.
BASE_API
,
// api 的 base_url
timeout
:
1
0000
// 请求超时时间
timeout
:
90
0000
// 请求超时时间
})
// request拦截器
...
...
src/views/components/Editor.vue
View file @
ee1daaaa
<
template
>
<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>
<ul>
<li>
富文本中图片上传使用的是sm.ms图床,支持上传到七牛云:
<a
style=
"color: #42b983"
target=
"_blank"
href=
"https://sm.ms/"
>
sm.ms
</a></li>
...
...
src/views/layout/components/AppMain.vue
View file @
ee1daaaa
...
...
@@ -24,6 +24,7 @@ export default {
<
style
scoped
>
.app-main
{
z-index
:
88
;
/*84 = navbar + tags-view = 50 +34 */
min-height
:
calc
(
100vh
-
84px
);
width
:
100%
;
...
...
src/views/layout/components/Sidebar/index.vue
View file @
ee1daaaa
<
template
>
<el-scrollbar
style=
"z-index: 10000000"
wrap-class=
"scrollbar-wrapper"
>
<el-scrollbar
wrap-class=
"scrollbar-wrapper"
>
<el-menu
:show-timeout=
"200"
:default-active=
"$route.path"
...
...
src/views/monitor/log/errorLog.vue
View file @
ee1daaaa
...
...
@@ -19,7 +19,7 @@
</
template
>
</el-table-column>
</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>
{{ errorInfo }}
</span>
...
...
src/views/system/timing/module/log.vue
View file @
ee1daaaa
<
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"
>
<el-input
v-model=
"query.value"
clearable
placeholder=
"输入任务名称搜索"
style=
"width: 200px;"
class=
"filter-item"
@
keyup
.
enter
.
native=
"toQuery"
/>
...
...
@@ -10,12 +10,12 @@
</div>
<!--表格渲染-->
<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=
"beanName"
width=
"110px"
label=
"Bean名称"
/>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"methodName"
width=
"110px"
label=
"执行方法"
/>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"jobName"
label=
"任务名称"
/>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"beanName"
label=
"Bean名称"
/>
<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=
"cronExpression"
width=
"120px"
label=
"cron表达式"
/>
<el-table-column
prop=
"createTime"
label=
"异常详情"
width=
"1
0
0px"
>
<el-table-column
:show-overflow-tooltip=
"true"
prop=
"cronExpression"
label=
"cron表达式"
/>
<el-table-column
prop=
"createTime"
label=
"异常详情"
width=
"1
1
0px"
>
<template
slot-scope=
"scope"
>
<el-button
v-show=
"scope.row.exceptionDetail"
size=
"mini"
type=
"text"
@
click=
"info(scope.row.exceptionDetail)"
>
查看详情
</el-button>
</
template
>
...
...
@@ -32,7 +32,7 @@
</
template
>
</el-table-column>
</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>
{{ errorInfo }}
</span>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment