Merge branch 'master' of https://gitea.qinmian.online/2112A-ONE/cloud-ui

src/api/quest/node.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询节点管理列表
+export function listNode(query) {
+  return request({
+    url: '/quest/node/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询节点管理详细
+export function getNode(id) {
+  return request({
+    url: '/quest/node/' + id,
+    method: 'get'
+  })
+}
+
+// 新增节点管理
+export function addNode(data) {
+  return request({
+    url: '/quest/node',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改节点管理
+export function updateNode(data) {
+  return request({
+    url: '/quest/node',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除节点管理
+export function delNode(id) {
+  return request({
+    url: '/quest/node/' + id,
+    method: 'delete'
+  })
+}

src/api/rule/ruleType.js

@@ -4,7 +4,7 @@ import request from '@/utils/request'
 export function listRuleType(query) {
   return request({
     url: '/rule/ruleType/list',
-    method: 'get',
+    method: 'post',
     params: query
   })
 }

src/views/quest/node/index.vue

@@ -0,0 +1,308 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="节点名称" prop="nodeName">
+        <el-input
+          v-model="queryParams.nodeName"
+          placeholder="请输入节点名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="启用状态" prop="state">
+        <el-select v-model="queryParams.state" placeholder="请选择启用状态" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_enable_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="['quest:node: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="['quest:node: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="['quest:node: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="['quest:node:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="nodeList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="自增主键" align="center" prop="id" />
+      <el-table-column label="节点编码" align="center" prop="nodeCode" />
+      <el-table-column label="节点名称" align="center" prop="nodeName" />
+      <el-table-column label="节点入参" align="center" prop="nodeReq" />
+      <el-table-column label="节点出参" align="center" prop="nodeResp" />
+      <el-table-column label="上一级节点" align="center" prop="nodePreCode" />
+      <el-table-column label="下一级节点" align="center" prop="nodeNextCode" />
+      <el-table-column label="启用状态" align="center" prop="state">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_enable_status" :value="scope.row.state"/>
+        </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="['quest:node:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['quest:node: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="nodeCode">
+          <el-input v-model="form.nodeCode" placeholder="请输入节点编码" />
+        </el-form-item>
+        <el-form-item label="节点名称" prop="nodeName">
+          <el-input v-model="form.nodeName" placeholder="请输入节点名称" />
+        </el-form-item>
+        <el-form-item label="节点入参" prop="nodeReq">
+          <el-input v-model="form.nodeReq" placeholder="请输入节点入参" />
+        </el-form-item>
+        <el-form-item label="节点出参" prop="nodeResp">
+          <el-input v-model="form.nodeResp" placeholder="请输入节点出参" />
+        </el-form-item>
+        <el-form-item label="上一级节点" prop="nodePreCode">
+          <el-input v-model="form.nodePreCode" placeholder="请输入上一级节点" />
+        </el-form-item>
+        <el-form-item label="下一级节点" prop="nodeNextCode">
+          <el-input v-model="form.nodeNextCode" placeholder="请输入下一级节点" />
+        </el-form-item>
+        <el-form-item label="启用状态" prop="state">
+          <el-radio-group v-model="form.state">
+            <el-radio
+              v-for="dict in dict.type.sys_enable_status"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" 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 { listNode, getNode, delNode, addNode, updateNode } from "/src/api/quest/node";
+
+export default {
+  name: "Node",
+  dicts: ['sys_enable_status'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 节点管理表格数据
+      nodeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        nodeName: null,
+        state: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        nodeCode: [
+          { required: true, message: "节点编码不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询节点管理列表 */
+    getList() {
+      this.loading = true;
+      listNode(this.queryParams).then(response => {
+        this.nodeList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        nodeCode: null,
+        nodeName: null,
+        nodeReq: null,
+        nodeResp: null,
+        nodePreCode: null,
+        nodeNextCode: null,
+        state: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      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
+      getNode(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) {
+            updateNode(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addNode(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除节点管理编号为"' + ids + '"的数据项？').then(function() {
+        return delNode(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('quest/node/export', {
+        ...this.queryParams
+      }, `node_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

src/views/quest/task/index.vue

@@ -149,7 +149,7 @@
 </template>
 
 <script>
-import {listQuest, getQuest, delQuest, addQuest, updateQuest} from "../../api/quest/quest";
+import {listQuest, getQuest, delQuest, addQuest, updateQuest} from "../../../api/quest/quest";
 
 export default {
   name: "Quest",

src/views/rule/ruleType/index.vue

@@ -74,14 +74,14 @@
     <el-table v-loading="loading" :data="ruleTypeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="自增主键" align="center" prop="id" />
-      <el-table-column label="规则分类编码" align="center" prop="ruleTypeCode" />
-      <el-table-column label="规则分类名称" align="center" prop="ruleTypeName" />
-      <el-table-column label="类型描述" align="center" prop="ruleTypeDesc" />
-      <el-table-column label="启用状态" align="center" prop="state">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.state"/>
-        </template>
-      </el-table-column>
+      <el-table-column label="规则分类编码" align="center" prop="ruleType" />
+<!--      <el-table-column label="规则分类名称" align="center" prop="ruleTypeName" />-->
+<!--      <el-table-column label="类型描述" align="center" prop="ruleTypeDesc" />-->
+<!--      <el-table-column label="启用状态" align="center" prop="state">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.state"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/tool/gen/genInfoForm.vue

@@ -27,7 +27,7 @@
         <el-form-item prop="moduleName">
           <span slot="label">
             生成模块名
-            <el-tooltip content="可理解为子系统名，例如 system" placement="top">
+            <el-tooltip content="指的是项目在网关注册的路径名称(不推荐首字母大写)，例: 一个项目在网关注册路径为'- Path=/system/**',其下有两个服务模块,它们的控制层路径是s1,s2,那么这里添system" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
@@ -39,7 +39,7 @@
         <el-form-item prop="businessName">
           <span slot="label">
             生成业务名
-            <el-tooltip content="可理解为功能英文名，例如 user" placement="top">
+            <el-tooltip content="指的是模块的控制层名称(不推荐首字母大写)，例: 一个项目在网关注册路径为'- Path=/system/**',其下有两个服务模块,它们的控制层路径是auth和app,这次生成auth的模块,那么这里填控制层路径auth" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>
@@ -51,7 +51,7 @@
         <el-form-item prop="functionName">
           <span slot="label">
             生成功能名
-            <el-tooltip content="用作类描述，例如 用户" placement="top">
+            <el-tooltip content="用作类描述，例如 用户管理" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>