From ee1daaaa69184bcdfcb42aa9073289f6bbef51d0 Mon Sep 17 00:00:00 2001
From: zhengjie <zhengjie@tom.com>
Date: Mon, 4 Mar 2019 15:29:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=AF=B9=E8=AF=9D?=
 =?UTF-8?q?=E6=A1=86=E8=A2=AB=E4=BE=A7=E8=BE=B9=E8=8F=9C=E5=8D=95=E6=A0=8F?=
 =?UTF-8?q?=E9=81=AE=E4=BD=8F=E7=9A=84bug=EF=BC=8C=E8=B0=83=E6=95=B4appMai?=
 =?UTF-8?q?n=E7=9A=84=20z-index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 src/views/components/Editor.vue               |  2 +-
 src/views/layout/components/AppMain.vue       |  1 +
 src/views/layout/components/Sidebar/index.vue |  2 +-
 src/views/monitor/log/errorLog.vue            |  2 +-
 src/views/system/timing/module/log.vue        | 14 +++++++-------
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 81ac065..b7611a5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth'
 // 创建axios实例
 const service = axios.create({
   baseURL: process.env.BASE_API, // api 的 base_url
-  timeout: 10000 // 请求超时时间
+  timeout: 900000 // 请求超时时间
 })
 
 // request拦截器
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 5f5c410..543f715 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -1,6 +1,6 @@
 <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>
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index 8a8fe46..5f2e104 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -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%;
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 7a7ae74..dff85f1 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -1,5 +1,5 @@
 <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"
diff --git a/src/views/monitor/log/errorLog.vue b/src/views/monitor/log/errorLog.vue
index d04fdb0..401a931 100644
--- a/src/views/monitor/log/errorLog.vue
+++ b/src/views/monitor/log/errorLog.vue
@@ -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>
diff --git a/src/views/system/timing/module/log.vue b/src/views/system/timing/module/log.vue
index b23f7dd..8a6f79c 100644
--- a/src/views/system/timing/module/log.vue
+++ b/src/views/system/timing/module/log.vue
@@ -1,5 +1,5 @@
 <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="100px">
+      <el-table-column :show-overflow-tooltip="true" prop="cronExpression" label="cron表达式"/>
+      <el-table-column prop="createTime" label="异常详情" width="110px">
         <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>