From 14c63a176fee0030dc2aab5aa973797013641d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=BA=A2=E4=B8=BD?= <1181930680@qq.com>
Date: Thu, 28 Nov 2024 13:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E3=80=81=E5=B9=BF=E5=91=8A?=
 =?UTF-8?q?=E4=BD=8D=E3=80=81=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/content/ad/columns.ts           | 118 ++++++++++
 src/views/content/ad/edit.vue             | 271 ++++++++++++++++++++++
 src/views/content/ad/index.vue            | 197 ++++++++++++++++
 src/views/content/ad/querySchemas.ts      |  53 +++++
 src/views/content/adSort/columns.ts       |  62 +++++
 src/views/content/adSort/edit.vue         | 156 +++++++++++++
 src/views/content/adSort/index.vue        | 197 ++++++++++++++++
 src/views/content/adSort/querySchemas.ts  |  34 +++
 src/views/content/article/columns.ts      |  90 +++++++
 src/views/content/article/edit.vue        | 258 ++++++++++++++++++++
 src/views/content/article/index.vue       | 197 ++++++++++++++++
 src/views/content/article/querySchemas.ts |  30 +++
 src/views/monitor/job/columns.ts          |   1 -
 13 files changed, 1663 insertions(+), 1 deletion(-)
 create mode 100644 src/views/content/ad/columns.ts
 create mode 100644 src/views/content/ad/edit.vue
 create mode 100644 src/views/content/ad/index.vue
 create mode 100644 src/views/content/ad/querySchemas.ts
 create mode 100644 src/views/content/adSort/columns.ts
 create mode 100644 src/views/content/adSort/edit.vue
 create mode 100644 src/views/content/adSort/index.vue
 create mode 100644 src/views/content/adSort/querySchemas.ts
 create mode 100644 src/views/content/article/columns.ts
 create mode 100644 src/views/content/article/edit.vue
 create mode 100644 src/views/content/article/index.vue
 create mode 100644 src/views/content/article/querySchemas.ts

diff --git a/src/views/content/ad/columns.ts b/src/views/content/ad/columns.ts
new file mode 100644
index 0000000..c576843
--- /dev/null
+++ b/src/views/content/ad/columns.ts
@@ -0,0 +1,118 @@
+import { h } from 'vue';
+import { NTag, NImage } from 'naive-ui';
+
+export const columns = [
+  {
+    type: 'selection',
+    width: 50,
+    fixed: 'left',
+  },
+  {
+    title: 'ID',
+    key: 'id',
+    fixed: 'left',
+    width: 50,
+  },
+  {
+    title: '广告标题',
+    key: 'title',
+    width: 250,
+    render(record) {
+      return h(
+        'a',
+        {
+          href: record.url,
+          target: '_blank',
+        },
+        record.title,
+      );
+    },
+  },
+  {
+    title: '广告封面',
+    key: 'cover',
+    width: 100,
+    render(record) {
+      return h(NImage, {
+        width: 35,
+        src: record.cover,
+        shape: 'square',
+        fit: 'fill',
+      });
+    },
+  },
+  {
+    title: '广告类型',
+    key: 'type',
+    width: 100,
+    render(record) {
+      let typeText = '';
+      switch (record.type) {
+        case 1:
+          typeText = '图片';
+          break;
+        case 2:
+          typeText = '文字';
+          break;
+        case 3:
+          typeText = '视频';
+          break;
+        default:
+          break;
+      }
+      return h('span', typeText || '-');
+    },
+  },
+  {
+    title: '广告状态',
+    key: 'status',
+    width: 100,
+    render(record) {
+      return h(
+        NTag,
+        {
+          type: record.status == 1 ? 'success' : 'error',
+        },
+        {
+          default: () => (record.status == 1 ? '正常' : '停用'),
+        },
+      );
+    },
+  },
+  {
+    title: '广告尺寸',
+    key: 'size',
+    width: 100,
+    render(record) {
+      return record.width + 'x' + record.height;
+    },
+  },
+  {
+    title: '投放时间',
+    key: 'time',
+    width: 180,
+    render(record) {
+      return record.startTime + '-' + record.endTime;
+    },
+  },
+  {
+    title: '点击量',
+    key: 'click',
+    width: 100,
+  },
+  {
+    title: '排序',
+    key: 'sort',
+    width: 100,
+  },
+  {
+    title: '创建人',
+    key: 'createUser',
+    width: 100,
+  },
+  {
+    title: '创建时间',
+    key: 'createTime',
+    width: 180,
+  },
+];
diff --git a/src/views/content/ad/edit.vue b/src/views/content/ad/edit.vue
new file mode 100644
index 0000000..9c80dd2
--- /dev/null
+++ b/src/views/content/ad/edit.vue
@@ -0,0 +1,271 @@
+<template>
+  <basicModal
+    @register="modalRegister"
+    ref="modalRef"
+    class="basicModal basicFormModal"
+    @on-ok="handleSubmit"
+    @on-close="handleClose"
+  >
+    <template #default>
+      <n-form
+        class="ls-form flex"
+        ref="formRef"
+        :model="formData"
+        label-placement="left"
+        label-width="85px"
+      >
+        <div style="width: 880px; flex: none" :style="{ height: fwbHeight + 'px' }">
+          <n-form-item label-width="0px" path="content">
+            <Editor ref="editorRef" :height="fwbHeight" name="ad" />
+          </n-form-item>
+        </div>
+        <div style="flex: 1; margin-left: 10px">
+          <n-form-item
+            label="广告标题"
+            path="title"
+            :rule="{ required: true, message: '请输入广告标题', trigger: 'blur' }"
+          >
+            <n-input placeholder="请输入广告标题" :maxlength="50" v-model:value="formData.title" />
+          </n-form-item>
+          <n-form-item
+            label="广告位"
+            path="adSortId"
+            class="flex-1"
+            :rule="{ type: 'number', required: true, message: '请选择广告位', trigger: 'change' }"
+          >
+            <n-select
+              v-model:value="formData.adSortId"
+              class="flex-1"
+              clearable
+              placeholder="请选择广告位"
+              :options="adSortList"
+              label-field="name"
+              value-field="id"
+            />
+          </n-form-item>
+          <n-form-item
+            label="广告格式"
+            path="type"
+            :rule="{ type: 'number', required: true, message: '请选择广告格式', trigger: 'change' }"
+          >
+            <n-select
+              v-model:value="formData.type"
+              placeholder="请选择广告格式"
+              :options="typeList"
+            />
+          </n-form-item>
+          <n-form-item
+            label="广告封面"
+            path="cover"
+            :rule="{ required: true, message: '请上传广告封面', trigger: 'change' }"
+          >
+            <UploadImg
+              :fileType="['image/jpeg', 'image/png', 'image/jpg', 'image/gif']"
+              name="ad"
+              :fileSize="200"
+              v-model:image-url="formData.cover"
+            >
+              <template #tip>支持扩展名: jpg png jpeg;文件大小不超过200M</template>
+            </UploadImg>
+          </n-form-item>
+          <n-form-item
+            label="广告链接"
+            path="url"
+            :rule="{ required: true, message: '请输入广告链接', trigger: 'blur' }"
+          >
+            <n-input v-model:value="formData.url" type="textarea" placeholder="请输入广告链接" />
+          </n-form-item>
+          <n-form-item
+            label="广告宽度"
+            path="width"
+            :rule="{ required: true, message: '请输入广告宽度', trigger: 'change' }"
+          >
+            <number-input v-model="formData.width" placeholder="请输入广告宽度" clearable />
+          </n-form-item>
+          <n-form-item
+            label="广告高度"
+            path="height"
+            :rule="{ required: true, message: '请输入广告高度', trigger: 'blur' }"
+          >
+            <number-input v-model="formData.height" placeholder="请输入广告高度" clearable />
+          </n-form-item>
+          <n-form-item
+            label="广告时间"
+            path="adTime"
+            class="flex-1"
+            :rule="{ type: 'array', required: true, message: '请选择广告时间', trigger: 'change' }"
+          >
+            <n-date-picker
+              v-model:formatted-value="formData.adTime"
+              type="datetimerange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              format="yyyy-MM-dd HH:mm:ss"
+              style="width: 100%"
+              :placeholder="['开始时间', '结束时间']"
+            />
+          </n-form-item>
+          <n-form-item
+            label="点击率"
+            path="click"
+            :rule="{ required: true, message: '请输入点击率', trigger: 'blur' }"
+          >
+            <number-input v-model="formData.click" placeholder="请输入点击率" clearable />
+          </n-form-item>
+          <n-form-item
+            label="广告描述"
+            path="note"
+            :rule="{ required: true, message: '请输入备注', trigger: 'blur' }"
+          >
+            <n-input v-model:value="formData.note" type="textarea" placeholder="请输入广告描述" />
+          </n-form-item>
+          <n-form-item label="排序" path="sort">
+            <n-input-number v-model:value="formData.sort" :max="9999" placeholder="请输入排序" />
+          </n-form-item>
+          <n-form-item label="状态">
+            <n-radio-group v-model:value="formData.status" path="status">
+              <n-radio :value="1">在用</n-radio>
+              <n-radio :value="2">停用</n-radio>
+            </n-radio-group>
+          </n-form-item>
+        </div>
+      </n-form>
+    </template>
+  </basicModal>
+</template>
+<script lang="ts" setup>
+  import { adAdd, adUpdate, getAdDetail } from '@/api/content/ad';
+  import { getAdSortAllList } from '@/api/content/adSort';
+  import { onMounted, reactive, ref, defineAsyncComponent } from 'vue';
+  import { useMessage } from 'naive-ui';
+  import { useModal } from '@/components/Modal';
+  import Editor from '@/components/Editor/tinymce.vue';
+  import UploadImg from '@/components/Upload/Image.vue';
+  import { useLockFn } from '@/utils/useLockFn';
+
+  const emit = defineEmits(['success', 'update:visible']);
+  const formRef = ref();
+
+  /**
+   * 定义表单参数
+   */
+  const message = useMessage();
+  const adSortList = ref([]);
+  const editorRef = ref();
+  const formData = reactive({
+    id: '',
+    title: '',
+    adSortId: undefined,
+    cover: '',
+    type: undefined,
+    note: '',
+    content: '',
+    url: '',
+    width: '',
+    height: '',
+    adTime: null,
+    startTime: '',
+    endTime: '',
+    click: '',
+    status: 1,
+    sort: 0,
+  });
+  /**
+   * 定义接收的参数
+   */
+  const props = defineProps({
+    visible: {
+      type: Boolean,
+      required: true,
+      default: false,
+    },
+    adId: {
+      type: Number,
+      required: true,
+      default: 0,
+    },
+  });
+  const [modalRegister, { openModal, setSubLoading }] = useModal({
+    title: props.adId ? '编辑广告' : '添加广告',
+    subBtuText: '确定',
+    width: 1350,
+  });
+
+  const typeList = [
+    { label: '图片', value: 1 },
+    { label: '文字', value: 2 },
+    { label: '视频', value: 3 },
+    { label: '推荐', value: 4 },
+  ];
+
+  /**
+   * 执行提交
+   */
+  const handleSubmit = async () => {
+    formRef.value
+      .validate()
+      .then(async () => {
+        formData.startTime = formData.adTime.length > 0 ? formData.adTime[0] : '';
+        formData.endTime = formData.adTime.length > 0 ? formData.adTime[1] : '';
+        let ruleForm = JSON.parse(JSON.stringify(formData));
+        ruleForm.content = editorRef.value.myValue;
+        if (!ruleForm.content) {
+          message.error('请添加内容');
+          return;
+        }
+        props.adId ? await adUpdate(ruleForm) : await adAdd(ruleForm);
+        message.success('操作成功');
+        setSubLoading(false);
+        emit('update:visible', false);
+        emit('success');
+      })
+      .catch((error) => {
+        setSubLoading(false);
+      });
+  };
+  const { isLock: subLoading, lockFn: submit } = useLockFn(handleSubmit);
+  /**
+   * 关闭窗体
+   */
+  const handleClose = () => {
+    emit('update:visible', false);
+  };
+
+  /**
+   * 设置表单数据
+   */
+  const setFormData = async () => {
+    const data = await getAdDetail(props.adId);
+    for (const key in formData) {
+      if (data[key] != null && data[key] != undefined) {
+        //@ts-ignore
+        formData[key] = data[key];
+      }
+    }
+    formData.width = formData.width + '';
+    formData.height = formData.height + '';
+    formData.click = formData.click + '';
+    formData.adTime = [formData.startTime, formData.endTime];
+    editorRef.value.myValue = formData.content;
+  };
+
+  /**
+   * 获取全部字典数据
+   */
+  const getAllDict = async () => {
+    let list = await getAdSortAllList();
+    adSortList.value = list ? list : [];
+  };
+  /**
+   * 钩子函数
+   */
+  onMounted(() => {
+    getAllDict();
+    if (props.adId) {
+      setFormData();
+    }
+  });
+  //导出方法
+  defineExpose({
+    openModal,
+  });
+</script>
diff --git a/src/views/content/ad/index.vue b/src/views/content/ad/index.vue
new file mode 100644
index 0000000..b4cb44b
--- /dev/null
+++ b/src/views/content/ad/index.vue
@@ -0,0 +1,197 @@
+<template>
+  <div>
+    <n-card :bordered="false" class="pt-3 mb-3 proCard">
+      <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
+        <template #statusSlot="{ model, field }">
+          <n-input v-model:value="model[field]" />
+        </template>
+      </BasicForm>
+    </n-card>
+    <n-card :bordered="false" class="proCard">
+      <BasicTable
+        :columns="columns"
+        :request="loadDataTable"
+        :row-key="(row) => row.id"
+        ref="basicTableRef"
+        :actionColumn="actionColumn"
+        @update:checked-row-keys="onCheckedRow"
+        :autoScrollX="true"
+      >
+        <template #tableTitle>
+          <n-space>
+            <n-button type="primary" @click="handleAdd" v-perm="['sys:ad:add']">
+              <template #icon>
+                <n-icon>
+                  <PlusOutlined />
+                </n-icon>
+              </template>
+              新建
+            </n-button>
+
+            <n-button
+              type="error"
+              @click="handleDelete"
+              :disabled="!rowKeys.length"
+              v-perm="['sys:ad:batchDelete']"
+            >
+              <template #icon>
+                <n-icon>
+                  <DeleteOutlined />
+                </n-icon>
+              </template>
+              删除
+            </n-button>
+          </n-space>
+        </template>
+      </BasicTable>
+    </n-card>
+    <editDialog
+      ref="createModalRef"
+      :adId="adId"
+      v-if="editVisible"
+      v-model:visible="editVisible"
+      @success="reloadTable('noRefresh')"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { h, nextTick, reactive, ref, unref } from 'vue';
+  import { useMessage, useDialog } from 'naive-ui';
+  import { TableAction } from '@/components/Table';
+  import { BasicForm, useForm } from '@/components/Form/index';
+  import { getAdList, adDelete, adBatchDelete } from '@/api/content/ad';
+  import { columns } from './columns';
+  import { PlusOutlined, DeleteOutlined, FormOutlined } from '@vicons/antd';
+  import CreateModal from './CreateModal.vue';
+  import editDialog from './edit.vue';
+  import { basicModal, useModal } from '@/components/Modal';
+  import { schemas } from './querySchemas';
+  import { renderIcon } from '@/utils';
+
+  const message = useMessage();
+  const dialog = useDialog();
+  const basicTableRef = ref();
+  const createModalRef = ref();
+  const editVisible = ref(false);
+  const adId = ref(0);
+  const rowKeys = ref([]);
+  const exportLoading = ref(false);
+
+  const showModal = ref(false);
+  const formParams = reactive({
+    name: '',
+    status: '',
+  });
+
+  const actionColumn = reactive({
+    width: 200,
+    title: '操作',
+    align: 'center',
+    key: 'action',
+    fixed: 'right',
+    render(record) {
+      return h(TableAction as any, {
+        style: 'button',
+        actions: [
+          {
+            label: '编辑',
+            icon: renderIcon(FormOutlined),
+            type: 'info',
+            onClick: handleEdit.bind(null, record),
+            auth: ['sys:ad:update'],
+          },
+          {
+            label: '删除',
+            icon: renderIcon(DeleteOutlined),
+            type: 'error',
+            onClick: handleDelete.bind(null, record),
+            auth: ['sys:ad:delete'],
+          },
+        ],
+      });
+    },
+  });
+
+  function addTable() {
+    showModal.value = true;
+  }
+
+  const loadDataTable = async (res) => {
+    rowKeys.value = [];
+    const result = await getAdList({ ...formParams, ...res });
+    return result;
+  };
+
+  function onCheckedRow(keys) {
+    rowKeys.value = keys;
+  }
+
+  function reloadTable(noRefresh = '') {
+    basicTableRef.value.reload(noRefresh ? {} : { pageNo: 1 });
+  }
+
+  function handleSubmit(values: Recordable) {
+    for (const key in formParams) {
+      formParams[key] = '';
+    }
+    for (const key in values) {
+      formParams[key] = values[key];
+    }
+    reloadTable();
+  }
+
+  function handleReset(values: Recordable) {
+    for (const key in formParams) {
+      formParams[key] = '';
+    }
+    for (const key in values) {
+      formParams[key] = values[key];
+    }
+    reloadTable();
+  }
+
+  const [register, {}] = useForm({
+    gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
+    labelWidth: 80,
+    schemas,
+  });
+
+  /**
+   * 执行添加
+   */
+  const handleAdd = async () => {
+    adId.value = 0;
+    editVisible.value = true;
+    await nextTick();
+    createModalRef.value.openModal();
+  };
+  /**
+   * 执行编辑
+   */
+  async function handleEdit(record: Recordable) {
+    adId.value = record.id;
+    editVisible.value = true;
+    await nextTick();
+    createModalRef.value.openModal();
+  }
+  /**
+   * 执行删除
+   * @param id 参数
+   */
+  async function handleDelete(record) {
+    dialog.warning({
+      title: '提示',
+      content: '确定要删除？',
+      positiveText: '确定',
+      negativeText: '取消',
+      onPositiveClick: async () => {
+        record.id ? await adDelete(record.id) : await adBatchDelete(rowKeys.value);
+        message.success('删除成功');
+        reloadTable();
+      },
+    });
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/content/ad/querySchemas.ts b/src/views/content/ad/querySchemas.ts
new file mode 100644
index 0000000..201ca86
--- /dev/null
+++ b/src/views/content/ad/querySchemas.ts
@@ -0,0 +1,53 @@
+import { FormSchema } from '@/components/Form/index';
+import { getAdSortAllList } from '@/api/content/adSort';
+export const loadSelectData = async (res) => {
+  //这里可以进行数据转换处理
+  return (await getAdSortAllList({ ...res })).map((item, index) => {
+    return {
+      ...item,
+      label: item.name,
+      value: item.id,
+      index,
+    };
+  });
+};
+export const schemas: FormSchema[] = [
+  {
+    field: 'title',
+    component: 'NInput',
+    label: '广告标题',
+    componentProps: {
+      placeholder: '请输广告标题',
+    },
+  },
+  {
+    field: 'status',
+    component: 'NSelect',
+    label: '广告状态',
+    componentProps: {
+      placeholder: '请选择广告状态',
+      clearable: true,
+      options: [
+        {
+          label: '在用',
+          value: '1',
+        },
+        {
+          label: '停用',
+          value: '2',
+        },
+      ],
+    },
+  },
+  {
+    field: 'adSortId',
+    component: 'BasicSelect',
+    label: '广告位',
+    componentProps: {
+      placeholder: '请选择广告位',
+      clearable: true,
+      block: true,
+      request: loadSelectData,
+    },
+  },
+];
diff --git a/src/views/content/adSort/columns.ts b/src/views/content/adSort/columns.ts
new file mode 100644
index 0000000..8e03643
--- /dev/null
+++ b/src/views/content/adSort/columns.ts
@@ -0,0 +1,62 @@
+import { h } from 'vue';
+
+export const columns = [
+  {
+    type: 'selection',
+    width: 50,
+    fixed: 'left',
+  },
+  {
+    title: 'ID',
+    key: 'id',
+    fixed: 'left',
+    width: 50,
+  },
+  {
+    title: '广告位名称',
+    key: 'name',
+    width: 200,
+  },
+  {
+    title: '广告位编号',
+    key: 'location',
+    width: 100,
+  },
+  {
+    title: '广告位类型',
+    key: 'type',
+    width: 100,
+    render(record) {
+      let typeText = '';
+      switch (record.type) {
+        case 1:
+          typeText = '网站';
+          break;
+        case 2:
+          typeText = '手机站';
+          break;
+        case 3:
+          typeText = '移动端';
+          break;
+        default:
+          break;
+      }
+      return h('span', typeText || '-');
+    },
+  },
+  {
+    title: '排序',
+    key: 'sort',
+    width: 100,
+  },
+  {
+    title: '创建人',
+    key: 'createUser',
+    width: 100,
+  },
+  {
+    title: '创建时间',
+    key: 'createTime',
+    width: 180,
+  },
+];
diff --git a/src/views/content/adSort/edit.vue b/src/views/content/adSort/edit.vue
new file mode 100644
index 0000000..fdbbc2f
--- /dev/null
+++ b/src/views/content/adSort/edit.vue
@@ -0,0 +1,156 @@
+<template>
+  <basicModal
+    @register="modalRegister"
+    ref="modalRef"
+    class="basicModal basicFormModal"
+    @on-ok="handleSubmit"
+    @on-close="handleClose"
+  >
+    <template #default>
+      <n-form
+        class="ls-form"
+        ref="formRef"
+        :model="formData"
+        label-placement="left"
+        label-width="95px"
+      >
+        <n-form-item
+          label="广告位名称"
+          path="name"
+          :rule="{ required: true, message: '请输入广告位名称', trigger: 'blur' }"
+        >
+          <n-input v-model:value="formData.name" placeholder="请输入广告位名称" />
+        </n-form-item>
+        <n-form-item
+          label="页面位置"
+          path="location"
+          class="flex-1"
+          :rule="{ required: true, message: '请输入页面位置', trigger: 'blur' }"
+        >
+          <number-input v-model="formData.location" placeholder="请输入页面位置" />
+        </n-form-item>
+        <n-form-item
+          label="广告位类型"
+          path="type"
+          :rule="{ type: 'number', required: true, message: '请选择广告位类型', trigger: 'change' }"
+        >
+          <n-select
+            v-model:value="formData.type"
+            placeholder="请选择广告位类型"
+            :options="typeList"
+          />
+        </n-form-item>
+        <n-form-item label="排序" path="sort">
+          <n-input-number v-model:value="formData.sort" :max="9999" placeholder="请输入排序" />
+        </n-form-item>
+        <n-form-item
+          label="备注"
+          path="note"
+          :rule="{ required: true, message: '请输入备注', trigger: 'blur' }"
+        >
+          <n-input type="textarea" v-model:value="formData.note" placeholder="请输入备注" />
+        </n-form-item>
+      </n-form>
+    </template>
+  </basicModal>
+</template>
+<script lang="ts" setup>
+  import { getAdSortDetail, adSortAdd, adSortUpdate } from '@/api/content/adSort';
+  import { onMounted, reactive, ref } from 'vue';
+  import { useMessage } from 'naive-ui';
+  import { useModal } from '@/components/Modal';
+
+  const emit = defineEmits(['success', 'update:visible']);
+  const formRef = ref();
+
+  /**
+   * 定义表单参数
+   */
+  const message = useMessage();
+  const formData = reactive({
+    id: '',
+    name: '',
+    location: '',
+    note: '',
+    type: undefined,
+    sort: 0,
+  });
+
+  /**
+   * 定义接收的参数
+   */
+  const props = defineProps({
+    visible: {
+      type: Boolean,
+      required: true,
+      default: false,
+    },
+    adSortId: {
+      type: Number,
+      required: true,
+      default: 0,
+    },
+  });
+  const [modalRegister, { openModal, setSubLoading }] = useModal({
+    title: props.adSortId ? '编辑广告位' : '添加广告位',
+    subBtuText: '确定',
+    width: 600,
+  });
+  const typeList = [
+    { label: '网站', value: 1 },
+    { label: '手机站', value: 2 },
+    { label: '移动端', value: 3 },
+  ];
+  /**
+   * 执行提交
+   */
+  const handleSubmit = async () => {
+    console.log(formData);
+    formRef.value
+      .validate()
+      .then(async () => {
+        props.adSortId ? await adSortUpdate(formData) : await adSortAdd(formData);
+        message.success('操作成功');
+        setSubLoading(false);
+        emit('update:visible', false);
+        emit('success');
+      })
+      .catch((error) => {
+        setSubLoading(false);
+      });
+  };
+
+  /**
+   * 关闭窗体
+   */
+  const handleClose = () => {
+    emit('update:visible', false);
+  };
+
+  /**
+   * 设置表单数据
+   */
+  const setFormData = async () => {
+    const data = await getAdSortDetail(props.adSortId);
+    for (const key in formData) {
+      if (data[key] != null && data[key] != undefined) {
+        //@ts-ignore
+        formData[key] = data[key];
+      }
+    }
+    formData.location = formData.location + '';
+  };
+
+  /**
+   * 钩子函数
+   */
+  onMounted(() => {
+    if (props.adSortId) {
+      setFormData();
+    }
+  });
+  //导出方法
+  defineExpose({
+    openModal,
+  });
+</script>
diff --git a/src/views/content/adSort/index.vue b/src/views/content/adSort/index.vue
new file mode 100644
index 0000000..e2ee6a2
--- /dev/null
+++ b/src/views/content/adSort/index.vue
@@ -0,0 +1,197 @@
+<template>
+  <div>
+    <n-card :bordered="false" class="pt-3 mb-3 proCard">
+      <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
+        <template #statusSlot="{ model, field }">
+          <n-input v-model:value="model[field]" />
+        </template>
+      </BasicForm>
+    </n-card>
+    <n-card :bordered="false" class="proCard">
+      <BasicTable
+        :columns="columns"
+        :request="loadDataTable"
+        :row-key="(row) => row.id"
+        ref="basicTableRef"
+        :actionColumn="actionColumn"
+        @update:checked-row-keys="onCheckedRow"
+        :autoScrollX="true"
+      >
+        <template #tableTitle>
+          <n-space>
+            <n-button type="primary" @click="handleAdd" v-perm="['sys:adSort:add']">
+              <template #icon>
+                <n-icon>
+                  <PlusOutlined />
+                </n-icon>
+              </template>
+              新建
+            </n-button>
+
+            <n-button
+              type="error"
+              @click="handleDelete"
+              :disabled="!rowKeys.length"
+              v-perm="['sys:adSort:batchDelete']"
+            >
+              <template #icon>
+                <n-icon>
+                  <DeleteOutlined />
+                </n-icon>
+              </template>
+              删除
+            </n-button>
+          </n-space>
+        </template>
+      </BasicTable>
+    </n-card>
+    <editDialog
+      ref="createModalRef"
+      :adSortId="adSortId"
+      v-if="editVisible"
+      v-model:visible="editVisible"
+      @success="reloadTable('noRefresh')"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { h, nextTick, reactive, ref, unref } from 'vue';
+  import { useMessage, useDialog } from 'naive-ui';
+  import { TableAction } from '@/components/Table';
+  import { BasicForm, useForm } from '@/components/Form/index';
+  import { getAdSortList, adSortDelete, adSortBatchDelete } from '@/api/content/adSort';
+  import { columns } from './columns';
+  import { PlusOutlined, DeleteOutlined, FormOutlined } from '@vicons/antd';
+  import CreateModal from './CreateModal.vue';
+  import editDialog from './edit.vue';
+  import { basicModal, useModal } from '@/components/Modal';
+  import { schemas } from './querySchemas';
+  import { renderIcon } from '@/utils';
+
+  const message = useMessage();
+  const dialog = useDialog();
+  const basicTableRef = ref();
+  const createModalRef = ref();
+  const editVisible = ref(false);
+  const adSortId = ref(0);
+  const rowKeys = ref([]);
+  const exportLoading = ref(false);
+
+  const showModal = ref(false);
+  const formParams = reactive({
+    name: '',
+    type: '',
+  });
+
+  const actionColumn = reactive({
+    width: 200,
+    title: '操作',
+    align: 'center',
+    key: 'action',
+    fixed: 'right',
+    render(record) {
+      return h(TableAction as any, {
+        style: 'button',
+        actions: [
+          {
+            label: '编辑',
+            icon: renderIcon(FormOutlined),
+            type: 'info',
+            onClick: handleEdit.bind(null, record),
+            auth: ['sys:adSort:update'],
+          },
+          {
+            label: '删除',
+            icon: renderIcon(DeleteOutlined),
+            type: 'error',
+            onClick: handleDelete.bind(null, record),
+            auth: ['sys:adSort:delete'],
+          },
+        ],
+      });
+    },
+  });
+
+  function addTable() {
+    showModal.value = true;
+  }
+
+  const loadDataTable = async (res) => {
+    rowKeys.value = [];
+    const result = await getAdSortList({ ...formParams, ...res });
+    return result;
+  };
+
+  function onCheckedRow(keys) {
+    rowKeys.value = keys;
+  }
+
+  function reloadTable(noRefresh = '') {
+    basicTableRef.value.reload(noRefresh ? {} : { pageNo: 1 });
+  }
+
+  function handleSubmit(values: Recordable) {
+    for (const key in formParams) {
+      formParams[key] = '';
+    }
+    for (const key in values) {
+      formParams[key] = values[key];
+    }
+    reloadTable();
+  }
+
+  function handleReset(values: Recordable) {
+    for (const key in formParams) {
+      formParams[key] = '';
+    }
+    for (const key in values) {
+      formParams[key] = values[key];
+    }
+    reloadTable();
+  }
+
+  const [register, {}] = useForm({
+    gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
+    labelWidth: 80,
+    schemas,
+  });
+
+  /**
+   * 执行添加
+   */
+  const handleAdd = async () => {
+    adSortId.value = 0;
+    editVisible.value = true;
+    await nextTick();
+    createModalRef.value.openModal();
+  };
+  /**
+   * 执行编辑
+   */
+  async function handleEdit(record: Recordable) {
+    adSortId.value = record.id;
+    editVisible.value = true;
+    await nextTick();
+    createModalRef.value.openModal();
+  }
+  /**
+   * 执行删除
+   * @param id 参数
+   */
+  async function handleDelete(record) {
+    dialog.warning({
+      title: '提示',
+      content: '确定要删除？',
+      positiveText: '确定',
+      negativeText: '取消',
+      onPositiveClick: async () => {
+        record.id ? await adSortDelete(record.id) : await adSortBatchDelete(rowKeys.value);
+        message.success('删除成功');
+        reloadTable();
+      },
+    });
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/content/adSort/querySchemas.ts b/src/views/content/adSort/querySchemas.ts
new file mode 100644
index 0000000..ab38c25
--- /dev/null
+++ b/src/views/content/adSort/querySchemas.ts
@@ -0,0 +1,34 @@
+import { FormSchema } from '@/components/Form/index';
+export const schemas: FormSchema[] = [
+  {
+    field: 'name',
+    component: 'NInput',
+    label: '名称',
+    componentProps: {
+      placeholder: '请输入广告位名称',
+    },
+  },
+  {
+    field: 'type',
+    component: 'NSelect',
+    label: '类型',
+    componentProps: {
+      placeholder: '请选择广告位类型',
+      clearable: true,
+      options: [
+        {
+          label: '网站',
+          value: '1',
+        },
+        {
+          label: '手机站',
+          value: '2',
+        },
+        {
+          label: '移动端',
+          value: '3',
+        },
+      ],
+    },
+  },
+];
diff --git a/src/views/content/article/columns.ts b/src/views/content/article/columns.ts
new file mode 100644
index 0000000..688b118
--- /dev/null
+++ b/src/views/content/article/columns.ts
@@ -0,0 +1,90 @@
+import { h } from 'vue';
+import { NImage, NTag } from 'naive-ui';
+
+export const columns = [
+  {
+    type: 'selection',
+    width: 50,
+    fixed: 'left',
+  },
+  {
+    title: 'ID',
+    key: 'id',
+    fixed: 'left',
+    width: 50,
+  },
+  {
+    title: '文章标题',
+    key: 'title',
+    width: 200,
+    render(record) {
+      return h(
+        'a',
+        {
+          href: 'http://www.baidu.com',
+          target: '_blank',
+        },
+        record.title,
+      );
+    },
+  },
+  {
+    title: '文章封面',
+    key: 'cover',
+    width: 100,
+    render(record) {
+      return h(NImage, {
+        width: 48,
+        src: record.cover,
+        shape: 'square',
+        fit: 'fill',
+      });
+    },
+  },
+  {
+    title: '文章分类',
+    key: 'categoryName',
+    width: 100,
+  },
+  {
+    title: '文章作者',
+    key: 'author',
+    width: 100,
+  },
+  {
+    title: '文章状态',
+    key: 'status',
+    width: 100,
+    render(record) {
+      return h(
+        NTag,
+        {
+          type: record.status == 1 ? 'error' : 'success',
+        },
+        {
+          default: () => (record.status == 1 ? '下架' : '正常'),
+        },
+      );
+    },
+  },
+  {
+    title: '点击率',
+    key: 'click',
+    width: 100,
+  },
+  {
+    title: '文章排序',
+    key: 'sort',
+    width: 100,
+  },
+  {
+    title: '创建人',
+    key: 'createUser',
+    width: 100,
+  },
+  {
+    title: '创建时间',
+    key: 'createTime',
+    width: 180,
+  },
+];
diff --git a/src/views/content/article/edit.vue b/src/views/content/article/edit.vue
new file mode 100644
index 0000000..1fcd3e2
--- /dev/null
+++ b/src/views/content/article/edit.vue
@@ -0,0 +1,258 @@
+<template>
+  <basicModal
+    @register="modalRegister"
+    ref="modalRef"
+    class="basicModal basicFormModal"
+    @on-ok="handleSubmit"
+    @on-close="handleClose"
+  >
+    <template #default>
+      <n-form
+        class="ls-form"
+        ref="formRef"
+        :model="formData"
+        label-placement="left"
+        label-width="85px"
+        style="display: flex"
+      >
+        <div style="width: 880px; flex: none" :style="{ height: fwbHeight + 'px' }">
+          <n-form-item label-width="0px" path="content">
+            <Editor ref="editorRef" :height="fwbHeight" name="article" />
+          </n-form-item>
+        </div>
+        <div style="flex: 1; margin-left: 10px">
+          <n-form-item
+            label="文章标题"
+            path="title"
+            :rule="{ required: true, message: '请输入文章标题', trigger: 'blur' }"
+          >
+            <n-input placeholder="请输入文章标题" :maxlength="50" v-model:value="formData.title" />
+          </n-form-item>
+          <n-form-item
+            label="文章作者"
+            path="author"
+            :rule="{ required: true, message: '请输入文章作者', trigger: 'blur' }"
+          >
+            <n-input placeholder="请输入文章作者" :maxlength="50" v-model:value="formData.author" />
+          </n-form-item>
+          <n-form-item
+            label="文章分类"
+            path="categoryId"
+            :rule="{ required: true, message: '请选择文章分类', trigger: 'change' }"
+          >
+            <n-tree-select
+              v-model:value="formData.categoryId"
+              :tree-data="categoryList"
+              :fieldNames="{ children: 'children', label: 'name', value: 'id' }"
+              placeholder="请选择文章分类"
+            />
+          </n-form-item>
+          <n-form-item
+            label="文章封面"
+            path="cover"
+            :rule="{ required: true, message: '请上传文章封面', trigger: 'change' }"
+          >
+            <UploadImg
+              @change-file-name="(name) => (formData.coverImgName = name)"
+              :fileType="['image/jpeg', 'image/png', 'image/jpg', 'image/gif']"
+              name="article"
+              :fileSize="200"
+              v-model:image-url="formData.cover"
+            >
+              <template #tip>支持扩展名: jpg png jpeg;文件大小不超过200M</template>
+            </UploadImg>
+          </n-form-item>
+          <n-form-item
+            label="文章图集"
+            path="imagesList"
+            :rule="{
+              key: 'imagesList',
+              type: 'array',
+              required: true,
+              message: '请上传文章图集',
+              trigger: 'change',
+            }"
+          >
+            <UploadImgs
+              @upload="fileUploads"
+              file-type=".jpeg,.png,.jpg,.gif"
+              name="article"
+              :fileSize="200"
+              :multiple="true"
+              :fileLists="formData.imagesList"
+            />
+          </n-form-item>
+          <n-form-item
+            label="导读"
+            path="intro"
+            :rule="{ required: true, message: '请输入导读', trigger: 'blur' }"
+          >
+            <n-input type="textarea" placeholder="请输入导读" v-model:value="formData.intro" />
+          </n-form-item>
+          <n-form-item
+            label="点击率"
+            path="click"
+            :rule="{ required: true, message: '请输入点击率', trigger: 'blur' }"
+          >
+            <number-input v-model="formData.click" placeholder="请输入点击率" />
+          </n-form-item>
+          <n-form-item label="排序" path="sort">
+            <n-input-number v-model:value="formData.sort" :max="9999" placeholder="请输入排序" />
+          </n-form-item>
+          <n-form-item label="状态">
+            <n-radio-group v-model:value="formData.status">
+              <n-radio :value="0">正常</n-radio>
+              <n-radio :value="1">下架</n-radio>
+            </n-radio-group>
+          </n-form-item>
+        </div>
+      </n-form>
+    </template>
+  </basicModal>
+</template>
+<script lang="ts" setup>
+  import { getArticleDetail, articleAdd, articleUpdate } from '@/api/content/article';
+  import { getCategoryList } from '@/api/content/category';
+  import { onMounted, reactive, ref } from 'vue';
+  import { useMessage } from 'naive-ui';
+  import { useModal } from '@/components/Modal';
+  import UploadImg from '@/components/Upload/Image.vue';
+  import UploadImgs from '@/components/Upload/Images.vue';
+  import Editor from '@/components/Editor/tinymce.vue';
+  import { buildTree } from '@/utils/auth';
+
+  const emit = defineEmits(['success', 'update:visible']);
+  const formRef = ref();
+  const editorRef = ref();
+  const categoryList = ref([]);
+  const fwbHeight = document.body.clientHeight - 180;
+
+  /**
+   * 定义表单参数
+   */
+  const message = useMessage();
+  const formData = reactive({
+    id: '',
+    categoryId: undefined,
+    title: '',
+    author: '',
+    cover: '',
+    intro: '',
+    content: '',
+    status: 0,
+    click: '',
+    sort: 0,
+    images: '',
+    imagesList: [],
+  });
+
+  /**
+   * 定义接收的参数
+   */
+  const props = defineProps({
+    visible: {
+      type: Boolean,
+      required: true,
+      default: false,
+    },
+    articleId: {
+      type: Number,
+      required: true,
+      default: 0,
+    },
+  });
+  const [modalRegister, { openModal, setSubLoading }] = useModal({
+    title: props.articleId ? '编辑文章' : '添加文章',
+    subBtuText: '确定',
+    width: 1350,
+  });
+
+  /**
+   * 文件上传
+   * @param list 列表
+   */
+  const fileUploads = (list: any) => {
+    console.log(list);
+    formData.imagesList = list;
+    formRef.value?.validate(
+      (errors) => {},
+      (rule) => {
+        return rule?.key === 'imagesList';
+      },
+    );
+    return;
+  };
+  /**
+   * 执行提交
+   */
+  const handleSubmit = async () => {
+    formRef.value
+      .validate()
+      .then(async () => {
+        formData.images = '';
+        formData.imagesList.map((item, index) => {
+          formData.images += `${item.filePath}${index < formData.imagesList.length - 1 ? ',' : ''}`;
+        });
+        let ruleForm = JSON.parse(JSON.stringify(formData));
+        ruleForm.content = editorRef.value.myValue;
+        if (!ruleForm.content) {
+          message.error('请添加文章内容');
+          return;
+        }
+        props.articleId ? await articleUpdate(ruleForm) : await articleAdd(ruleForm);
+        message.success('操作成功');
+        setSubLoading(false);
+        emit('update:visible', false);
+        emit('success');
+      })
+      .catch((error) => {
+        setSubLoading(false);
+      });
+  };
+
+  /**
+   * 关闭窗体
+   */
+  const handleClose = () => {
+    emit('update:visible', false);
+  };
+
+  /**
+   * 设置表单数据
+   */
+  const setFormData = async () => {
+    const data = await getArticleDetail(props.articleId);
+    for (const key in formData) {
+      if (data[key] != null && data[key] != undefined) {
+        //@ts-ignore
+        formData[key] = data[key];
+      }
+    }
+    formData.click = formData.click + '';
+    let list = formData.imagesList;
+    formData.imagesList = list.map((item) => ({ filePath: item }));
+    editorRef.value.myValue = formData.content;
+  };
+
+  /**
+   * 获取全部字典数据
+   */
+  const getAllDict = async () => {
+    let list = await getCategoryList();
+    categoryList.value = list ? buildTree(list) : [];
+  };
+
+  /**
+   * 钩子函数
+   */
+  onMounted(() => {
+    getAllDict();
+    if (props.articleId) {
+      setFormData();
+    }
+  });
+  //导出方法
+  defineExpose({
+    openModal,
+  });
+</script>
diff --git a/src/views/content/article/index.vue b/src/views/content/article/index.vue
new file mode 100644
index 0000000..8bb0483
--- /dev/null
+++ b/src/views/content/article/index.vue
@@ -0,0 +1,197 @@
+<template>
+  <div>
+    <n-card :bordered="false" class="pt-3 mb-3 proCard">
+      <BasicForm @register="register" @submit="handleSubmit" @reset="handleReset">
+        <template #statusSlot="{ model, field }">
+          <n-input v-model:value="model[field]" />
+        </template>
+      </BasicForm>
+    </n-card>
+    <n-card :bordered="false" class="proCard">
+      <BasicTable
+        :columns="columns"
+        :request="loadDataTable"
+        :row-key="(row) => row.id"
+        ref="basicTableRef"
+        :actionColumn="actionColumn"
+        @update:checked-row-keys="onCheckedRow"
+        :autoScrollX="true"
+      >
+        <template #tableTitle>
+          <n-space>
+            <n-button type="primary" @click="handleAdd" v-perm="['sys:article:add']">
+              <template #icon>
+                <n-icon>
+                  <PlusOutlined />
+                </n-icon>
+              </template>
+              新建
+            </n-button>
+
+            <n-button
+              type="error"
+              @click="handleDelete"
+              :disabled="!rowKeys.length"
+              v-perm="['sys:article:batchDelete']"
+            >
+              <template #icon>
+                <n-icon>
+                  <DeleteOutlined />
+                </n-icon>
+              </template>
+              删除
+            </n-button>
+          </n-space>
+        </template>
+      </BasicTable>
+    </n-card>
+    <editDialog
+      ref="createModalRef"
+      :articleId="articleId"
+      v-if="editVisible"
+      v-model:visible="editVisible"
+      @success="reloadTable('noRefresh')"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { h, nextTick, reactive, ref, unref } from 'vue';
+  import { useMessage, useDialog } from 'naive-ui';
+  import { TableAction } from '@/components/Table';
+  import { BasicForm, useForm } from '@/components/Form/index';
+  import { getArticleList, articleDelete, articleBatchDelete } from '@/api/content/article';
+  import { columns } from './columns';
+  import { PlusOutlined, DeleteOutlined, FormOutlined } from '@vicons/antd';
+  import CreateModal from './CreateModal.vue';
+  import editDialog from './edit.vue';
+  import { basicModal, useModal } from '@/components/Modal';
+  import { schemas } from './querySchemas';
+  import { renderIcon } from '@/utils';
+
+  const message = useMessage();
+  const dialog = useDialog();
+  const basicTableRef = ref();
+  const createModalRef = ref();
+  const editVisible = ref(false);
+  const articleId = ref(0);
+  const rowKeys = ref([]);
+  const exportLoading = ref(false);
+
+  const showModal = ref(false);
+  const formParams = reactive({
+    title: '',
+    status: '',
+  });
+
+  const actionColumn = reactive({
+    width: 200,
+    title: '操作',
+    align: 'center',
+    key: 'action',
+    fixed: 'right',
+    render(record) {
+      return h(TableAction as any, {
+        style: 'button',
+        actions: [
+          {
+            label: '编辑',
+            icon: renderIcon(FormOutlined),
+            type: 'info',
+            onClick: handleEdit.bind(null, record),
+            auth: ['sys:article:update'],
+          },
+          {
+            label: '删除',
+            icon: renderIcon(DeleteOutlined),
+            type: 'error',
+            onClick: handleDelete.bind(null, record),
+            auth: ['sys:article:delete'],
+          },
+        ],
+      });
+    },
+  });
+
+  function addTable() {
+    showModal.value = true;
+  }
+
+  const loadDataTable = async (res) => {
+    rowKeys.value = [];
+    const result = await getArticleList({ ...formParams, ...res });
+    return result;
+  };
+
+  function onCheckedRow(keys) {
+    rowKeys.value = keys;
+  }
+
+  function reloadTable(noRefresh = '') {
+    basicTableRef.value.reload(noRefresh ? {} : { pageNo: 1 });
+  }
+
+  function handleSubmit(values: Recordable) {
+    for (const key in formParams) {
+      formParams[key] = '';
+    }
+    for (const key in values) {
+      formParams[key] = values[key];
+    }
+    reloadTable();
+  }
+
+  function handleReset(values: Recordable) {
+    for (const key in formParams) {
+      formParams[key] = '';
+    }
+    for (const key in values) {
+      formParams[key] = values[key];
+    }
+    reloadTable();
+  }
+
+  const [register, {}] = useForm({
+    gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
+    labelWidth: 80,
+    schemas,
+  });
+
+  /**
+   * 执行添加
+   */
+  const handleAdd = async () => {
+    articleId.value = 0;
+    editVisible.value = true;
+    await nextTick();
+    createModalRef.value.openModal();
+  };
+  /**
+   * 执行编辑
+   */
+  async function handleEdit(record: Recordable) {
+    articleId.value = record.id;
+    editVisible.value = true;
+    await nextTick();
+    createModalRef.value.openModal();
+  }
+  /**
+   * 执行删除
+   * @param id 参数
+   */
+  async function handleDelete(record) {
+    dialog.warning({
+      title: '提示',
+      content: '确定要删除？',
+      positiveText: '确定',
+      negativeText: '取消',
+      onPositiveClick: async () => {
+        record.id ? await articleDelete(record.id) : await articleBatchDelete(rowKeys.value);
+        message.success('删除成功');
+        reloadTable();
+      },
+    });
+  }
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/content/article/querySchemas.ts b/src/views/content/article/querySchemas.ts
new file mode 100644
index 0000000..8bfb15f
--- /dev/null
+++ b/src/views/content/article/querySchemas.ts
@@ -0,0 +1,30 @@
+import { FormSchema } from '@/components/Form/index';
+export const schemas: FormSchema[] = [
+  {
+    field: 'title',
+    component: 'NInput',
+    label: '文章标题',
+    componentProps: {
+      placeholder: '请输入文章标题',
+    },
+  },
+  {
+    field: 'status',
+    component: 'NSelect',
+    label: '文章状态',
+    componentProps: {
+      placeholder: '请选择文章状态',
+      clearable: true,
+      options: [
+        {
+          label: '下架',
+          value: '1',
+        },
+        {
+          label: '正常',
+          value: '0',
+        },
+      ],
+    },
+  },
+];
diff --git a/src/views/monitor/job/columns.ts b/src/views/monitor/job/columns.ts
index c23ed60..7b8bdc0 100644
--- a/src/views/monitor/job/columns.ts
+++ b/src/views/monitor/job/columns.ts
@@ -62,7 +62,6 @@ export const columns = [
   {
     title: '状态',
     key: 'status',
-    key: 'status',
     width: 100,
   },
   {