wip: 🚧 通知公告开发

通知公告开发

src/api/notice.ts

@@ -25,7 +25,11 @@ class NoticeAPI {
     });
   }
 
-  /** 添加通知公告*/
+  /**
+   * 添加通知公告
+   * @param data Notice表单数据
+   * @returns
+   */
   static add(data: NoticeForm) {
     return request({
       url: `${NOTICE_BASE_URL}`,
@@ -59,63 +63,64 @@ class NoticeAPI {
       method: "delete",
     });
   }
+
+  /**
+   * 发布通知
+   *
+   * @param id 被发布的通知公告id
+   * @returns
+   */
+  static releaseNotice(id: number) {
+    return request({
+      url: `${NOTICE_BASE_URL}/release/${id}`,
+      method: "patch",
+    });
+  }
+
+  /**
+   * 撤回通知
+   *
+   * @param id 撤回的通知id
+   * @returns
+   */
+  static recallNotice(id: number) {
+    return request({
+      url: `${NOTICE_BASE_URL}/recall/${id}`,
+      method: "patch",
+    });
+  }
 }
 
 export default NoticeAPI;
 
 /** 通知公告分页查询参数 */
 export interface NoticePageQuery extends PageQuery {
-  id?: bigint;
-  /** 通知标题 */
+  /** 标题 */
   title?: string;
-  /** 通知内容 */
-  content?: string;
-  /** 通知类型 */
-  noticeType?: number;
-  /** 发布人 */
-  releaseBy?: bigint;
-  /** 优先级(0-低 1-中 2-高) */
-  priority?: number;
-  /** 目标类型(0-全体 1-指定) */
-  tarType?: number;
   /** 发布状态(0-未发布 1已发布 2已撤回) */
   sendStatus?: number;
-  /** 发布时间 */
-  sendTime?: [string, string];
-  /** 撤回时间 */
-  recallTime?: [string, string];
-  /** 创建时间 */
-  createTime?: Date;
-  /** 更新时间 */
-  updateTime?: Date;
 }
 
 /** 通知公告表单对象 */
 export interface NoticeForm {
-  id?: bigint;
+  id?: number;
   /** 通知标题 */
   title?: string;
   /** 通知内容 */
   content?: string;
   /** 通知类型 */
   noticeType?: number;
-  /** 发布人 */
-  releaseBy?: bigint;
   /** 优先级(0-低 1-中 2-高) */
   priority?: number;
   /** 目标类型(0-全体 1-指定) */
   tarType?: number;
-  /** 发布状态(0-未发布 1已发布 2已撤回) */
-  sendStatus?: number;
-  /** 发布时间 */
-  sendTime?: Date;
-  /** 撤回时间 */
-  recallTime?: Date;
+  /** 目标ID合集，以,分割 */
+  tarIds?: string;
 }
 
 /** 通知公告分页对象 */
 export interface NoticePageVO {
-  id?: bigint;
+  id?: string;
   /** 通知标题 */
   title?: string;
   /** 通知内容 */
@@ -129,13 +134,9 @@ export interface NoticePageVO {
   /** 目标类型(0-全体 1-指定) */
   tarType?: number;
   /** 发布状态(0-未发布 1已发布 2已撤回) */
-  sendStatus?: number;
+  releaseStatus?: number;
   /** 发布时间 */
-  sendTime?: Date;
+  releaseTime?: Date;
   /** 撤回时间 */
   recallTime?: Date;
-  /** 创建时间 */
-  createTime?: Date;
-  /** 更新时间 */
-  updateTime?: Date;
 }

src/layout/components/NavBar/components/NavbarAction.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex">
     <template v-if="!isMobile">
-      <!-- 搜索 -->
+      <!--搜索 -->
       <menu-search />
       <!--全屏 -->
       <div class="nav-action-item" @click="toggle">

src/views/demo/wang-editor.vue

@@ -12,8 +12,12 @@ const value = ref("初始内容");
       type="primary"
       target="_blank"
       class="mb-[20px]"
-      >示例源码 请点击>>>></el-link
     >
-    <editor v-model="value" style="height: calc(100vh - 180px)" />
+      示例源码 请点击>>>>
+    </el-link>
+    <editor
+      v-model="value"
+      style=" z-index: 99999;height: calc(100vh - 180px)"
+    />
   </div>
 </template>

src/views/notice/index.vue

@@ -0,0 +1,393 @@
+<template>
+  <div class="app-container">
+    <div class="search-container">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+        <el-form-item label="通知标题" prop="title">
+          <el-input
+            v-model="queryParams.title"
+            placeholder="关键字"
+            clearable
+            @keyup.enter="handleQuery()"
+          />
+        </el-form-item>
+        <el-form-item label="优先级" prop="priority">
+          <el-select
+            v-model="queryParams.priority"
+            class="!w-[100px]"
+            clearable
+            placeholder="全部"
+          >
+            <el-option :value="0" label="低" />
+            <el-option :value="1" label="中" />
+            <el-option :value="2" label="高" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发布时间" prop="sendTime">
+          <el-date-picker
+            v-model="queryParams.sendTime"
+            type="daterange"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleQuery()">
+            <i-ep-search />
+            搜索
+          </el-button>
+          <el-button @click="handleResetQuery()">
+            <i-ep-refresh />
+            重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <el-card shadow="never" class="table-container">
+      <el-table
+        ref="dataTableRef"
+        v-loading="loading"
+        :data="pageData"
+        highlight-current-row
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          align="center"
+          key="title"
+          label="通知标题"
+          prop="title"
+          min-width="150"
+        />
+        <el-table-column
+          align="center"
+          key="noticeType"
+          label="通知类型"
+          prop="noticeType"
+          min-width="150"
+        />
+        <el-table-column
+          align="center"
+          key="releaseBy"
+          label="发布人"
+          prop="releaseBy"
+          min-width="100"
+        />
+        <el-table-column
+          align="center"
+          key="priority"
+          label="优先级"
+          prop="priority"
+          min-width="100"
+        >
+          <template #default="scope">
+            <el-tag v-if="scope.row.priority == 0" type="danger">低</el-tag>
+            <el-tag v-if="scope.row.priority == 1" type="success">中</el-tag>
+            <el-tag v-if="scope.row.priority == 2" type="warning">高</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          key="sendTime"
+          label="发布时间"
+          prop="sendTime"
+          min-width="100"
+        />
+        <el-table-column align="center" fixed="right" label="操作" width="220">
+          <template #default="scope">
+            <el-button
+              v-hasPerm="['system:notice:edit']"
+              type="primary"
+              size="small"
+              link
+              @click="handleOpenDialog(scope.row.id)"
+            >
+              查看
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-if="total > 0"
+        v-model:total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="handleQuery()"
+      />
+    </el-card>
+
+    <!-- 通知公告表单弹窗 -->
+    <el-dialog
+      v-model="dialog.visible"
+      :title="dialog.title"
+      width="500px"
+      @close="handleCloseDialog"
+    >
+      <el-form
+        ref="dataFormRef"
+        :model="formData"
+        :rules="rules"
+        label-width="100px"
+      >
+        <!--        <el-input v-model="queryParams.id" hidden />-->
+        <el-form-item label="通知标题" prop="title">
+          <el-input
+            v-model="formData.title"
+            placeholder="通知标题"
+            clearable
+            @keyup.enter="handleQuery()"
+          />
+        </el-form-item>
+        <el-form-item label="通知内容" prop="content">
+          <el-input
+            v-model="formData.content"
+            placeholder="通知内容"
+            clearable
+            @keyup.enter="handleQuery()"
+          />
+        </el-form-item>
+        <el-form-item label="通知类型" prop="noticeType">
+          <el-input
+            v-model="formData.noticeType"
+            placeholder="通知类型"
+            clearable
+            @keyup.enter="handleQuery()"
+          />
+        </el-form-item>
+        <!--        <el-form-item label="发布人" prop="releaseBy">-->
+        <!--          <el-input-->
+        <!--            v-model="formData.releaseBy"-->
+        <!--            placeholder="发布人"-->
+        <!--            clearable-->
+        <!--            @keyup.enter="handleQuery()"-->
+        <!--          />-->
+        <!--        </el-form-item>-->
+        <el-form-item label="优先级" prop="priority">
+          <!--          <el-input-->
+          <!--            v-model="formData.priority"-->
+          <!--            placeholder="优先级(0-低 1-中 2-高)"-->
+          <!--            clearable-->
+          <!--            @keyup.enter="handleQuery()"-->
+          <!--          />-->
+          <el-radio-group v-model="formData.priority">
+            <el-radio :value="0">低</el-radio>
+            <el-radio :value="1">中</el-radio>
+            <el-radio :value="2">高</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="目标类型" prop="tarType">
+          <!--          <el-input-->
+          <!--            v-model="formData.tarType"-->
+          <!--            placeholder="目标类型(0-全体 1-指定)"-->
+          <!--            clearable-->
+          <!--            @keyup.enter="handleQuery()"-->
+          <!--          />-->
+          <el-radio-group v-model="formData.tarType">
+            <el-radio :value="0">全体</el-radio>
+            <el-radio :value="1">指定</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="发布状态" prop="sendStatus">
+          <!--          <el-input-->
+          <!--            v-model="formData.sendStatus"-->
+          <!--            placeholder="发布状态(0-未发布 1已发布 2已撤回)"-->
+          <!--            clearable-->
+          <!--            @keyup.enter="handleQuery()"-->
+          <!--          />-->
+          <el-radio-group v-model="formData.sendStatus">
+            <el-radio :value="0">未发布</el-radio>
+            <el-radio :value="1">已发布</el-radio>
+            <el-radio :value="2">已撤回</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          v-if="formData.sendStatus === 1"
+          label="发布时间"
+          prop="sendTime"
+        >
+          <el-date-picker
+            v-model="formData.sendTime"
+            type="datetime"
+            placeholder="发布时间"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="formData.sendStatus === 2"
+          label="撤回时间"
+          prop="recallTime"
+        >
+          <el-date-picker
+            v-model="formData.recallTime"
+            type="datetime"
+            placeholder="撤回时间"
+            value-format="YYYY-MM-DD HH:mm:ss"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="handleSubmit()">确定</el-button>
+          <el-button @click="handleCloseDialog()">取消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "MyNotice",
+  inheritAttrs: false,
+});
+
+import NoticeAPI, {
+  NoticePageVO,
+  NoticeForm,
+  NoticePageQuery,
+} from "@/api/notice";
+
+const queryFormRef = ref(ElForm);
+const dataFormRef = ref(ElForm);
+
+const loading = ref(false);
+const ids = ref<number[]>([]);
+const total = ref(0);
+
+const queryParams = reactive<NoticePageQuery>({
+  pageNum: 1,
+  pageSize: 10,
+});
+
+// 通知公告表格数据
+const pageData = ref<NoticePageVO[]>([]);
+
+// 弹窗
+const dialog = reactive({
+  title: "",
+  visible: false,
+});
+
+// 通知公告表单数据
+const formData = reactive<NoticeForm>({
+  sendStatus: 0, // 默认状态为未发布
+  priority: 0, // 默认优先级为低
+  tarType: 0, // 默认目标类型为全体
+});
+
+// 通知公告表单校验规则
+const rules = reactive({
+  title: [{ required: true, message: "请输入通知标题", trigger: "blur" }],
+  content: [{ required: true, message: "请输入通知内容", trigger: "blur" }],
+  // releaseBy: [{ required: true, message: "请输入发布人", trigger: "blur" }],
+  sendTime: [{ required: true, message: "请输入发布时间", trigger: "blur" }],
+  recallTime: [{ required: true, message: "请输入撤回时间", trigger: "blur" }],
+});
+
+/** 查询通知公告 */
+function handleQuery() {
+  loading.value = true;
+  NoticeAPI.getPage(queryParams)
+    .then((data) => {
+      pageData.value = data.list;
+      total.value = data.total;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
+}
+
+/** 重置通知公告查询 */
+function handleResetQuery() {
+  queryFormRef.value!.resetFields();
+  queryParams.pageNum = 1;
+  handleQuery();
+}
+
+/** 行复选框选中记录选中ID集合 */
+function handleSelectionChange(selection: any) {
+  ids.value = selection.map((item: any) => item.id);
+}
+
+/** 打开通知公告弹窗 */
+function handleOpenDialog(id?: number) {
+  dialog.visible = true;
+  if (id) {
+    dialog.title = "修改通知公告";
+    NoticeAPI.getFormData(id).then((data) => {
+      Object.assign(formData, data);
+    });
+  } else {
+    dialog.title = "新增通知公告";
+  }
+}
+
+/** 提交通知公告表单 */
+function handleSubmit() {
+  dataFormRef.value.validate((valid: any) => {
+    if (valid) {
+      loading.value = true;
+      const id = formData.id;
+      if (id) {
+        NoticeAPI.update(id, formData)
+          .then(() => {
+            ElMessage.success("修改成功");
+            handleCloseDialog();
+            handleResetQuery();
+          })
+          .finally(() => (loading.value = false));
+      } else {
+        NoticeAPI.add(formData)
+          .then(() => {
+            ElMessage.success("新增成功");
+            handleCloseDialog();
+            handleResetQuery();
+          })
+          .finally(() => (loading.value = false));
+      }
+    }
+  });
+}
+
+/** 关闭通知公告弹窗 */
+function handleCloseDialog() {
+  dialog.visible = false;
+  dataFormRef.value.resetFields();
+  dataFormRef.value.clearValidate();
+  formData.id = undefined;
+}
+
+/** 删除通知公告 */
+function handleDelete(id?: number) {
+  const deleteIds = [id || ids.value].join(",");
+  if (!deleteIds) {
+    ElMessage.warning("请勾选删除项");
+    return;
+  }
+
+  ElMessageBox.confirm("确认删除已选中的数据项?", "警告", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+  }).then(
+    () => {
+      loading.value = true;
+      NoticeAPI.deleteByIds(deleteIds)
+        .then(() => {
+          ElMessage.success("删除成功");
+          handleResetQuery();
+        })
+        .finally(() => (loading.value = false));
+    },
+    () => {
+      ElMessage.info("已取消删除");
+    }
+  );
+}
+
+onMounted(() => {
+  handleQuery();
+});
+</script>

src/views/system/notice/index.vue

@@ -1,65 +1,23 @@
 <template>
   <div class="app-container">
     <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="通知标题" prop="title">
+      <el-form
+        ref="queryFormRef"
+        :model="queryParams"
+        :inline="true"
+        label-suffix=":"
+      >
+        <el-form-item label="标题" prop="title">
           <el-input
             v-model="queryParams.title"
-            placeholder="通知标题"
+            placeholder="标题"
             clearable
             @keyup.enter="handleQuery()"
           />
         </el-form-item>
-        <el-form-item label="通知内容" prop="content">
-          <el-input
-            v-model="queryParams.content"
-            placeholder="通知内容"
-            clearable
-            @keyup.enter="handleQuery()"
-          />
-        </el-form-item>
-        <el-form-item label="通知类型" prop="noticeType">
-          <el-input
-            v-model="queryParams.noticeType"
-            placeholder="通知类型"
-            clearable
-            @keyup.enter="handleQuery()"
-          />
-        </el-form-item>
-        <el-form-item label="发布人" prop="releaseBy">
-          <el-input
-            v-model="queryParams.releaseBy"
-            placeholder="发布人"
-            clearable
-            @keyup.enter="handleQuery()"
-          />
-        </el-form-item>
-        <el-form-item label="优先级" prop="priority">
+        <el-form-item label="发布状态" prop="releaseStatus">
           <el-select
-            v-model="queryParams.priority"
-            class="!w-[100px]"
-            clearable
-            placeholder="全部"
-          >
-            <el-option :value="0" label="低" />
-            <el-option :value="1" label="中" />
-            <el-option :value="2" label="高" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="目标类型" prop="tarType">
-          <el-select
-            v-model="queryParams.tarType"
-            class="!w-[100px]"
-            clearable
-            placeholder="全部"
-          >
-            <el-option :value="0" label="全体" />
-            <el-option :value="1" label="指定" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="发布状态" prop="sendStatus">
-          <el-select
-            v-model="queryParams.sendStatus"
+            v-model="queryParams.releaseStatus"
             class="!w-[100px]"
             clearable
             placeholder="全部"
@@ -69,26 +27,6 @@
             <el-option :value="2" label="已撤回" />
           </el-select>
         </el-form-item>
-        <el-form-item label="发布时间" prop="sendTime">
-          <el-date-picker
-            v-model="queryParams.sendTime"
-            type="daterange"
-            range-separator="~"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-form-item>
-        <el-form-item label="撤回时间" prop="recallTime">
-          <el-date-picker
-            v-model="queryParams.recallTime"
-            type="daterange"
-            range-separator="~"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="handleQuery()">
             <i-ep-search />
@@ -110,7 +48,7 @@
           @click="handleOpenDialog()"
         >
           <i-ep-plus />
-          新增
+          新增通知
         </el-button>
         <el-button
           v-hasPerm="['system:notice:delete']"
@@ -131,13 +69,6 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column
-          align="center"
-          key="id"
-          label="id"
-          prop="id"
-          min-width="100"
-        />
         <el-table-column
           align="center"
           key="title"
@@ -145,13 +76,6 @@
           prop="title"
           min-width="150"
         />
-        <el-table-column
-          align="center"
-          key="content"
-          label="通知内容"
-          prop="content"
-          min-width="150"
-        />
         <el-table-column
           align="center"
           key="noticeType"
@@ -182,7 +106,7 @@
         <el-table-column
           align="center"
           key="tarType"
-          label="目标类型"
+          label="通告对象"
           prop="tarType"
           min-width="100"
         >
@@ -193,28 +117,28 @@
         </el-table-column>
         <el-table-column
           align="center"
-          key="sendStatus"
+          key="releaseStatus"
           label="发布状态"
-          prop="sendStatus"
+          prop="releaseStatus"
           min-width="100"
         >
           <template #default="scope">
-            <el-tag v-if="scope.row.sendStatus == 0" type="warning">
+            <el-tag v-if="scope.row.releaseStatus == 0" type="warning">
               未发布
             </el-tag>
-            <el-tag v-if="scope.row.sendStatus == 1" type="success">
+            <el-tag v-if="scope.row.releaseStatus == 1" type="success">
               已发布
             </el-tag>
-            <el-tag v-if="scope.row.sendStatus == 2" type="primary">
+            <el-tag v-if="scope.row.releaseStatus == 2" type="primary">
               已撤回
             </el-tag>
           </template>
         </el-table-column>
         <el-table-column
           align="center"
-          key="sendTime"
+          key="releaseTime"
           label="发布时间"
-          prop="sendTime"
+          prop="releaseTime"
           min-width="100"
         />
         <el-table-column
@@ -224,23 +148,32 @@
           prop="recallTime"
           min-width="100"
         />
-        <el-table-column
-          align="center"
-          key="createTime"
-          label="创建时间"
-          prop="createTime"
-          min-width="100"
-        />
-        <el-table-column
-          align="center"
-          key="updateTime"
-          label="更新时间"
-          prop="updateTime"
-          min-width="100"
-        />
         <el-table-column align="center" fixed="right" label="操作" width="220">
           <template #default="scope">
             <el-button
+              v-if="scope.row.releaseStatus != 1"
+              v-hasPerm="['system:notice:release']"
+              type="primary"
+              size="small"
+              link
+              @click="releaseNotice(scope.row.id)"
+            >
+              <i-ep-edit />
+              发布
+            </el-button>
+            <el-button
+              v-if="scope.row.releaseStatus == 1"
+              v-hasPerm="['system:notice:recall']"
+              type="primary"
+              size="small"
+              link
+              @click="recallNotice(scope.row.id)"
+            >
+              <i-ep-edit />
+              撤回
+            </el-button>
+            <el-button
+              v-if="scope.row.releaseStatus != 1"
               v-hasPerm="['system:notice:edit']"
               type="primary"
               size="small"
@@ -251,6 +184,7 @@
               编辑
             </el-button>
             <el-button
+              v-if="scope.row.releaseStatus != 1"
               v-hasPerm="['system:notice:delete']"
               type="danger"
               size="small"
@@ -277,111 +211,48 @@
     <el-dialog
       v-model="dialog.visible"
       :title="dialog.title"
-      width="500px"
+      width="70%"
       @close="handleCloseDialog"
     >
-      <el-form
-        ref="dataFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="100px"
-      >
-        <!--        <el-input v-model="queryParams.id" hidden />-->
-        <el-form-item label="通知标题" prop="title">
-          <el-input
-            v-model="formData.title"
-            placeholder="通知标题"
-            clearable
-            @keyup.enter="handleQuery()"
-          />
-        </el-form-item>
-        <el-form-item label="通知内容" prop="content">
-          <el-input
-            v-model="formData.content"
-            placeholder="通知内容"
-            clearable
-            @keyup.enter="handleQuery()"
-          />
-        </el-form-item>
-        <el-form-item label="通知类型" prop="noticeType">
-          <el-input
-            v-model="formData.noticeType"
-            placeholder="通知类型"
-            clearable
-            @keyup.enter="handleQuery()"
-          />
-        </el-form-item>
-        <!--        <el-form-item label="发布人" prop="releaseBy">-->
-        <!--          <el-input-->
-        <!--            v-model="formData.releaseBy"-->
-        <!--            placeholder="发布人"-->
-        <!--            clearable-->
-        <!--            @keyup.enter="handleQuery()"-->
-        <!--          />-->
-        <!--        </el-form-item>-->
-        <el-form-item label="优先级" prop="priority">
-          <!--          <el-input-->
-          <!--            v-model="formData.priority"-->
-          <!--            placeholder="优先级(0-低 1-中 2-高)"-->
-          <!--            clearable-->
-          <!--            @keyup.enter="handleQuery()"-->
-          <!--          />-->
-          <el-radio-group v-model="formData.priority">
-            <el-radio :value="0">低</el-radio>
-            <el-radio :value="1">中</el-radio>
-            <el-radio :value="2">高</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="目标类型" prop="tarType">
-          <!--          <el-input-->
-          <!--            v-model="formData.tarType"-->
-          <!--            placeholder="目标类型(0-全体 1-指定)"-->
-          <!--            clearable-->
-          <!--            @keyup.enter="handleQuery()"-->
-          <!--          />-->
-          <el-radio-group v-model="formData.tarType">
-            <el-radio :value="0">全体</el-radio>
-            <el-radio :value="1">指定</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="发布状态" prop="sendStatus">
-          <!--          <el-input-->
-          <!--            v-model="formData.sendStatus"-->
-          <!--            placeholder="发布状态(0-未发布 1已发布 2已撤回)"-->
-          <!--            clearable-->
-          <!--            @keyup.enter="handleQuery()"-->
-          <!--          />-->
-          <el-radio-group v-model="formData.sendStatus">
-            <el-radio :value="0">未发布</el-radio>
-            <el-radio :value="1">已发布</el-radio>
-            <el-radio :value="2">已撤回</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          v-if="formData.sendStatus === 1"
-          label="发布时间"
-          prop="sendTime"
+      <div style="max-height: calc(100vh - 200px)">
+        <el-form
+          ref="dataFormRef"
+          :model="formData"
+          :rules="rules"
+          label-width="100px"
         >
-          <el-date-picker
-            v-model="formData.sendTime"
-            type="datetime"
-            placeholder="发布时间"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-form-item>
-        <el-form-item
-          v-if="formData.sendStatus === 2"
-          label="撤回时间"
-          prop="recallTime"
-        >
-          <el-date-picker
-            v-model="formData.recallTime"
-            type="datetime"
-            placeholder="撤回时间"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </el-form-item>
-      </el-form>
+          <el-form-item label="通知标题" prop="title">
+            <el-input
+              v-model="formData.title"
+              placeholder="通知标题"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="通知内容" prop="content">
+            <editor v-model="formData.content" style="height: 500px" />
+          </el-form-item>
+          <el-form-item label="通知类型" prop="noticeType">
+            <el-input
+              v-model="formData.noticeType"
+              placeholder="通知类型"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="优先级" prop="priority">
+            <el-radio-group v-model="formData.priority">
+              <el-radio :value="0">低</el-radio>
+              <el-radio :value="1">中</el-radio>
+              <el-radio :value="2">高</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="目标类型" prop="tarType">
+            <el-radio-group v-model="formData.tarType">
+              <el-radio :value="0">全体</el-radio>
+              <el-radio :value="1">指定</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+      </div>
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleSubmit()">确定</el-button>
@@ -397,6 +268,7 @@ defineOptions({
   name: "Notice",
   inheritAttrs: false,
 });
+import Editor from "@/components/WangEditor/index.vue";
 
 import NoticeAPI, {
   NoticePageVO,
@@ -427,7 +299,6 @@ const dialog = reactive({
 
 // 通知公告表单数据
 const formData = reactive<NoticeForm>({
-  sendStatus: 0, // 默认状态为未发布
   priority: 0, // 默认优先级为低
   tarType: 0, // 默认目标类型为全体
 });
@@ -436,9 +307,6 @@ const formData = reactive<NoticeForm>({
 const rules = reactive({
   title: [{ required: true, message: "请输入通知标题", trigger: "blur" }],
   content: [{ required: true, message: "请输入通知内容", trigger: "blur" }],
-  // releaseBy: [{ required: true, message: "请输入发布人", trigger: "blur" }],
-  sendTime: [{ required: true, message: "请输入发布时间", trigger: "blur" }],
-  recallTime: [{ required: true, message: "请输入撤回时间", trigger: "blur" }],
 });
 
 /** 查询通知公告 */
@@ -479,6 +347,20 @@ function handleOpenDialog(id?: number) {
   }
 }
 
+function releaseNotice(id: number) {
+  NoticeAPI.releaseNotice(id).then((res) => {
+    ElMessage.success("发布成功");
+    handleQuery();
+  });
+}
+
+function recallNotice(id: number) {
+  NoticeAPI.recallNotice(id).then((res) => {
+    ElMessage.success("撤回成功");
+    handleQuery();
+  });
+}
+
 /** 提交通知公告表单 */
 function handleSubmit() {
   dataFormRef.value.validate((valid: any) => {