diff --git a/src/views/system/MenuNotifi/Notification.vue b/src/views/system/MenuNotifi/Notification.vue
index ded4201..5c65016 100644
--- a/src/views/system/MenuNotifi/Notification.vue
+++ b/src/views/system/MenuNotifi/Notification.vue
@@ -3,13 +3,29 @@
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="被通知人" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入被通知人" clearable @keyup.enter="handleQuery" />
+        <el-select v-model="queryParams.selectPoprle" multiple clearable placeholder="请选择被通知人">
+          <el-option v-for="item in selectPoprleList" :key="item.id" :label="item.peopleLabel" :value="item.id" />
+        </el-select>
       </el-form-item>
       <el-form-item label="通知状态" prop="infoStatic">
-        <el-input v-model="queryParams.infoStatic" placeholder="请选择通知状态" clearable @keyup.enter="handleQuery" />
+        <el-select v-model="queryParams.infoStatic" placeholder="请选择通知状态">
+          <el-option v-for="item in infoStaticList" :key="item.id" :label="item.staticLabel" :value="item.id" />
+        </el-select>
       </el-form-item>
-      <el-form-item label="年份" prop="year">
-        <el-date-picker type="year" v-model="queryParams.year" value-format="YYYY" placeholder="请选择日期"></el-date-picker>
+      <el-form-item label="消息状态" prop="messageStatic">
+        <el-select v-model="queryParams.messageStatic" placeholder="请选择消息状态">
+          <el-option v-for="item in messageStaticList" :key="item.id" :label="item.messageLabel" :value="item.id" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="日期" prop="date">
+        <el-date-picker
+          type="daterange"
+          v-model="queryParams.daterange"
+          value-format="YYYY"
+          placeholder="请选择日期"
+          start-placeholder="计划开始日期"
+          end-placeholder="计划结束日期"
+        ></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -26,10 +42,12 @@
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
       <el-table-column label="序号" type="index" width="55" />
-      <el-table-column label="日期" prop="date" />
-      <el-table-column label="污水厂名称" prop="name" />
-      <el-table-column label="进口BOD浓度(mg/L)" prop="unum" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="通知消息" prop="date" />
+      <el-table-column label="通知状态" prop="name" />
+      <el-table-column label="消息状态" prop="unum" />
+      <el-table-column label="更新日期" prop="createTime" />
+      <el-table-column label="被通知人" prop="createTime" />
+      <el-table-column label="发布人" prop="createTime" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['floodSys:jing:edit']">修改</el-button>
@@ -48,20 +66,16 @@
       @pagination="getDataList"
     />
 
-    <!-- 添加或修改弹窗 -->
+    <!-- 新增或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="160px" class="publicForm">
-        <el-form-item label="巡查日期" prop="month">
-          <el-date-picker
-            type="date"
-            v-model="formData.date"
-            format="YYYY-MM"
-            value-format="YYYY-MM"
-            placeholder="请选择日期"
-          ></el-date-picker>
+        <el-form-item label="被通知人" prop="month">
+          <el-select v-model="queryParams.selectPoprle" multiple clearable placeholder="请选择被通知人">
+            <el-option v-for="item in selectPoprleList" :key="item.id" :label="item.peopleLabel" :value="item.id" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="进口BOD浓度(mg/L)" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" placeholder="请输入进口BOD浓度(mg/L)" />
+        <el-form-item label="通知消息" prop="degist">
+          <el-input type="textarea" v-model="formData.degist" placeholder="请输入通知消息" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -74,8 +88,9 @@
   </div>
 </template>
 
-<script setup name="污水厂数据填报">
+<script setup name="项目通知填报">
 import { knowledgePage, knowledgeAdd, knowledgeDel, knowledgeDetail, knowledgeEdit } from '@/api/publicService/index';
+import { ref } from 'vue';
 
 const { proxy } = getCurrentInstance();
 const tableData = ref([
@@ -112,6 +127,8 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+    infoStatic: null, //通知状态
+    messageStatic: null, //消息状态
     title: undefined,
     typeId: undefined,
     year: proxy.moment().subtract('', 'year').format('YYYY'),
@@ -123,7 +140,26 @@
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
-
+const infoStaticList = ref([
+  {
+    id: 1,
+    staticLabel: '已完成',
+  },
+  {
+    id: 2,
+    staticLabel: '未完成',
+  },
+]);
+const messageStaticList = ref([
+  {
+    id: 1,
+    messageLabel: '已读',
+  },
+  {
+    id: 2,
+    messageLabel: '未读',
+  },
+]);
 /** 获取查询数据列表 */
 function getDataList() {
   tableLoading.value = true;
@@ -152,7 +188,7 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加污水厂数据';
+  dialogTitle.value = '新增项目通知';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
@@ -160,7 +196,7 @@
   // const postId = row.id;
   // knowledgeDetail(postId).then(response => {
   //   dialogShow.value = true;
-  //   dialogTitle.value = '修改污水厂数据';
+  dialogTitle.value = '修改项目通知';
   //   nextTick(() => {
   //     formData.value = response.data;
   //   });
@@ -170,7 +206,7 @@
 function submitForm() {
   proxy.$refs['formRef'].validate(valid => {
     if (valid) {
-      if (dialogTitle.value == '修改污水厂数据') {
+      if (dialogTitle.value == '修改项目通知') {
         knowledgeEdit(formData.value).then(response => {
           proxy.$modal.msgSuccess('修改成功');
           dialogShow.value = false;