2.0 抢先版，主要更新了#10

src/views/generator/module/form.vue

@@ -4,12 +4,15 @@
       <el-form-item label="作者名称" prop="author">
         <el-input v-model="form.author" style="width: 420px;"/>
       </el-form-item>
-      <el-form-item label="至于包下" prop="pack">
-        <el-input v-model="form.pack" style="width: 420px;"/>
+      <el-form-item label="去表前缀" prop="prefix">
+        <el-input v-model="form.prefix" placeholder="默认不去除表前缀" style="width: 420px;"/>
       </el-form-item>
       <el-form-item label="模块名称" prop="moduleName">
         <el-input v-model="form.moduleName" style="width: 420px;"/>
       </el-form-item>
+      <el-form-item label="至于包下" prop="pack">
+        <el-input v-model="form.pack" style="width: 420px;"/>
+      </el-form-item>
       <el-form-item label="前端路径" prop="path">
         <el-input v-model="form.path" style="width: 420px;"/>
       </el-form-item>
@@ -34,7 +37,7 @@ export default {
   data() {
     return {
       loading: false, dialog: false,
-      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '' },
+      form: { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' },
       rules: {
         author: [
           { required: true, message: '作者不能为空', trigger: 'blur' }
@@ -88,7 +91,7 @@ export default {
     resetForm() {
       this.dialog = false
       this.$refs['form'].resetFields()
-      this.form = { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '' }
+      this.form = { author: '', pack: '', path: '', moduleName: '', cover: 'false', apiPath: '', prefix: '' }
     }
   }
 }

src/views/layout/components/Settings/index.vue

@@ -2,7 +2,6 @@
   <div class="drawer-container">
     <div>
       <h3 class="drawer-title">系统布局配置</h3>
-
       <div class="drawer-item">
         <span>显示 Logo</span>
         <el-switch v-model="sidebarLogo" class="drawer-switch" />
@@ -16,14 +15,13 @@
         <el-switch v-model="tagsView" class="drawer-switch" />
       </div>
       <div class="drawer-item">
-        <span>显示 SettingBtn</span>
+        <span>显示 SettingButton</span>
         <el-switch v-model="settingBtn" class="drawer-switch" />
       </div>
       <div class="drawer-item">
-        <span>菜单 uniqueOpened</span>
+        <span>菜单 UniqueOpened</span>
         <el-switch v-model="uniqueOpened" class="drawer-switch" />
       </div>
-
     </div>
   </div>
 </template>

src/views/monitor/log/errorLog.vue

@@ -15,7 +15,7 @@
       </el-table-column>
       <el-table-column prop="createTime" label="异常详情" width="100px">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="info(scope.row.exceptionDetail)">查看详情</el-button>
+          <el-button size="mini" type="text" @click="info(scope.row.id)">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -37,6 +37,7 @@
 <script>
 import initData from '@/mixins/initData'
 import { parseTime } from '@/utils/index'
+import { getErrDetail } from '@/api/log'
 import eHeader from './module/header'
 export default {
   components: { eHeader },
@@ -64,9 +65,11 @@ export default {
       if (logType !== '' && logType !== null) { this.params['logType'] = logType }
       return true
     },
-    info(errorInfo) {
-      this.errorInfo = errorInfo
+    info(id) {
       this.dialog = true
+      getErrDetail(id).then(res => {
+        this.errorInfo = res.exception
+      })
     }
   }
 }

src/views/monitor/log/msg.vue

@@ -28,8 +28,8 @@ export default {
   data() {
     return {
       ico: 'unlock', unlock: true, content: '锁定滚动条',
-      height: document.documentElement.clientHeight - 94.5 + 'px;',
-      width: document.documentElement.clientWidth - 185 + 'px;',
+      height: document.documentElement.clientHeight - 140 + 'px;',
+      width: document.documentElement.clientWidth - 210 + 'px;',
       data: [{ name: 'elAdmin-', timestamp: new Date(), threadName: 'system-prompt-message', level: 'INFO', className: 'me.zhengjie.AppRun' + ' :', body: 'Welcome, no log output' }],
       // level
       INFO: '#0000ff', WARN: '#FFFF00', ERROR: '#FF0000', DEBUG: '#DEA000'

src/views/monitor/redis/index.vue

@@ -48,7 +48,6 @@
 import checkPermission from '@/utils/permission' // 权限判断函数
 import initData from '@/mixins/initData'
 import { del } from '@/api/redis'
-import { getPermissionTree } from '@/api/permission'
 import eHeader from './module/header'
 import edit from './module/edit'
 export default {
@@ -60,7 +59,6 @@ export default {
     }
   },
   created() {
-    this.getPermissions()
     this.$nextTick(() => {
       this.init()
     })
@@ -95,11 +93,6 @@ export default {
         this.$refs[index].doClose()
         console.log(err.response.data.message)
       })
-    },
-    getPermissions() {
-      getPermissionTree().then(res => {
-        this.permissions = res
-      })
     }
   }
 }

src/views/system/job/index.vue

@@ -6,7 +6,7 @@
       <el-table-column prop="name" label="名称"/>
       <el-table-column label="所属部门">
         <template slot-scope="scope">
-          <div>{{ scope.row.dept.name }}</div>
+          <div>{{ scope.row.deptSuperiorName ? scope.row.deptSuperiorName + ' / ' : '' }}{{ scope.row.dept.name }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="sort" label="排序">