Merge branch 'dev' of github.com:wenjianzhang/go-admin-ui into mymaster

.env.production

@@ -2,5 +2,5 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/'
+VUE_APP_BASE_API = 'http://www.zhangwj.com:8000'
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "go-admin",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "https://github.com/wenjianzhang/go-admin-ui",
   "license": "MIT",

src/App.vue

@@ -9,6 +9,15 @@ export default {
   name: 'App'
 }
 </script>
+<script>
+var _hmt = _hmt || [];
+(function() {
+  var hm = document.createElement("script");
+  hm.src = "https://hm.baidu.com/hm.js?1d2d61263f13e4b288c8da19ad3ff56d";
+  var s = document.getElementsByTagName("script")[0];
+  s.parentNode.insertBefore(hm, s);
+})();
+</script>
 
 <style lang="scss">
   .el-dialog__wrapper{

src/api/sysconfig.js

@@ -0,0 +1,45 @@
+import request from '@/utils/request'
+
+// 查询SysConfig列表
+export function listSysConfig(query) {
+  return request({
+    url: '/api/v1/sysconfigList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询SysConfig详细
+export function getSysConfig(configId) {
+  return request({
+    url: '/api/v1/sysconfig/' + configId,
+    method: 'get'
+  })
+}
+
+// 新增SysConfig
+export function addSysConfig(data) {
+  return request({
+    url: '/api/v1/sysconfig',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改SysConfig
+export function updateSysConfig(data) {
+  return request({
+    url: '/api/v1/sysconfig',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除SysConfig
+export function delSysConfig(configId) {
+  return request({
+    url: '/api/v1/sysconfig/' + configId,
+    method: 'delete'
+  })
+}
+

src/api/sysjob.js

@@ -39,7 +39,7 @@ export function updateSysJob(data) {
 export function delSysJob(jobId) {
   return request({
     url: '/api/v1/sysjob/' + jobId,
-    method: 'get'
+    method: 'delete'
   })
 }
 

src/views/sysconfig/index.vue

@@ -0,0 +1,279 @@
+
+<template>
+  <BasicLayout>
+    <template #wrapper>
+      <el-card class="box-card">
+        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['sysconfig:sysconfig:add']"
+              type="primary"
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+            >新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['sysconfig:sysconfig:edit']"
+              type="success"
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+            >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              v-permisaction="['sysconfig:sysconfig:remove']"
+              type="danger"
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+            >删除
+            </el-button>
+          </el-col>
+        </el-row>
+
+        <el-table v-loading="loading" :data="sysconfigList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <el-button
+                v-permisaction="['sysconfig:sysconfig:edit']"
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+              >修改
+              </el-button>
+              <el-button
+                v-permisaction="['sysconfig:sysconfig:remove']"
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+              >删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageIndex"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+
+        <!-- 添加或修改对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px">
+          <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+            <el-form-item label="" prop="configName">
+              <el-input
+                v-model="form.configName"
+                placeholder=""
+              />
+            </el-form-item>
+            <el-form-item label="" prop="configKey">
+              <el-input
+                v-model="form.configKey"
+                placeholder=""
+              />
+            </el-form-item>
+            <el-form-item label="" prop="configValue">
+              <el-input
+                v-model="form.configValue"
+                placeholder=""
+              />
+            </el-form-item>
+            <el-form-item label="" prop="configType">
+              <el-input
+                v-model="form.configType"
+                placeholder=""
+              />
+            </el-form-item>
+            <el-form-item label="" prop="remark">
+              <el-input
+                v-model="form.remark"
+                placeholder=""
+              />
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="submitForm">确 定</el-button>
+            <el-button @click="cancel">取 消</el-button>
+          </div>
+        </el-dialog>
+      </el-card>
+    </template>
+  </BasicLayout>
+</template>
+
+<script>
+import { addSysConfig, delSysConfig, getSysConfig, listSysConfig, updateSysConfig } from '@/api/sysconfig'
+
+export default {
+  name: 'Config',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      isEdit: false,
+      // 类型数据字典
+      typeOptions: [],
+      sysconfigList: [],
+
+      // 查询参数
+      queryParams: {
+        pageIndex: 1,
+        pageSize: 10
+
+      },
+      // 表单参数
+      form: {
+      },
+      // 表单校验
+      rules: {}
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询参数列表 */
+    getList() {
+      this.loading = true
+      listSysConfig(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+        this.sysconfigList = response.data.list
+        this.total = response.data.count
+        this.loading = false
+      }
+      )
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+
+        configId: undefined,
+        configName: undefined,
+        configKey: undefined,
+        configValue: undefined,
+        configType: undefined,
+        remark: undefined
+      }
+      this.resetForm('form')
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageIndex = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加SysConfig'
+      this.isEdit = false
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.configId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const configId =
+                row.configId || this.ids
+      getSysConfig(configId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改SysConfig'
+        this.isEdit = true
+      })
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.configId !== undefined) {
+            updateSysConfig(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess('修改成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          } else {
+            addSysConfig(this.form).then(response => {
+              if (response.code === 200) {
+                this.msgSuccess('新增成功')
+                this.open = false
+                this.getList()
+              } else {
+                this.msgError(response.msg)
+              }
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const Ids = row.configId || this.ids
+      this.$confirm('是否确认删除编号为"' + Ids + '"的数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(function() {
+        return delSysConfig(Ids)
+      }).then(() => {
+        this.getList()
+        this.msgSuccess('删除成功')
+      }).catch(function() {
+      })
+    }
+  }
+}
+</script>

src/views/sysjob/index.vue

@@ -405,7 +405,7 @@ export default {
         misfirePolicy: 1,
         concurrent: 1,
         jobType: 1,
-        status: 0
+        status: undefined
       }
       this.resetForm('form')
     },

src/views/sysuser/index.vue

@@ -314,11 +314,10 @@ import { getToken } from '@/utils/auth'
 import { treeselect } from '@/api/system/dept'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import BasicLayout from "@/layout/BasicLayout";
 
 export default {
   name: 'User',
-  components: { Treeselect, BasicLayout },
+  components: { Treeselect },
   data() {
     return {
       // 遮罩层

src/views/tools/gen/index.vue

@@ -153,17 +153,26 @@
 
       <!-- 预览界面 -->
 
-      <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh">
-        <el-tabs v-model="preview.activeName">
-          <el-tab-pane
-            v-for="(value, key) in preview.data"
-            :key="key"
-            :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.template'))"
-            :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.template'))"
-          >
-            <pre>{{ value }}</pre>
-          </el-tab-pane>
-        </el-tabs>
+      <el-dialog :title="preview.title" :visible.sync="preview.open" top="5vh">
+        <div class="el-dialog-container">
+          <el-tabs v-model="preview.activeName">
+            <el-tab-pane
+              v-for="(value, key) in preview.data"
+              :key="key"
+              :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.template'))"
+              :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.template'))"
+            >
+
+              <pre class="pre">
+                <el-scrollbar>
+                 {{ value }}
+                 </el-scrollbar>
+              </pre>
+
+            </el-tab-pane>
+          </el-tabs>
+        </div>
+
       </el-dialog>
       <import-table ref="importTB" @ok="handleQuery" />
     </template>
@@ -328,3 +337,23 @@ export default {
   }
 }
 </script>
+
+<style lang="scss" scoped>
+ .el-dialog-container /deep/{
+   height:600px;
+   overflow: hidden;
+   .el-scrollbar__view{
+     height: 100%;
+   }
+   .pre{
+     height: 546px;
+      overflow: hidden;
+      .el-scrollbar{
+        height: 100%;
+      }
+   }
+   .el-scrollbar__wrap::-webkit-scrollbar{
+     display: none;
+   }
+ }
+</style>

vue.config.js

@@ -1,6 +1,6 @@
 'use strict'
 const path = require('path')
-const CompressionPlugin = require('compression-webpack-plugin');//引入gzip压缩插件
+const CompressionPlugin = require('compression-webpack-plugin')// 引入gzip压缩插件
 const defaultSettings = require('./src/settings.js')
 
 function resolve(dir) {
@@ -28,7 +28,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: '/',
-  outputDir: '../service/view/admin',
+  outputDir: 'dist',
   // assetsDir: '../../static/admin',
   // assetsDir: '/',
   lintOnSave: false, // process.env.NODE_ENV === 'development',
@@ -45,12 +45,12 @@ module.exports = {
     plugins: [
       new CompressionPlugin({
         algorithm: 'gzip',
-        test:/\.js$|\.html$|\.css/,//匹配文件名
-        threshold:10240,//对超过10kb的数据进行压缩
-        deleteOriginalAssets:false,//是否删除原文件
+        test: /\.js$|\.html$|\.css/, // 匹配文件名
+        threshold: 10240, // 对超过10kb的数据进行压缩
+        deleteOriginalAssets: false, // 是否删除原文件
         minRatio: 0.8
       }),
-      new MonacoWebpackPlugin(),
+      new MonacoWebpackPlugin()
     ],
     name: name,
     resolve: {