Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/components/MoveApp.vue

@@ -53,6 +53,10 @@
           />
           <span v-else>--</span>
         </template>
+        <!-- 主题类型 -->
+        <template slot="appThemeName" slot-scope="text">
+          {{ filterItems(text.appThemeName, dict.appThemeName) }}
+        </template>
         <!-- 简介 -->
         <template slot="summary" slot-scope="text">
           <span :title="text.summary">{{
@@ -94,6 +98,7 @@
     <!-- 新增应用 -->
     <AddApp
       ref="AddApp"
+      :dict="dict"
       @success="getAppList"
       :AddVisible.sync="AddVisible"
       :title="title"
@@ -138,7 +143,7 @@ const columns = [
   {
     title: "应用主题",
     ellipsis: true,
-    dataIndex: "appThemeName",
+    scopedSlots: { customRender: "appThemeName" },
   },
   {
     title: "应用简介",
@@ -186,6 +191,7 @@ export default {
       AddVisible: false,
       title: "新增应用",
       siteVisible: false,
+      dict: {}, // 字典
     };
   },
   // 详情页返回不刷新数据
@@ -210,7 +216,8 @@ export default {
         type: 2,
       });
       this.loading = false;
-      let { data, total } = res.data.data;
+      let { data, total, dict } = res.data.data;
+      this.dict = dict;
       if (res.data.code === 1) {
         if (!data.length && this.current > 1) {
           this.current -= 1;
@@ -328,6 +335,16 @@ export default {
         this.getAppList();
       }
     },
+    // 过滤表格数据
+    filterItems(key, dict = {}) {
+      let val = "";
+      Object.keys(dict).forEach((keys) => {
+        if (key == keys) {
+          val = dict[keys];
+        }
+      });
+      return val;
+    },
   },
 };
 </script>

base-manager-ui/admin/src/pages/basicset/appmarket/components/TerminalApp.vue

@@ -53,6 +53,10 @@
           />
           <span v-else>--</span>
         </template>
+        <!-- 主题类型 -->
+        <template slot="appThemeName" slot-scope="text">
+          {{ filterItems(text.appThemeName, dict.appThemeName) }}
+        </template>
         <!-- 简介 -->
         <template slot="summary" slot-scope="text">
           <span :title="text.summary">{{
@@ -94,6 +98,7 @@
     <!-- 新增应用 -->
     <AddApp
       ref="AddApp"
+      :dict="dict"
       @success="getAppList"
       :AddVisible.sync="AddVisible"
       :title="title"
@@ -138,7 +143,7 @@ const columns = [
   {
     title: "应用主题",
     ellipsis: true,
-    dataIndex: "appThemeName",
+    scopedSlots: { customRender: "appThemeName" },
   },
   {
     title: "应用简介",
@@ -186,6 +191,7 @@ export default {
       AddVisible: false,
       title: "新增应用",
       siteVisible: false,
+      dict: {}, // 字典
     };
   },
   // 详情页返回不刷新数据
@@ -210,7 +216,8 @@ export default {
         type: 1,
       });
       this.loading = false;
-      let { data, total } = res.data.data;
+      let { data, total, dict } = res.data.data;
+      this.dict = dict;
       if (res.data.code === 1) {
         if (!data.length && this.current > 1) {
           this.current -= 1;
@@ -328,6 +335,16 @@ export default {
         this.getAppList();
       }
     },
+    // 过滤表格数据
+    filterItems(key, dict = {}) {
+      let val = "";
+      Object.keys(dict).forEach((keys) => {
+        if (key == keys) {
+          val = dict[keys];
+        }
+      });
+      return val;
+    },
   },
 };
 </script>

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddApp.vue

@@ -22,11 +22,15 @@
             <a-input v-model="form.appCode" placeholder="请输入应用编码" />
           </a-form-model-item>
           <a-form-model-item label="应用主题" prop="appThemeName">
-            <a-input v-model="form.appThemeName" placeholder="请输入应用主题" />
-            <!-- <a-select v-model="form.appThemeName" placeholder="请选择应用主题">
-              <a-select-option value="shanghai"> Zone one </a-select-option>
-              <a-select-option value="beijing"> Zone two </a-select-option>
-            </a-select> -->
+            <a-select v-model="form.appThemeName" placeholder="请选择应用主题">
+              <a-select-option
+                v-for="(v, key) in dict.appThemeName"
+                :value="key"
+                :key="key"
+              >
+                {{ v }}
+              </a-select-option>
+            </a-select>
           </a-form-model-item>
           <a-form-model-item label="应用图标" prop="appIconPath">
             <a-upload
@@ -169,6 +173,13 @@ export default {
       required: true,
       default: false,
     },
+    dict: {
+      type: Object,
+      required: true,
+      default: () => {
+        return {};
+      },
+    },
   },
   data() {
     return {
@@ -187,7 +198,7 @@ export default {
         appName: "", // 应用名称
         appCode: "", // 应用编码
         appIconPath: "", // 应用图标
-        appThemeName: "", // 应用主题名称
+        appThemeName: undefined, // 应用主题名称
         type: "", // 类型(1.终端应用,2.移动端应用)
         appType: 1, // 类型(1.应用程序,2.url)
         shelves: 0,

base-manager-ui/admin/src/pages/basicset/qrcode.vue

-<template>
-  <div class="qrcode ff">
-    <div class="skins_bnt">
-      <!-- 新增按钮 -->
-      <a-button type="primary" @click="showModal" class="skins_btn_1">新增</a-button>
-      <!-- 弹窗 -->
-      <a-modal v-model="visible" title="新增" @ok="handleOk">
-        <a-form-item label="二维码组合名称">
-          <a-input placeholder="请输入二维码组合名称" />
-        </a-form-item>
-      </a-modal>
-    </div>
-
-    <!-- 表格 -->
-    <a-table :columns="columns" :data-source="data">
-      <a slot="name" slot-scope="text">{{ text }}</a>
-      <span slot="number" slot-scope="text, record, index">{{ index + 1 }}</span>
-
-      <span slot="action">
-        <a class="item">关联事项</a>
-        <a type="primary" @click="showModal" class="edit">编辑</a>
-        <a class="delet">删除</a>
-      </span>
-    </a-table>
-    <!-- <DelModal :message="message" ref="delModal"/> -->
-  </div>
-</template>
-
-<script>
-// import DelModal from '@/components/delmodal/index'
-const columns = [
-  {
-    title: "序号",
-    dataIndex: "number",
-    scopedSlots: {
-      customRender: "number"
-    },
-  },
-  {
-    title: "二维码组合名称",
-    dataIndex: 'name',
-
-  },
-  {
-    title: "操作",
-    scopedSlots: {
-      customRender: "action",
-    },
-  },
-];
-
-const data = [
-  {
-    key: 1,
-    name: "网络理政部办理事项展示二维码",
-  },
-  {
-    key: 2,
-    name: "网络理政部办理事项展示二维码",
-  },
-  {
-    key: 3,
-    name: "网络理政部办理事项展示二维码",
-  },
-  {
-    key: 4,
-    name: "网络理政部办理事项展示二维码",
-  },
-  {
-    key: 5,
-    name: "网络理政部办理事项展示二维码",
-  },
-  {
-    key: 6,
-    name: "网络理政部办理事项展示二维码",
-  },
-  {
-    key: 7,
-    name: "网络理政部办理事项展示二维码",
-  },
-  {
-    key: 8,
-    name: "网络理政部办理事项展示二维码",
-  },
-];
-export default {
-  components: {
-    // DelModal
-  },
-  data () {
-    return {
-      data,
-      columns,
-      visible: false,
-      value: 1,
-    };
-  },
-  methods: {
-    showModal () {
-      this.visible = true;
-    },
-    handleOk (e) {
-      console.log(e);
-      this.visible = false;
-    },
-    handleCancel () {
-      this.visible = false;
-    },
-    onText (e) {
-      console.log(e);
-    },
-    onChange (checkedValues) {
-      console.log('checked = ', checkedValues);
-    },
-    // delmodal() {
-    //   this.message = '节日'
-    //   this.$refs.delModal.show()
-    // },
-    onChanges (e) {
-      console.log('radio checked', e.target.value);
-    },
-    editAction (data) {
-      this.$router.push({
-        path: 'basis', query: {
-          list: data
-        }
-      })
-    },
-  },
-
-};
-
-</script>
-
-<style lang="less" scoped>
-.skins_btn_1 {
-  margin-bottom: 15px;
-  width: 115px;
-  height: 36px;
-  background-color: rgba(5, 149, 253, 1);
-  border-color: rgba(5, 149, 253, 1);
-}
-.edit {
-  color: rgb(41, 184, 41);
-  margin-right: 40px;
-}
-.delet {
-  color: red;
-}
-.item {
-  margin-right: 40px;
-  color: #0595fd;
-}
-</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/system/System.vue

+<template>
+  <div class="system flex flexc">
+    <a-tabs :activeKey="activeKey" @change="changeRouter">
+      <a-tab-pane key="/system/parameter" tab="系统参数"> </a-tab-pane>
+      <a-tab-pane key="/system/task" tab="任务信息"> </a-tab-pane>
+      <a-tab-pane key="/system/systemlogs" tab="操作日志"> </a-tab-pane>
+    </a-tabs>
+    <div class="system-out-box flex1">
+      <router-view></router-view>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  computed: {
+    activeKey() {
+      return this.$route.path;
+    },
+  },
+  methods: {
+    changeRouter(path) {
+      this.$router.push(path);
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.system {
+  width: 100%;
+  height: 100%;
+  padding: 15px;
+  .system-out-box {
+    overflow-y: auto;
+  }
+  /deep/.ant-tabs-nav-container {
+    border-bottom: 1px solid #f0f0f0 !important;
+  }
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/system/parameter/Parameter.vue

+<template>
+  <div class="parameter">
+    <div class="control flex aic jcb mb15">
+      <div>
+        <a-button type="primary" style="margin-right: 10px" @click="handleAdd"
+          >新增</a-button
+        >
+        <a-button type="danger" @click="handleDelAll">批量删除</a-button>
+      </div>
+      <div class="search-box">
+        <a-input-search
+          placeholder="请输入参数名搜索"
+          enter-button="搜索"
+          v-model="searchValue"
+          allowClear
+          @search="onSearch"
+        />
+      </div>
+    </div>
+    <!-- 表格 -->
+    <div class="table-content">
+      <a-table
+        :row-selection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: onSelectChange,
+        }"
+        :loading="loading"
+        bordered
+        :scroll="{ y: 590 }"
+        :columns="columns"
+        :pagination="{
+          showTotal: (total) => `共 ${total} 条`,
+          current: current,
+          total: total,
+          pageSize: size,
+          showSizeChanger: true,
+          showQuickJumper: true,
+          pageSizeOptions: pageSizeOptions,
+          onChange: handleChange,
+          onShowSizeChange: showSizeChange,
+        }"
+        size="small"
+        :data-source="tableData"
+        :rowKey="(record) => record.id"
+      >
+        <!-- 序号 -->
+        <span slot="num" slot-scope="text, record, index">{{
+          (current - 1) * size + index + 1
+        }}</span>
+        <!-- 有效状态 -->
+        <template slot="validStatus" slot-scope="text">
+          <a-tag>{{ filterItems(text.validStatus, dict.validStatus) }} </a-tag>
+        </template>
+        <!-- 修改状态 -->
+        <template slot="modStatus" slot-scope="text">
+          <a-tag>{{ filterItems(text.modStatus, dict.modStatus) }} </a-tag>
+        </template>
+        <!-- 展现类型 -->
+        <template slot="displayType" slot-scope="text">
+          <a-tag>{{ filterItems(text.displayType, dict.displayType) }} </a-tag>
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text">
+          <a-space size="middle">
+            <a href="javascript:;" class="edit" @click="handleEdit(text)"
+              >编辑</a
+            >
+            <a href="javascript:;" class="delete" @click="handleDel(text.id)"
+              >删除</a
+            >
+          </a-space>
+        </template>
+      </a-table>
+    </div>
+    <!-- 新增 -->
+    <AddParameter
+      ref="AddParameter"
+      :addVisible.sync="addVisible"
+      :title="title"
+      :dict="dict"
+      @addSuccess="getSystemParameterList"
+    ></AddParameter>
+  </div>
+</template>
+
+<script>
+import { getSystemParameterList, delSystemParameter } from "@/services/system";
+import AddParameter from "./modal/AddParameter.vue";
+export default {
+  components: {
+    AddParameter,
+  },
+  data() {
+    const columns = [
+      {
+        title: "序号",
+        dataIndex: "num",
+        width: "65px",
+        scopedSlots: {
+          customRender: "num",
+        },
+      },
+      {
+        title: "参数名称",
+        dataIndex: "name",
+      },
+      {
+        title: "一级组织",
+        // dataIndex: "firstOrganize",
+        customRender: (text) => {
+          return text.firstOrganize || "--";
+        },
+      },
+      {
+        title: "二级组织",
+        // dataIndex: "secondOrganize",
+        customRender: (text) => {
+          return text.secondOrganize || "--";
+        },
+      },
+      {
+        title: "参数键",
+        dataIndex: "paramKey",
+      },
+      {
+        title: "参数值",
+        dataIndex: "paramValue",
+      },
+      {
+        title: "有效状态",
+        // dataIndex: "validStatus",
+        scopedSlots: {
+          customRender: "validStatus",
+        },
+        // customRender: (text) => {
+        //   return this.filterItems(text.validStatus, this.dict.validStatus);
+        // },
+      },
+      {
+        title: "修改状态",
+        scopedSlots: {
+          customRender: "modStatus",
+        },
+      },
+      {
+        title: "展现类型",
+        scopedSlots: {
+          customRender: "displayType",
+        },
+      },
+      {
+        title: "备注",
+        // dataIndex: "remark",
+        customRender: (text) => {
+          return text.remark || "--";
+        },
+      },
+      {
+        title: "操作",
+        width: "120px",
+        scopedSlots: { customRender: "action" },
+      },
+    ];
+    return {
+      columns,
+      loading: false,
+      current: 1,
+      size: 10,
+      total: 0,
+      pageSizeOptions: ["10", "30", "50", "100"],
+      searchValue: "", // 搜索
+      tableData: [],
+      selectedRowKeys: [],
+      dict: {}, // 字典
+      addVisible: false,
+      title: "新增",
+    };
+  },
+  created() {
+    this.getSystemParameterList();
+  },
+  methods: {
+    // 获取参数列表
+    async getSystemParameterList() {
+      this.loading = true;
+      let res = await getSystemParameterList({
+        page: this.current,
+        size: this.size,
+        name: `%${this.searchValue}%`,
+      });
+      this.loading = false;
+      if (res.data.code == 1) {
+        let { total, data, dict } = res.data.data;
+        this.dict = dict;
+        if (!data.length && this.current > 1) {
+          this.current -= 1;
+        }
+        this.total = total;
+        this.tableData = data;
+      }
+    },
+    // 新增
+    handleAdd() {
+      this.title = "新增";
+      this.$refs.AddParameter.onAdd();
+      this.addVisible = true;
+    },
+    // 搜索
+    onSearch() {
+      this.current = 1;
+      this.getSystemParameterList();
+    },
+    // 分页
+    handleChange(num) {
+      this.current = num;
+      this.getSystemParameterList();
+    },
+    // 改变每页显示数量
+    showSizeChange(current, size) {
+      this.current = current;
+      this.size = size;
+      this.getSystemParameterList();
+    },
+    // 选择
+    onSelectChange(keys) {
+      this.selectedRowKeys = keys;
+    },
+    // 批量删除
+    handleDelAll() {
+      if (!this.selectedRowKeys.length) {
+        this.$message.warn("请先勾选数据");
+        return;
+      }
+      let ids = this.selectedRowKeys.join(",");
+      this.handleDel(ids);
+    },
+    // 编辑
+    handleEdit(row) {
+      this.title = "编辑";
+      this.$refs.AddParameter.onEdit(row);
+      this.addVisible = true;
+    },
+    // 删除
+    handleDel(id) {
+      let _this = this;
+      this.$confirm({
+        title: "系统提示",
+        content: "删除不可恢复，确定要删除吗？",
+        okText: "确定",
+        okType: "danger",
+        cancelText: "取消",
+        centered: true,
+        icon: "exclamation-circle",
+        maskClosable: true,
+        async onOk() {
+          let res = await delSystemParameter({ id });
+          let { code, msg } = res.data;
+          if (code == 1) {
+            _this.$message.success(msg);
+            _this.selectedRowKeys = [];
+            _this.getSystemParameterList();
+          }
+        },
+        onCancel() {
+          console.log("Cancel");
+        },
+      });
+    },
+    // 过滤表格数据
+    filterItems(key, dict = {}) {
+      let val = "";
+      Object.keys(dict).forEach((keys) => {
+        if (key == keys) {
+          val = dict[keys];
+        }
+      });
+      return val;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.parameter {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/system/parameter/modal/AddParameter.vue

+<template>
+  <div>
+    <a-modal
+      :title="title"
+      :visible="Visible"
+      @cancel="handleCancel"
+      :maskClosable="false"
+    >
+      <a-button slot="footer" @click="handleReset">重置</a-button>
+      <a-button slot="footer" type="primary" @click="handleOk">保存</a-button>
+      <a-form-model
+        :model="form"
+        ref="form"
+        :rules="rules"
+        :label-col="{ span: 5 }"
+        :wrapper-col="{ span: 19 }"
+      >
+        <a-form-model-item label="参数名称" prop="name">
+          <a-input v-model="form.name" placeholder="请输入参数名称" />
+        </a-form-model-item>
+        <a-form-model-item label="一级组织" prop="firstOrganize">
+          <a-input v-model="form.firstOrganize" placeholder="请输入一级组织" />
+        </a-form-model-item>
+        <a-form-model-item label="二级组织" prop="secondOrganize">
+          <a-input v-model="form.secondOrganize" placeholder="请输入二级组织" />
+        </a-form-model-item>
+        <a-form-model-item label="参数键" prop="paramKey">
+          <a-input v-model="form.paramKey" placeholder="请输入参数键" />
+        </a-form-model-item>
+        <a-form-model-item label="参数值" prop="paramValue">
+          <a-input v-model="form.paramValue" placeholder="请输入参数值" />
+        </a-form-model-item>
+        <a-form-model-item label="参数修改状态" prop="modStatus">
+          <a-select v-model="form.modStatus" placeholder="请选择参数修改状态">
+            <a-select-option
+              v-for="(v, key) in dict.modStatus"
+              :key="key"
+              :value="Number(key)"
+              >{{ v }}</a-select-option
+            >
+          </a-select>
+        </a-form-model-item>
+        <a-form-model-item label="展现类型" prop="displayType">
+          <a-select v-model="form.displayType" placeholder="请选择展现类型">
+            <a-select-option
+              v-for="(v, key) in dict.displayType"
+              :key="key"
+              :value="Number(key)"
+              >{{ v }}</a-select-option
+            >
+          </a-select>
+        </a-form-model-item>
+        <a-form-model-item label="参数有效状态" prop="validStatus">
+          <a-radio-group v-model="form.validStatus">
+            <a-radio
+              v-for="(v, key) in dict.validStatus"
+              :value="Number(key)"
+              :key="key"
+              >{{ v }}</a-radio
+            >
+          </a-radio-group>
+        </a-form-model-item>
+        <a-form-model-item label="备注" prop="remark">
+          <a-textarea
+            :autoSize="{ minRows: 4, maxRows: 4 }"
+            v-model="form.remark"
+            placeholder="请输入备注"
+            allow-clear
+          />
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { saveSystemParameter } from "@/services/system";
+export default {
+  components: {},
+  props: {
+    addVisible: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+    title: {
+      required: true,
+      type: String,
+      default: "",
+    },
+    dict: {
+      required: true,
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      form: {
+        name: "", // 参数名称
+        firstOrganize: "", // 一级组织
+        secondOrganize: "", // 二级组织
+        paramKey: "", // 参数键
+        paramValue: "", // 参数值
+        modStatus: undefined, // 参数修改状态
+        displayType: undefined, // 展现类型
+        validStatus: "", // 参数有效状态
+        remark: "", // 备注
+      },
+      rules: {
+        name: [{ required: true, message: "请输入参数名称", trigger: "blur" }],
+        paramKey: [
+          { required: true, message: "请输入参数键", trigger: "blur" },
+        ],
+        paramValue: [
+          { required: true, message: "请输入参数值", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  computed: {
+    Visible: {
+      get() {
+        return this.addVisible;
+      },
+      set(val) {
+        this.$emit("update:addVisible", val);
+      },
+    },
+  },
+  methods: {
+    // 关闭弹窗
+    handleCancel() {
+      this.$refs.form.resetFields();
+      this.Visible = false;
+    },
+    // 重置
+    handleReset() {
+      this.$refs.form.resetFields();
+    },
+    // 新增
+    onAdd() {
+      Object.assign(this.form, this.$options.data().form);
+      this.form.id && this.$delete(this.form, "id");
+    },
+    // 编辑
+    onEdit(row) {
+      this.form = { ...row };
+    },
+    // 保存
+    handleOk() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          let res = await saveSystemParameter(this.form);
+          let { code, msg } = res.data;
+          if (code == 1) {
+            this.$message.success(msg);
+            this.$emit("addSuccess");
+            this.handleCancel();
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/system/systemlogs/SystemLogs.vue

+<template>
+  <!-- 系统日志 -->
+  <div class="system-logs">
+    <div class="control">
+      <div class="search-box">
+        <a-input-search
+          placeholder="请输入请求地址搜索"
+          enter-button="搜索"
+          v-model="searchValue"
+          allowClear
+          @search="onSearch"
+        />
+      </div>
+    </div>
+    <!-- 表格 -->
+    <div class="table-content">
+      <a-table
+        :loading="loading"
+        bordered
+        :scroll="{ y: 590 }"
+        :columns="columns"
+        size="small"
+        :pagination="{
+          showTotal: (total) => `共 ${total} 条`,
+          current: current,
+          total: total,
+          pageSize: size,
+          showSizeChanger: true,
+          showQuickJumper: true,
+          pageSizeOptions: pageSizeOptions,
+          onChange: handleChange,
+          onShowSizeChange: showSizeChange,
+        }"
+        :data-source="tableData"
+        :rowKey="(record) => record.id"
+      >
+        <!-- 序号 -->
+        <span slot="num" slot-scope="text, record, index">{{
+          (current - 1) * size + index + 1
+        }}</span>
+        <!-- 操作时间 -->
+        <template slot="logDate" slot-scope="text">
+          {{ text.logDate | dateFormat }}
+        </template>
+      </a-table>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getSystemLogsList } from "@/services/system";
+const columns = [
+  {
+    title: "序号",
+    dataIndex: "num",
+    width: "65px",
+    scopedSlots: {
+      customRender: "num",
+    },
+  },
+  {
+    title: "用户名称",
+    dataIndex: "userName",
+  },
+  {
+    title: "登录名称",
+    dataIndex: "loginName",
+  },
+  {
+    title: "请求地址",
+    dataIndex: "requestUrl",
+  },
+  {
+    title: "操作内容",
+    dataIndex: "content",
+  },
+  {
+    title: "操作IP地址",
+    dataIndex: "ip",
+  },
+  {
+    title: "操作时间",
+    scopedSlots: {
+      customRender: "logDate",
+    },
+  },
+];
+export default {
+  data() {
+    return {
+      columns,
+      loading: false,
+      current: 1,
+      size: 10,
+      total: 0,
+      pageSizeOptions: ["10", "30", "50", "100"],
+      searchValue: "", // 搜索
+      tableData: [],
+    };
+  },
+  created() {
+    this.getSystemLogsList();
+  },
+  methods: {
+    // 获取日志列表
+    async getSystemLogsList() {
+      this.loading = true;
+      let res = await getSystemLogsList({
+        page: this.current,
+        size: this.size,
+        requestUrl: this.searchValue,
+      });
+      this.loading = false;
+      if (res.data.code == 1) {
+        let { data, total } = res.data.data;
+        this.tableData = data;
+        this.total = total;
+      }
+    },
+    // 搜索
+    onSearch() {
+      this.current = 1;
+      this.getSystemLogsList();
+    },
+    // 分页
+    handleChange(num) {
+      this.current = num;
+      this.getSystemLogsList();
+    },
+    // 改变每页显示数量
+    showSizeChange(current, size) {
+      this.current = current;
+      this.size = size;
+      this.getSystemLogsList();
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.system-logs {
+  width: 100%;
+  height: 100%;
+  .control {
+    display: flex;
+    justify-content: flex-end;
+    margin-bottom: 15px;
+  }
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/system/task/TaskSet.vue

+<template>
+  <div class="task-set">
+    <div class="control flex aic jcb mb15">
+      <div>
+        <a-button type="primary" style="margin-right: 10px" @click="handleAdd"
+          >新增</a-button
+        >
+        <a-button type="danger" @click="handleDelAll">批量删除</a-button>
+      </div>
+      <div class="search-box">
+        <a-input-search
+          placeholder="请输入任务名搜索"
+          enter-button="搜索"
+          v-model="searchValue"
+          allowClear
+          @search="onSearch"
+        />
+      </div>
+    </div>
+    <!-- 表格 -->
+    <div class="table-content">
+      <a-table
+        :row-selection="{
+          selectedRowKeys: selectedRowKeys,
+          onChange: onSelectChange,
+        }"
+        :loading="loading"
+        bordered
+        :scroll="{ y: 590 }"
+        :columns="columns"
+        :pagination="{
+          showTotal: (total) => `共 ${total} 条`,
+          current: current,
+          total: total,
+          pageSize: size,
+          showSizeChanger: true,
+          showQuickJumper: true,
+          pageSizeOptions: pageSizeOptions,
+          onChange: handleChange,
+          onShowSizeChange: showSizeChange,
+        }"
+        size="small"
+        :data-source="tableData"
+        :rowKey="(record) => record.id"
+      >
+        <!-- 序号 -->
+        <span slot="num" slot-scope="text, record, index">{{
+          (current - 1) * size + index + 1
+        }}</span>
+        <!-- 执行策略 -->
+        <template slot="excuteStrategy" slot-scope="text">
+          <a-tag
+            >{{ filterItems(text.excuteStrategy, dict.excuteStrategy) }}
+          </a-tag>
+        </template>
+        <!-- 最后执行时间 -->
+        <template slot="lastExcuteTime" slot-scope="text">
+          {{ text.lastExcuteTime | dateFormat }}
+        </template>
+        <!-- 任务状态 -->
+        <template slot="status" slot-scope="text">
+          <a-tag>{{ filterItems(text.status, dict.status) }} </a-tag>
+        </template>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text">
+          <a-space size="middle">
+            <a href="javascript:;" class="edit" @click="handleEdit(text)"
+              >编辑</a
+            >
+            <a href="javascript:;" class="delete" @click="handleDel(text.id)"
+              >删除</a
+            >
+          </a-space>
+        </template>
+      </a-table>
+    </div>
+    <!-- 新增 -->
+    <AddTask
+      ref="AddTask"
+      :addVisible.sync="addVisible"
+      :title="title"
+      :dict="dict"
+      @addSuccess="getSystemTaskList"
+    ></AddTask>
+  </div>
+</template>
+
+<script>
+import { getSystemTaskList, delSystemTask } from "@/services/system";
+import AddTask from "./modal/AddTask.vue";
+export default {
+  components: {
+    AddTask,
+  },
+  data() {
+    const columns = [
+      {
+        title: "序号",
+        dataIndex: "num",
+        width: "65px",
+        scopedSlots: {
+          customRender: "num",
+        },
+      },
+      {
+        title: "任务名称",
+        dataIndex: "name",
+      },
+      {
+        title: "执行主机",
+        customRender: (text) => {
+          return text.excuteHost || "--";
+        },
+      },
+      {
+        title: "执行关键字",
+        customRender: (text) => {
+          return text.taskKey || "--";
+        },
+      },
+      {
+        title: "执行策略",
+        scopedSlots: {
+          customRender: "excuteStrategy",
+        },
+      },
+      {
+        title: "最后执行主机",
+        customRender: (text) => {
+          return text.lastExcuteHost || "--";
+        },
+      },
+      {
+        title: "最后执行时间",
+        scopedSlots: {
+          customRender: "lastExcuteTime",
+        },
+      },
+      {
+        title: "任务状态",
+        scopedSlots: {
+          customRender: "status",
+        },
+      },
+      {
+        title: "操作",
+        width: "120px",
+        scopedSlots: { customRender: "action" },
+      },
+    ];
+    return {
+      columns,
+      loading: false,
+      current: 1,
+      size: 10,
+      total: 0,
+      pageSizeOptions: ["10", "30", "50", "100"],
+      searchValue: "", // 搜索
+      tableData: [],
+      selectedRowKeys: [],
+      dict: {}, // 字典
+      addVisible: false,
+      title: "新增",
+    };
+  },
+  created() {
+    this.getSystemTaskList();
+  },
+  methods: {
+    // 获取参数列表
+    async getSystemTaskList() {
+      this.loading = true;
+      let res = await getSystemTaskList({
+        page: this.current,
+        size: this.size,
+        name: `%${this.searchValue}%`,
+      });
+      this.loading = false;
+      if (res.data.code == 1) {
+        let { total, data, dict } = res.data.data;
+        this.dict = dict;
+        if (!data.length && this.current > 1) {
+          this.current -= 1;
+          this.getSystemTaskList();
+        }
+        this.total = total;
+        this.tableData = data;
+      }
+    },
+    // 新增
+    handleAdd() {
+      this.title = "新增";
+      this.$refs.AddTask.onAdd();
+      this.addVisible = true;
+    },
+    // 搜索
+    onSearch() {
+      this.current = 1;
+      this.getSystemTaskList();
+    },
+    // 分页
+    handleChange(num) {
+      this.current = num;
+      this.getSystemTaskList();
+    },
+    // 改变每页显示数量
+    showSizeChange(current, size) {
+      this.current = current;
+      this.size = size;
+      this.getSystemTaskList();
+    },
+    // 选择
+    onSelectChange(keys) {
+      this.selectedRowKeys = keys;
+    },
+    // 批量删除
+    handleDelAll() {
+      if (!this.selectedRowKeys.length) {
+        this.$message.warn("请先勾选数据");
+        return;
+      }
+      let ids = this.selectedRowKeys.join(",");
+      this.handleDel(ids);
+    },
+    // 编辑
+    handleEdit(row) {
+      console.log(row);
+      this.title = "编辑";
+      this.$refs.AddTask.onEdit(row);
+      this.addVisible = true;
+    },
+    // 删除
+    handleDel(id) {
+      let _this = this;
+      this.$confirm({
+        title: "系统提示",
+        content: "删除不可恢复，确定要删除吗？",
+        okText: "确定",
+        okType: "danger",
+        cancelText: "取消",
+        centered: true,
+        icon: "exclamation-circle",
+        maskClosable: true,
+        async onOk() {
+          let res = await delSystemTask({ id });
+          let { code, msg } = res.data;
+          if (code == 1) {
+            _this.$message.success(msg);
+            _this.selectedRowKeys = [];
+            _this.getSystemTaskList();
+          }
+        },
+        onCancel() {
+          console.log("Cancel");
+        },
+      });
+    },
+    // 过滤表格数据
+    filterItems(key, dict = {}) {
+      let val = "";
+      Object.keys(dict).forEach((keys) => {
+        if (key == keys) {
+          val = dict[keys];
+        }
+      });
+      return val;
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.task-set {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/system/task/modal/AddTask.vue

+<template>
+  <div>
+    <a-modal
+      :title="title"
+      :visible="Visible"
+      @cancel="handleCancel"
+      :maskClosable="false"
+    >
+      <a-button slot="footer" @click="handleReset">重置</a-button>
+      <a-button slot="footer" type="primary" @click="handleOk">保存</a-button>
+      <a-form-model
+        :model="form"
+        ref="form"
+        :rules="rules"
+        :label-col="{ span: 5 }"
+        :wrapper-col="{ span: 19 }"
+      >
+        <a-form-model-item label="任务名称" prop="name">
+          <a-input v-model="form.name" placeholder="请输入参数名称" />
+        </a-form-model-item>
+        <a-form-model-item label="关键字" prop="taskKey">
+          <a-input v-model="form.taskKey" placeholder="请输入关键字" />
+        </a-form-model-item>
+        <a-form-model-item label="执行服务" prop="excuteService">
+          <a-input v-model="form.excuteService" placeholder="请输入执行服务" />
+        </a-form-model-item>
+        <a-form-model-item label="执行策略" prop="excuteStrategy">
+          <a-select v-model="form.excuteStrategy" placeholder="请选择执行策略">
+            <a-select-option
+              v-for="(v, key) in dict.excuteStrategy"
+              :key="key"
+              :value="Number(key)"
+              >{{ v }}</a-select-option
+            >
+          </a-select>
+        </a-form-model-item>
+        <a-form-model-item label="执行日期">
+          <a-input disabled value="每天" placeholder="请输入执行服务" />
+        </a-form-model-item>
+        <a-form-model-item label="执行时间" prop="excuteTime">
+          <a-time-picker
+            valueFormat="HH:mm"
+            format="HH:mm"
+            v-model="form.excuteTime"
+          />
+        </a-form-model-item>
+        <a-form-model-item label="执行主机" prop="excuteHost">
+          <a-input v-model="form.excuteHost" placeholder="请输入执行主机" />
+        </a-form-model-item>
+        <a-form-model-item label="执行参数" prop="excuteParam">
+          <a-input v-model="form.excuteParam" placeholder="请输入执行参数" />
+        </a-form-model-item>
+        <a-form-model-item label="备注" prop="remark">
+          <a-textarea
+            :autoSize="{ minRows: 4, maxRows: 4 }"
+            v-model="form.remark"
+            placeholder="请输入备注"
+            allow-clear
+          />
+        </a-form-model-item>
+      </a-form-model>
+    </a-modal>
+  </div>
+</template>
+
+<script>
+import { saveSystemTask } from "@/services/system";
+export default {
+  components: {},
+  props: {
+    addVisible: {
+      required: true,
+      type: Boolean,
+      default: false,
+    },
+    title: {
+      required: true,
+      type: String,
+      default: "",
+    },
+    dict: {
+      required: true,
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+  },
+  data() {
+    return {
+      form: {
+        name: "", // 任务名称
+        taskKey: "", // 关键字
+        excuteService: "", // 执行服务
+        excuteStrategy: undefined, // 执行策略
+        excuteDate: 0, // 执行日期
+        excuteTime: "", // 执行时间
+        excuteHost: "", // 执行主机
+        excuteParam: "", // 执行参数
+        remark: "", // 备注
+      },
+      rules: {
+        name: [{ required: true, message: "请输入任务名称", trigger: "blur" }],
+        taskKey: [{ required: true, message: "请输入关键字", trigger: "blur" }],
+        excuteService: [
+          { required: true, message: "请输入执行服务", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  computed: {
+    Visible: {
+      get() {
+        return this.addVisible;
+      },
+      set(val) {
+        this.$emit("update:addVisible", val);
+      },
+    },
+  },
+  methods: {
+    // 关闭弹窗
+    handleCancel() {
+      this.$refs.form.resetFields();
+      this.Visible = false;
+    },
+    // 重置
+    handleReset() {
+      this.$refs.form.resetFields();
+    },
+    // 新增
+    onAdd() {
+      Object.assign(this.form, this.$options.data().form);
+      this.form.id && this.$delete(this.form, "id");
+    },
+    // 编辑
+    onEdit(row) {
+      this.form = { ...row };
+    },
+    // 保存
+    handleOk() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          let res = await saveSystemTask(this.form);
+          let { code, msg } = res.data;
+          if (code == 1) {
+            this.$message.success(msg);
+            this.$emit("addSuccess");
+            this.handleCancel();
+          }
+        }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+</style>
\ No newline at end of file

base-manager-ui/admin/src/router/config.js

@@ -169,6 +169,37 @@ const options = {
             },
           ],
         },
+        {
+          path: "system",
+          name: "系统设置",
+          component: () => import("@/pages/basicset/system/System"),
+          meta: {
+            icon: "global",
+          },
+          redirect: "system/parameter",
+          children: [
+            {
+              path: "parameter",
+              name: "系统参数",
+              component: () =>
+                import("@/pages/basicset/system/parameter/Parameter"),
+              meta: { invisible: true },
+            },
+            {
+              path: "task",
+              name: "任务信息",
+              component: () => import("@/pages/basicset/system/task/TaskSet"),
+              meta: { invisible: true },
+            },
+            {
+              path: "systemlogs",
+              name: "操作日志",
+              component: () =>
+                import("@/pages/basicset/system/systemlogs/SystemLogs"),
+              meta: { invisible: true },
+            },
+          ],
+        },
       ],
     },
   ],

base-manager-ui/admin/src/services/basicsetApi.js

@@ -316,4 +316,26 @@ module.exports = {
     used: `${BASE_URL}/base/app/version/used`,
     preview: `${BASE_URL}/base/app/version/preview`,
   },
+  // 系统设置
+  system: {
+    // 系统日志
+    logs: {
+      list: `${BASE_URL}/base/oper/log/list`,
+      info: `${BASE_URL}/base/oper/log/info`,
+    },
+    // 系统参数
+    parameter: {
+      list: `${BASE_URL}/base/param/list`,
+      info: `${BASE_URL}/base/param/info`,
+      save: `${BASE_URL}/base/param/save`,
+      delete: `${BASE_URL}/base/param/delete`,
+    },
+    // 系统任务信息
+    task: {
+      list: `${BASE_URL}/base/task/list`,
+      info: `${BASE_URL}/base/task/info`,
+      save: `${BASE_URL}/base/task/save`,
+      delete: `${BASE_URL}/base/task/delete`,
+    },
+  },
 };

base-manager-ui/admin/src/services/system.js

+import { system } from "@/services/basicsetApi";
+
+import { request, METHOD } from "@/utils/request";
+
+/**
+ *  系统设置
+ */
+
+// 查询系统日志列表
+export async function getSystemLogsList(data) {
+  return request(system.logs.list, METHOD.POST, data);
+}
+// 查看系统日志信息
+export async function getSystemLogsInfo(data) {
+  return request(system.logs.info, METHOD.GET, data);
+}
+// 获取系统参数信息列表
+export async function getSystemParameterList(data) {
+  return request(system.parameter.list, METHOD.POST, data);
+}
+// 获取系统参数信息
+export async function getSystemParameterInfo(data) {
+  return request(system.parameter.info, METHOD.GET, data);
+}
+// 保存系统参数信息
+export async function saveSystemParameter(data) {
+  return request(system.parameter.save, METHOD.POST, data);
+}
+// 删除系统参数信息
+export async function delSystemParameter(data) {
+  return request(system.parameter.delete, METHOD.GET, data);
+}
+// 获取系统任务信息列表
+export async function getSystemTaskList(data) {
+  return request(system.task.list, METHOD.POST, data);
+}
+// 获取系统任务信息
+export async function getSystemTaskInfo(data) {
+  return request(system.task.info, METHOD.GET, data);
+}
+// 保存系统任务信息
+export async function saveSystemTask(data) {
+  return request(system.task.save, METHOD.POST, data);
+}
+// 删除系统任务信息
+export async function delSystemTask(data) {
+  return request(system.task.delete, METHOD.GET, data);
+}