11

2021-01-24 17:46:02 +08:00 · 2021-01-24 17:46:02 +08:00 · 702297f5c3
parent 8d25b00a41
commit 702297f5c3
11 changed files with 371 additions and 14 deletions
--- a/hchyun-ui/src/api/system/module.js
+++ b/hchyun-ui/src/api/system/module.js
@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询模块管理列表
+export function listModule(query) {
+  return request({
+    url: '/system/module/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询模块管理详细
+export function getModule(id) {
+  return request({
+    url: '/system/module/' + id,
+    method: 'get'
+  })
+}
+
+// 新增模块管理
+export function addModule(data) {
+  return request({
+    url: '/system/module',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改模块管理
+export function updateModule(data) {
+  return request({
+    url: '/system/module',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除模块管理
+export function delModule(id) {
+  return request({
+    url: '/system/module/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出模块管理
+export function exportModule(query) {
+  return request({
+    url: '/system/module/export',
+    method: 'get',
+    params: query
+  })
+}
--- a/hchyun-ui/src/assets/styles/hcy.scss
+++ b/hchyun-ui/src/assets/styles/hcy.scss
@ -1,6 +1,6 @@
 /**
 * 通用css样式布局处理
- * Copyright (c) 2019 ruoyi
+ * Copyright (c) 2019 hchyun
 */

 /** 基础通用 **/
@ -237,4 +237,4 @@
 .top-right-btn {
 	position: relative;
 	float: right;
-}
+}
--- a/hchyun-ui/src/directive/permission/hasPermi.js
+++ b/hchyun-ui/src/directive/permission/hasPermi.js
@ -1,8 +1,8 @@
 /**
 * 操作权限处理
- * Copyright (c) 2019 ruoyi
+ * Copyright (c) 2019 hchyun
 */
- 
+
 import store from '@/store'

 export default {
--- a/hchyun-ui/src/directive/permission/hasRole.js
+++ b/hchyun-ui/src/directive/permission/hasRole.js
@ -1,8 +1,8 @@
 /**
 * 角色权限处理
- * Copyright (c) 2019 ruoyi
+ * Copyright (c) 2019 hchyun
 */
- 
+
 import store from '@/store'

 export default {
--- a/hchyun-ui/src/main.js
+++ b/hchyun-ui/src/main.js
@ -8,7 +8,7 @@ import Element from 'element-ui'
 import './assets/styles/element-variables.scss'

 import '@/assets/styles/index.scss' // global css
-import '@/assets/styles/hcy.scss' // ruoyi css
+import '@/assets/styles/hcy.scss' // hchyun css
 import App from './App'
 import store from './store'
 import router from './router'
--- a/hchyun-ui/src/utils/hcy.js
+++ b/hchyun-ui/src/utils/hcy.js
@ -1,6 +1,6 @@
 /**
 * 通用js方法封装处理
- * Copyright (c) 2019 ruoyi
+ * Copyright (c) 2019 hchyun
 */

 const baseURL = process.env.VUE_APP_BASE_API
--- a/hchyun-ui/src/views/monitor/job/index.vue
+++ b/hchyun-ui/src/views/monitor/job/index.vue
@ -160,7 +160,7 @@
                <el-tooltip placement="top">
                  <div slot="content">
                    Bean调用示例：ryTask.ryParams('ry')
-                    <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
+                    <br />Class类调用示例：com.hchyun.quartz.task.RyTask.ryParams('ry')
                    <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
                  </div>
                  <i class="el-icon-question"></i>
@ -480,4 +480,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/hchyun-ui/src/views/system/module/index.vue
+++ b/hchyun-ui/src/views/system/module/index.vue
@ -0,0 +1,304 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="模块名称" prop="mName">
+        <el-input
+          v-model="queryParams.mName"
+          placeholder="请输入模块名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="模块描述" prop="mDescribe">
+        <el-input
+          v-model="queryParams.mDescribe"
+          placeholder="请输入模块描述"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="daterangeCreateTime"
+          size="small"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <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
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:module:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:module:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:module:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:module:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="moduleList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="模块名称" align="center" prop="mName" />
+      <el-table-column label="模块描述" align="center" prop="mDescribe" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:module:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:module:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改模块管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="模块名称" prop="mName">
+          <el-input v-model="form.mName" placeholder="请输入模块名称" />
+        </el-form-item>
+        <el-form-item label="模块描述" prop="mDescribe">
+          <el-input v-model="form.mDescribe" 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>
+  </div>
+</template>
+
+<script>
+import { listModule, getModule, delModule, addModule, updateModule, exportModule } from "@/api/system/module";
+
+export default {
+  name: "Module",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 模块管理表格数据
+      moduleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 创建时间时间范围
+      daterangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mName: null,
+        mDescribe: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        mName: [
+            { required: true, message: "模块名称不能为空}", trigger: "blur" },
+        ],
+        mDescribe: [
+            { required: true, message: "模块描述不能为空}", trigger: "blur" },
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询模块管理列表 */
+    getList() {
+      this.loading = true;
+        listModule(this.addCreateDateRange(this.queryParams,this.daterangeCreateTime)).then(response =>{
+        this.moduleList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        mName: null,
+        mDescribe: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.daterangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加模块管理";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getModule(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改模块管理";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateModule(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addModule(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除模块管理编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delModule(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有模块管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportModule(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>
--- a/hchyun-ui/src/views/tool/gen/genInfoForm.vue
+++ b/hchyun-ui/src/views/tool/gen/genInfoForm.vue
@ -16,7 +16,7 @@
        <el-form-item prop="packageName">
          <span slot="label">
            生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
+            <el-tooltip content="生成在哪个java包下，例如 com.hchyun.system" placement="top">
              <i class="el-icon-question"></i>
            </el-tooltip>
          </span>
--- a/hchyun-ui/src/views/tool/gen/index.vue
+++ b/hchyun-ui/src/views/tool/gen/index.vue
@ -269,7 +269,7 @@ export default {
          this.msgSuccess("成功生成到自定义路径：" + row.genPath);
        });
      } else {
-        downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
+        downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "hchyun");
      }
    },
    /** 同步数据库操作 */
@ -337,4 +337,4 @@ export default {
    }
  }
 };
-</script>
+</script>
--- a/hchyun-ui/vue.config.js
+++ b/hchyun-ui/vue.config.js
@ -16,7 +16,7 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
 module.exports = {
  // 部署生产环境和开发环境下的URL。
  // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
-  // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
+  // 例如 https://www.hchyun.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.hchyun.vip/admin/，则设置 baseUrl 为 /admin/。
  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
  // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
  outputDir: 'dist',