diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 8edc76f..1c18713 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -21,7 +21,7 @@
           setToken(token);
           // 登录成功之后都加载对应路由
           permissionStore.generateRoutes();
-          router.push({ path: '/sponeScreen/chengguanweiScreen' });
+          router.push({ path: '/chengguanweiScreen' });
         } else {
           router.push('/door');
         }

diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 8edc76f..1c18713 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -21,7 +21,7 @@
           setToken(token);
           // 登录成功之后都加载对应路由
           permissionStore.generateRoutes();
-          router.push({ path: '/sponeScreen/chengguanweiScreen' });
+          router.push({ path: '/chengguanweiScreen' });
         } else {
           router.push('/door');
         }
diff --git a/src/views/door.vue b/src/views/door.vue
index e66873c..db8cd8f 100644
--- a/src/views/door.vue
+++ b/src/views/door.vue
@@ -13,7 +13,7 @@
       </div>
     </div>
     <!-- 底部二维码 -->
-    <!-- <div class="doorFooter">
+    <div class="doorFooter">
       <div class="footCon">
         <div class="part">
           <img src="https://www.pgyer.com/app/qrcode/bp0qZc" alt="安卓APP扫码" />
@@ -24,7 +24,7 @@
           <p>微信公众号关注</p>
         </div>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -77,7 +77,7 @@
   }
   .middle {
     width: 100%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 350px);
     // background: red;
     .loginPages {
       position: absolute;
@@ -93,8 +93,9 @@
     // background: yellow;
     display: flex;
     justify-content: center;
+
     .footCon {
-      width: 50%;
+      width: 20%;
       display: flex;
       justify-content: space-evenly;
       align-items: center;
@@ -105,14 +106,19 @@
       font-weight: 400;
       // background: red;
       .part {
+        width: 100px;
+        height: 120px;
+        background: rgba(47, 147, 250, 0.5);
+        text-align: center;
+
         img {
           width: 90px;
           height: 90px;
           border-radius: 10px;
+          margin-top: 6px;
         }
         p {
           text-align: center;
-          margin-top: 6px;
         }
       }
     }

diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 8edc76f..1c18713 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -21,7 +21,7 @@
           setToken(token);
           // 登录成功之后都加载对应路由
           permissionStore.generateRoutes();
-          router.push({ path: '/sponeScreen/chengguanweiScreen' });
+          router.push({ path: '/chengguanweiScreen' });
         } else {
           router.push('/door');
         }
diff --git a/src/views/door.vue b/src/views/door.vue
index e66873c..db8cd8f 100644
--- a/src/views/door.vue
+++ b/src/views/door.vue
@@ -13,7 +13,7 @@
       </div>
     </div>
     <!-- 底部二维码 -->
-    <!-- <div class="doorFooter">
+    <div class="doorFooter">
       <div class="footCon">
         <div class="part">
           <img src="https://www.pgyer.com/app/qrcode/bp0qZc" alt="安卓APP扫码" />
@@ -24,7 +24,7 @@
           <p>微信公众号关注</p>
         </div>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -77,7 +77,7 @@
   }
   .middle {
     width: 100%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 350px);
     // background: red;
     .loginPages {
       position: absolute;
@@ -93,8 +93,9 @@
     // background: yellow;
     display: flex;
     justify-content: center;
+
     .footCon {
-      width: 50%;
+      width: 20%;
       display: flex;
       justify-content: space-evenly;
       align-items: center;
@@ -105,14 +106,19 @@
       font-weight: 400;
       // background: red;
       .part {
+        width: 100px;
+        height: 120px;
+        background: rgba(47, 147, 250, 0.5);
+        text-align: center;
+
         img {
           width: 90px;
           height: 90px;
           border-radius: 10px;
+          margin-top: 6px;
         }
         p {
           text-align: center;
-          margin-top: 6px;
         }
       }
     }
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index f07dde5..4231a40 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="政策法规名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入政策法规名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,19 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="政策法规名称" prop="title" />
+      <el-table-column label="政策法规内容" prop="degist" />
+      <el-table-column label="跳转链接" prop="createBy" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <ImagePreview
+          <!-- <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview>
+          ></ImagePreview> -->
         </template>
       </el-table-column>
-      <el-table-column label="政策法规标题" prop="title" />
-      <el-table-column label="政策法规简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <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>
@@ -53,25 +53,47 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="政策法规主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="政策法规简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="政策法规内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="政策法规名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入政策法规名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入政策法规内容"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +141,13 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -149,53 +172,52 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改政策法规';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改政策法规';
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改政策法规';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改政策法规') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改政策法规') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });

diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 8edc76f..1c18713 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -21,7 +21,7 @@
           setToken(token);
           // 登录成功之后都加载对应路由
           permissionStore.generateRoutes();
-          router.push({ path: '/sponeScreen/chengguanweiScreen' });
+          router.push({ path: '/chengguanweiScreen' });
         } else {
           router.push('/door');
         }
diff --git a/src/views/door.vue b/src/views/door.vue
index e66873c..db8cd8f 100644
--- a/src/views/door.vue
+++ b/src/views/door.vue
@@ -13,7 +13,7 @@
       </div>
     </div>
     <!-- 底部二维码 -->
-    <!-- <div class="doorFooter">
+    <div class="doorFooter">
       <div class="footCon">
         <div class="part">
           <img src="https://www.pgyer.com/app/qrcode/bp0qZc" alt="安卓APP扫码" />
@@ -24,7 +24,7 @@
           <p>微信公众号关注</p>
         </div>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -77,7 +77,7 @@
   }
   .middle {
     width: 100%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 350px);
     // background: red;
     .loginPages {
       position: absolute;
@@ -93,8 +93,9 @@
     // background: yellow;
     display: flex;
     justify-content: center;
+
     .footCon {
-      width: 50%;
+      width: 20%;
       display: flex;
       justify-content: space-evenly;
       align-items: center;
@@ -105,14 +106,19 @@
       font-weight: 400;
       // background: red;
       .part {
+        width: 100px;
+        height: 120px;
+        background: rgba(47, 147, 250, 0.5);
+        text-align: center;
+
         img {
           width: 90px;
           height: 90px;
           border-radius: 10px;
+          margin-top: 6px;
         }
         p {
           text-align: center;
-          margin-top: 6px;
         }
       }
     }
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index f07dde5..4231a40 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="政策法规名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入政策法规名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,19 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="政策法规名称" prop="title" />
+      <el-table-column label="政策法规内容" prop="degist" />
+      <el-table-column label="跳转链接" prop="createBy" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <ImagePreview
+          <!-- <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview>
+          ></ImagePreview> -->
         </template>
       </el-table-column>
-      <el-table-column label="政策法规标题" prop="title" />
-      <el-table-column label="政策法规简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <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>
@@ -53,25 +53,47 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="政策法规主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="政策法规简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="政策法规内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="政策法规名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入政策法规名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入政策法规内容"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +141,13 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -149,53 +172,52 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改政策法规';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改政策法规';
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改政策法规';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改政策法规') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改政策法规') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index e087ab3..f767b34 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="通知公告名称:" prop="title" style="width: 250px">
+        <el-input v-model="queryParams.title" placeholder="请输入通知公告名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,10 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
-        <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
-        </template>
-      </el-table-column>
-      <el-table-column label="公告标题" prop="title" />
-      <el-table-column label="公告简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="发布日期" prop="time" />
+      <el-table-column label="通知公告名称" prop="title" />
+      <el-table-column label="通知内容" prop="title1" />
+      <el-table-column label="跳转链接" prop="createBy" />>
       <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>
@@ -54,24 +45,31 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="公告主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="公告简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="公告内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="createBy1">
+              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="通知公告名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="通知内容:" prop="emergencyMeasure">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +117,18 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableData.value = [
+    {
+      title: '123',
+    },
+  ];
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -145,57 +149,57 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加通知公告';
+  dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改通知公告';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改通知公告';
+  formData.value = row;
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改通知公告';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改通知公告') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改通知公告') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });

diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 8edc76f..1c18713 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -21,7 +21,7 @@
           setToken(token);
           // 登录成功之后都加载对应路由
           permissionStore.generateRoutes();
-          router.push({ path: '/sponeScreen/chengguanweiScreen' });
+          router.push({ path: '/chengguanweiScreen' });
         } else {
           router.push('/door');
         }
diff --git a/src/views/door.vue b/src/views/door.vue
index e66873c..db8cd8f 100644
--- a/src/views/door.vue
+++ b/src/views/door.vue
@@ -13,7 +13,7 @@
       </div>
     </div>
     <!-- 底部二维码 -->
-    <!-- <div class="doorFooter">
+    <div class="doorFooter">
       <div class="footCon">
         <div class="part">
           <img src="https://www.pgyer.com/app/qrcode/bp0qZc" alt="安卓APP扫码" />
@@ -24,7 +24,7 @@
           <p>微信公众号关注</p>
         </div>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -77,7 +77,7 @@
   }
   .middle {
     width: 100%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 350px);
     // background: red;
     .loginPages {
       position: absolute;
@@ -93,8 +93,9 @@
     // background: yellow;
     display: flex;
     justify-content: center;
+
     .footCon {
-      width: 50%;
+      width: 20%;
       display: flex;
       justify-content: space-evenly;
       align-items: center;
@@ -105,14 +106,19 @@
       font-weight: 400;
       // background: red;
       .part {
+        width: 100px;
+        height: 120px;
+        background: rgba(47, 147, 250, 0.5);
+        text-align: center;
+
         img {
           width: 90px;
           height: 90px;
           border-radius: 10px;
+          margin-top: 6px;
         }
         p {
           text-align: center;
-          margin-top: 6px;
         }
       }
     }
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index f07dde5..4231a40 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="政策法规名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入政策法规名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,19 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="政策法规名称" prop="title" />
+      <el-table-column label="政策法规内容" prop="degist" />
+      <el-table-column label="跳转链接" prop="createBy" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <ImagePreview
+          <!-- <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview>
+          ></ImagePreview> -->
         </template>
       </el-table-column>
-      <el-table-column label="政策法规标题" prop="title" />
-      <el-table-column label="政策法规简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <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>
@@ -53,25 +53,47 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="政策法规主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="政策法规简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="政策法规内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="政策法规名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入政策法规名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入政策法规内容"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +141,13 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -149,53 +172,52 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改政策法规';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改政策法规';
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改政策法规';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改政策法规') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改政策法规') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index e087ab3..f767b34 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="通知公告名称:" prop="title" style="width: 250px">
+        <el-input v-model="queryParams.title" placeholder="请输入通知公告名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,10 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
-        <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
-        </template>
-      </el-table-column>
-      <el-table-column label="公告标题" prop="title" />
-      <el-table-column label="公告简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="发布日期" prop="time" />
+      <el-table-column label="通知公告名称" prop="title" />
+      <el-table-column label="通知内容" prop="title1" />
+      <el-table-column label="跳转链接" prop="createBy" />>
       <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>
@@ -54,24 +45,31 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="公告主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="公告简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="公告内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="createBy1">
+              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="通知公告名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="通知内容:" prop="emergencyMeasure">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +117,18 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableData.value = [
+    {
+      title: '123',
+    },
+  ];
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -145,57 +149,57 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加通知公告';
+  dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改通知公告';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改通知公告';
+  formData.value = row;
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改通知公告';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改通知公告') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改通知公告') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index e99828e..aa18bdd 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -3,7 +3,7 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="问卷主题" prop="topicName">
+      <el-form-item label="问卷调查名称" prop="topicName">
         <el-input v-model="queryParams.topicName" placeholder="请输入" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="调查状态" prop="adjustmentStatus">
@@ -25,19 +25,12 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="700">
-      <el-table-column label="调查问卷主题" prop="topicName" />
-      <el-table-column label="调查状态" prop="adjustmentStatus">
-        <template #default="scope">
-          <dict-tag :options="statusList" :value="scope.row.adjustmentStatus" />
-        </template>
-      </el-table-column>
+      <el-table-column label="调查问卷调查名称" prop="topicName" />
       <el-table-column label="问卷状态" prop="ifStart">
         <template #default="scope">
           <span :class="scope.row.ifStart == 1 ? 'green' : 'red'">{{ scope.row.ifStart == 1 ? '启用' : '未启用' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调查年份" prop="year" />
-      <el-table-column label="创建人" prop="createBy" />
       <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -73,7 +66,7 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="问卷主题" prop="topicName">
+        <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
         <el-form-item label="年份选择" prop="year">

diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 8edc76f..1c18713 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -21,7 +21,7 @@
           setToken(token);
           // 登录成功之后都加载对应路由
           permissionStore.generateRoutes();
-          router.push({ path: '/sponeScreen/chengguanweiScreen' });
+          router.push({ path: '/chengguanweiScreen' });
         } else {
           router.push('/door');
         }
diff --git a/src/views/door.vue b/src/views/door.vue
index e66873c..db8cd8f 100644
--- a/src/views/door.vue
+++ b/src/views/door.vue
@@ -13,7 +13,7 @@
       </div>
     </div>
     <!-- 底部二维码 -->
-    <!-- <div class="doorFooter">
+    <div class="doorFooter">
       <div class="footCon">
         <div class="part">
           <img src="https://www.pgyer.com/app/qrcode/bp0qZc" alt="安卓APP扫码" />
@@ -24,7 +24,7 @@
           <p>微信公众号关注</p>
         </div>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -77,7 +77,7 @@
   }
   .middle {
     width: 100%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 350px);
     // background: red;
     .loginPages {
       position: absolute;
@@ -93,8 +93,9 @@
     // background: yellow;
     display: flex;
     justify-content: center;
+
     .footCon {
-      width: 50%;
+      width: 20%;
       display: flex;
       justify-content: space-evenly;
       align-items: center;
@@ -105,14 +106,19 @@
       font-weight: 400;
       // background: red;
       .part {
+        width: 100px;
+        height: 120px;
+        background: rgba(47, 147, 250, 0.5);
+        text-align: center;
+
         img {
           width: 90px;
           height: 90px;
           border-radius: 10px;
+          margin-top: 6px;
         }
         p {
           text-align: center;
-          margin-top: 6px;
         }
       }
     }
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index f07dde5..4231a40 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="政策法规名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入政策法规名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,19 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="政策法规名称" prop="title" />
+      <el-table-column label="政策法规内容" prop="degist" />
+      <el-table-column label="跳转链接" prop="createBy" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <ImagePreview
+          <!-- <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview>
+          ></ImagePreview> -->
         </template>
       </el-table-column>
-      <el-table-column label="政策法规标题" prop="title" />
-      <el-table-column label="政策法规简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <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>
@@ -53,25 +53,47 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="政策法规主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="政策法规简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="政策法规内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="政策法规名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入政策法规名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入政策法规内容"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +141,13 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -149,53 +172,52 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改政策法规';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改政策法规';
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改政策法规';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改政策法规') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改政策法规') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index e087ab3..f767b34 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="通知公告名称:" prop="title" style="width: 250px">
+        <el-input v-model="queryParams.title" placeholder="请输入通知公告名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,10 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
-        <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
-        </template>
-      </el-table-column>
-      <el-table-column label="公告标题" prop="title" />
-      <el-table-column label="公告简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="发布日期" prop="time" />
+      <el-table-column label="通知公告名称" prop="title" />
+      <el-table-column label="通知内容" prop="title1" />
+      <el-table-column label="跳转链接" prop="createBy" />>
       <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>
@@ -54,24 +45,31 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="公告主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="公告简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="公告内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="createBy1">
+              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="通知公告名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="通知内容:" prop="emergencyMeasure">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +117,18 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableData.value = [
+    {
+      title: '123',
+    },
+  ];
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -145,57 +149,57 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加通知公告';
+  dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改通知公告';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改通知公告';
+  formData.value = row;
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改通知公告';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改通知公告') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改通知公告') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index e99828e..aa18bdd 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -3,7 +3,7 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="问卷主题" prop="topicName">
+      <el-form-item label="问卷调查名称" prop="topicName">
         <el-input v-model="queryParams.topicName" placeholder="请输入" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="调查状态" prop="adjustmentStatus">
@@ -25,19 +25,12 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="700">
-      <el-table-column label="调查问卷主题" prop="topicName" />
-      <el-table-column label="调查状态" prop="adjustmentStatus">
-        <template #default="scope">
-          <dict-tag :options="statusList" :value="scope.row.adjustmentStatus" />
-        </template>
-      </el-table-column>
+      <el-table-column label="调查问卷调查名称" prop="topicName" />
       <el-table-column label="问卷状态" prop="ifStart">
         <template #default="scope">
           <span :class="scope.row.ifStart == 1 ? 'green' : 'red'">{{ scope.row.ifStart == 1 ? '启用' : '未启用' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调查年份" prop="year" />
-      <el-table-column label="创建人" prop="createBy" />
       <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -73,7 +66,7 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="问卷主题" prop="topicName">
+        <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
         <el-form-item label="年份选择" prop="year">
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index 83ecffe..78491f7 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -3,11 +3,14 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="板块位置" prop="platePosition">
-        <el-select v-model="queryParams.platePosition" placeholder="请选择" clearable>
-          <el-option v-for="item in ywType" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
+      <el-form-item label="培训宣传名称" prop="platePosition">
+        <el-input v-model="queryParams.road" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
       </el-form-item>
+
+      <el-form-item style="width: 150px">
+        <el-date-picker type="year" v-model="dateYear" value-format="YYYY" placeholder="请选择年" style="width: 100%"></el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
@@ -22,7 +25,12 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
+      <el-table-column label="日期" prop="createBy1" />
+      <el-table-column label="培训地点" prop="createTime" />
+      <el-table-column label="培训宣传标题" prop="createBy" />
+      <el-table-column label="参加人员" prop="createTime" />
+      <el-table-column label="跳转链接" prop="linkUrl" />
+      <!-- <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
           <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
@@ -30,20 +38,8 @@
             :height="50"
           ></ImagePreview>
         </template>
-      </el-table-column>
-      <el-table-column label="链接类别" prop="linkType">
-        <template #default="scope">
-          <dict-tag :options="lianjType" :value="scope.row.linkType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="板块位置" prop="platePosition">
-        <template #default="scope">
-          <dict-tag :options="ywType" :value="scope.row.platePosition" />
-        </template>
-      </el-table-column>
-      <el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
+      </el-table-column> -->
+
       <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>
@@ -54,39 +50,73 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination
+    <!-- <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getDataList"
-    />
+    /> -->
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="180px" class="publicForm">
-        <el-form-item label="板块位置" prop="platePosition">
-          <el-select v-model="formData.platePosition" placeholder="请选择" clearable>
-            <el-option v-for="item in ywType" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="链接类别" prop="linkType">
-          <el-select v-model="formData.linkType" placeholder="请选择" clearable>
-            <el-option v-for="item in lianjType" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="跳转链接" prop="linkUrl">
-          <el-input v-model="formData.linkUrl" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="封面图(750*300px)" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="110px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训日期:" prop="createBy1">
+              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="培训地点:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入培训地点" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训宣传名称:" prop="road">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入培训宣传名称"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="参加人员:" prop="emergencyMeasure">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入参加人员" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训内容:" prop="road">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入培训内容" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接" prop="linkUrl">
+              <el-input v-model="formData.linkUrl" controls-position="right" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -101,8 +131,8 @@
 <script setup name="专题导航">
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
-
 const { proxy } = getCurrentInstance();
+const dateYear = ref(proxy.moment(new Date()).format('YYYY'));
 
 const tableData = ref([]);
 const tableLoading = ref(true);
@@ -131,23 +161,16 @@
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
-const ywType = [
-  { label: '横幅', value: 'banner' },
-  { label: '轮播图', value: 'rotation' },
-];
-const lianjType = [
-  { label: '内链', value: 'innerside' },
-  { label: '外链', value: 'outside' },
-];
-
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  specialNavPage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  // tableLoading.value = true;
+  // specialNavPage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
+  tableLoading.value = false;
+  tableData.value = [{ createBy1: '2024-07-02' }];
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -156,8 +179,8 @@
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getDataList();
+  // queryParams.value.pageNum = 1;
+  // getDataList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -169,52 +192,55 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加专题导航';
+  dialogTitle.value = '新增培训宣传';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  specialNavDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改专题导航';
-    setTimeout(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改培训宣传';
+  formData.value = row;
+  // specialNavDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改专题导航';
+  //   setTimeout(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改专题导航') {
-        specialNavEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        specialNavAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改专题导航') {
+  //       specialNavEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       specialNavAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return specialNavDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return specialNavDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
 
 onMounted(() => {

diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 8edc76f..1c18713 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -21,7 +21,7 @@
           setToken(token);
           // 登录成功之后都加载对应路由
           permissionStore.generateRoutes();
-          router.push({ path: '/sponeScreen/chengguanweiScreen' });
+          router.push({ path: '/chengguanweiScreen' });
         } else {
           router.push('/door');
         }
diff --git a/src/views/door.vue b/src/views/door.vue
index e66873c..db8cd8f 100644
--- a/src/views/door.vue
+++ b/src/views/door.vue
@@ -13,7 +13,7 @@
       </div>
     </div>
     <!-- 底部二维码 -->
-    <!-- <div class="doorFooter">
+    <div class="doorFooter">
       <div class="footCon">
         <div class="part">
           <img src="https://www.pgyer.com/app/qrcode/bp0qZc" alt="安卓APP扫码" />
@@ -24,7 +24,7 @@
           <p>微信公众号关注</p>
         </div>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -77,7 +77,7 @@
   }
   .middle {
     width: 100%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 350px);
     // background: red;
     .loginPages {
       position: absolute;
@@ -93,8 +93,9 @@
     // background: yellow;
     display: flex;
     justify-content: center;
+
     .footCon {
-      width: 50%;
+      width: 20%;
       display: flex;
       justify-content: space-evenly;
       align-items: center;
@@ -105,14 +106,19 @@
       font-weight: 400;
       // background: red;
       .part {
+        width: 100px;
+        height: 120px;
+        background: rgba(47, 147, 250, 0.5);
+        text-align: center;
+
         img {
           width: 90px;
           height: 90px;
           border-radius: 10px;
+          margin-top: 6px;
         }
         p {
           text-align: center;
-          margin-top: 6px;
         }
       }
     }
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index f07dde5..4231a40 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="政策法规名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入政策法规名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,19 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="政策法规名称" prop="title" />
+      <el-table-column label="政策法规内容" prop="degist" />
+      <el-table-column label="跳转链接" prop="createBy" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <ImagePreview
+          <!-- <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview>
+          ></ImagePreview> -->
         </template>
       </el-table-column>
-      <el-table-column label="政策法规标题" prop="title" />
-      <el-table-column label="政策法规简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <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>
@@ -53,25 +53,47 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="政策法规主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="政策法规简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="政策法规内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="政策法规名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入政策法规名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入政策法规内容"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +141,13 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -149,53 +172,52 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改政策法规';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改政策法规';
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改政策法规';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改政策法规') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改政策法规') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index e087ab3..f767b34 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="通知公告名称:" prop="title" style="width: 250px">
+        <el-input v-model="queryParams.title" placeholder="请输入通知公告名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,10 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
-        <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
-        </template>
-      </el-table-column>
-      <el-table-column label="公告标题" prop="title" />
-      <el-table-column label="公告简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="发布日期" prop="time" />
+      <el-table-column label="通知公告名称" prop="title" />
+      <el-table-column label="通知内容" prop="title1" />
+      <el-table-column label="跳转链接" prop="createBy" />>
       <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>
@@ -54,24 +45,31 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="公告主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="公告简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="公告内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="createBy1">
+              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="通知公告名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="通知内容:" prop="emergencyMeasure">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +117,18 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableData.value = [
+    {
+      title: '123',
+    },
+  ];
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -145,57 +149,57 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加通知公告';
+  dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改通知公告';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改通知公告';
+  formData.value = row;
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改通知公告';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改通知公告') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改通知公告') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index e99828e..aa18bdd 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -3,7 +3,7 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="问卷主题" prop="topicName">
+      <el-form-item label="问卷调查名称" prop="topicName">
         <el-input v-model="queryParams.topicName" placeholder="请输入" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="调查状态" prop="adjustmentStatus">
@@ -25,19 +25,12 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="700">
-      <el-table-column label="调查问卷主题" prop="topicName" />
-      <el-table-column label="调查状态" prop="adjustmentStatus">
-        <template #default="scope">
-          <dict-tag :options="statusList" :value="scope.row.adjustmentStatus" />
-        </template>
-      </el-table-column>
+      <el-table-column label="调查问卷调查名称" prop="topicName" />
       <el-table-column label="问卷状态" prop="ifStart">
         <template #default="scope">
           <span :class="scope.row.ifStart == 1 ? 'green' : 'red'">{{ scope.row.ifStart == 1 ? '启用' : '未启用' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调查年份" prop="year" />
-      <el-table-column label="创建人" prop="createBy" />
       <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -73,7 +66,7 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="问卷主题" prop="topicName">
+        <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
         <el-form-item label="年份选择" prop="year">
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index 83ecffe..78491f7 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -3,11 +3,14 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="板块位置" prop="platePosition">
-        <el-select v-model="queryParams.platePosition" placeholder="请选择" clearable>
-          <el-option v-for="item in ywType" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
+      <el-form-item label="培训宣传名称" prop="platePosition">
+        <el-input v-model="queryParams.road" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
       </el-form-item>
+
+      <el-form-item style="width: 150px">
+        <el-date-picker type="year" v-model="dateYear" value-format="YYYY" placeholder="请选择年" style="width: 100%"></el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
@@ -22,7 +25,12 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
+      <el-table-column label="日期" prop="createBy1" />
+      <el-table-column label="培训地点" prop="createTime" />
+      <el-table-column label="培训宣传标题" prop="createBy" />
+      <el-table-column label="参加人员" prop="createTime" />
+      <el-table-column label="跳转链接" prop="linkUrl" />
+      <!-- <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
           <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
@@ -30,20 +38,8 @@
             :height="50"
           ></ImagePreview>
         </template>
-      </el-table-column>
-      <el-table-column label="链接类别" prop="linkType">
-        <template #default="scope">
-          <dict-tag :options="lianjType" :value="scope.row.linkType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="板块位置" prop="platePosition">
-        <template #default="scope">
-          <dict-tag :options="ywType" :value="scope.row.platePosition" />
-        </template>
-      </el-table-column>
-      <el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
+      </el-table-column> -->
+
       <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>
@@ -54,39 +50,73 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination
+    <!-- <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getDataList"
-    />
+    /> -->
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="180px" class="publicForm">
-        <el-form-item label="板块位置" prop="platePosition">
-          <el-select v-model="formData.platePosition" placeholder="请选择" clearable>
-            <el-option v-for="item in ywType" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="链接类别" prop="linkType">
-          <el-select v-model="formData.linkType" placeholder="请选择" clearable>
-            <el-option v-for="item in lianjType" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="跳转链接" prop="linkUrl">
-          <el-input v-model="formData.linkUrl" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="封面图(750*300px)" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="110px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训日期:" prop="createBy1">
+              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="培训地点:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入培训地点" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训宣传名称:" prop="road">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入培训宣传名称"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="参加人员:" prop="emergencyMeasure">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入参加人员" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训内容:" prop="road">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入培训内容" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接" prop="linkUrl">
+              <el-input v-model="formData.linkUrl" controls-position="right" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -101,8 +131,8 @@
 <script setup name="专题导航">
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
-
 const { proxy } = getCurrentInstance();
+const dateYear = ref(proxy.moment(new Date()).format('YYYY'));
 
 const tableData = ref([]);
 const tableLoading = ref(true);
@@ -131,23 +161,16 @@
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
-const ywType = [
-  { label: '横幅', value: 'banner' },
-  { label: '轮播图', value: 'rotation' },
-];
-const lianjType = [
-  { label: '内链', value: 'innerside' },
-  { label: '外链', value: 'outside' },
-];
-
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  specialNavPage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  // tableLoading.value = true;
+  // specialNavPage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
+  tableLoading.value = false;
+  tableData.value = [{ createBy1: '2024-07-02' }];
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -156,8 +179,8 @@
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getDataList();
+  // queryParams.value.pageNum = 1;
+  // getDataList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -169,52 +192,55 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加专题导航';
+  dialogTitle.value = '新增培训宣传';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  specialNavDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改专题导航';
-    setTimeout(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改培训宣传';
+  formData.value = row;
+  // specialNavDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改专题导航';
+  //   setTimeout(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改专题导航') {
-        specialNavEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        specialNavAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改专题导航') {
+  //       specialNavEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       specialNavAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return specialNavDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return specialNavDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
 
 onMounted(() => {
diff --git a/src/views/publicService/technical.vue b/src/views/publicService/technical.vue
index 68a1f4a..fed5c27 100644
--- a/src/views/publicService/technical.vue
+++ b/src/views/publicService/technical.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="技术标准名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入技术标准名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,19 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
-        <template #default="scope">
+      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="技术标准名称" prop="title" />
+      <el-table-column label="技术标准内容" prop="degist" />
+      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="封面缩略图" prop="coverPhotosFileList">
+        <!-- <template #default="scope">
           <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
           ></ImagePreview>
-        </template>
+        </template> -->
       </el-table-column>
-      <el-table-column label="技术标准标题" prop="title" />
-      <el-table-column label="技术标准简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <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>
@@ -53,11 +53,20 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="技术标准主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="技术标准名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入技术标准名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-form-item label="缩略图" prop="coverPhotosFileList">
           <ImageFileUpload
             :limit="1"
             :saveFileArr="formData.coverPhotosFileList"
@@ -65,13 +74,7 @@
             :refType="'public_special_navigation_config'"
             :refField="'coverPhotos'"
           ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="技术标准简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="技术标准内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +122,14 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableData.value = [{ createTime: '2024-07-02', title: '123' }];
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -143,59 +148,58 @@
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加技术标准';
+  dialogTitle.value = '新增技术标准';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改技术标准';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改技术标准';
+  formData.value = { ...row };
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改技术标准';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改技术标准') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改技术标准') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });

diff --git a/src/views/autoLogin/index.vue b/src/views/autoLogin/index.vue
index 8edc76f..1c18713 100644
--- a/src/views/autoLogin/index.vue
+++ b/src/views/autoLogin/index.vue
@@ -21,7 +21,7 @@
           setToken(token);
           // 登录成功之后都加载对应路由
           permissionStore.generateRoutes();
-          router.push({ path: '/sponeScreen/chengguanweiScreen' });
+          router.push({ path: '/chengguanweiScreen' });
         } else {
           router.push('/door');
         }
diff --git a/src/views/door.vue b/src/views/door.vue
index e66873c..db8cd8f 100644
--- a/src/views/door.vue
+++ b/src/views/door.vue
@@ -13,7 +13,7 @@
       </div>
     </div>
     <!-- 底部二维码 -->
-    <!-- <div class="doorFooter">
+    <div class="doorFooter">
       <div class="footCon">
         <div class="part">
           <img src="https://www.pgyer.com/app/qrcode/bp0qZc" alt="安卓APP扫码" />
@@ -24,7 +24,7 @@
           <p>微信公众号关注</p>
         </div>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 
@@ -77,7 +77,7 @@
   }
   .middle {
     width: 100%;
-    height: calc(100vh - 250px);
+    height: calc(100vh - 350px);
     // background: red;
     .loginPages {
       position: absolute;
@@ -93,8 +93,9 @@
     // background: yellow;
     display: flex;
     justify-content: center;
+
     .footCon {
-      width: 50%;
+      width: 20%;
       display: flex;
       justify-content: space-evenly;
       align-items: center;
@@ -105,14 +106,19 @@
       font-weight: 400;
       // background: red;
       .part {
+        width: 100px;
+        height: 120px;
+        background: rgba(47, 147, 250, 0.5);
+        text-align: center;
+
         img {
           width: 90px;
           height: 90px;
           border-radius: 10px;
+          margin-top: 6px;
         }
         p {
           text-align: center;
-          margin-top: 6px;
         }
       }
     }
diff --git a/src/views/publicService/lawRule.vue b/src/views/publicService/lawRule.vue
index f07dde5..4231a40 100644
--- a/src/views/publicService/lawRule.vue
+++ b/src/views/publicService/lawRule.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="政策法规名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入政策法规名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,19 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
+      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="政策法规名称" prop="title" />
+      <el-table-column label="政策法规内容" prop="degist" />
+      <el-table-column label="跳转链接" prop="createBy" />
       <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
-          <ImagePreview
+          <!-- <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
-          ></ImagePreview>
+          ></ImagePreview> -->
         </template>
       </el-table-column>
-      <el-table-column label="政策法规标题" prop="title" />
-      <el-table-column label="政策法规简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <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>
@@ -53,25 +53,47 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="政策法规主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="政策法规简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="政策法规内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="政策法规名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入政策法规名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="20">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="政策法规内容:" prop="emergencyMeasure">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入政策法规内容"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +141,13 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -149,53 +172,52 @@
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改政策法规';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改政策法规';
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改政策法规';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改政策法规') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改政策法规') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/notices.vue b/src/views/publicService/notices.vue
index e087ab3..f767b34 100644
--- a/src/views/publicService/notices.vue
+++ b/src/views/publicService/notices.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="通知公告名称:" prop="title" style="width: 250px">
+        <el-input v-model="queryParams.title" placeholder="请输入通知公告名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,10 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
-        <template #default="scope">
-          <ImagePreview
-            :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
-            :width="50"
-            :height="50"
-          ></ImagePreview>
-        </template>
-      </el-table-column>
-      <el-table-column label="公告标题" prop="title" />
-      <el-table-column label="公告简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
+      <el-table-column label="发布日期" prop="time" />
+      <el-table-column label="通知公告名称" prop="title" />
+      <el-table-column label="通知内容" prop="title1" />
+      <el-table-column label="跳转链接" prop="createBy" />>
       <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>
@@ -54,24 +45,31 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="公告主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="公告简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="公告内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="发布日期:" prop="createBy1">
+              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择发布日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="通知公告名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入通知公告名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="通知内容:" prop="emergencyMeasure">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入通知内容" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +117,18 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableData.value = [
+    {
+      title: '123',
+    },
+  ];
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -145,57 +149,57 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加通知公告';
+  dialogTitle.value = '新增通知公告';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改通知公告';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改通知公告';
+  formData.value = row;
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改通知公告';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改通知公告') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改通知公告') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/publicService/quesNaire.vue b/src/views/publicService/quesNaire.vue
index e99828e..aa18bdd 100644
--- a/src/views/publicService/quesNaire.vue
+++ b/src/views/publicService/quesNaire.vue
@@ -3,7 +3,7 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="问卷主题" prop="topicName">
+      <el-form-item label="问卷调查名称" prop="topicName">
         <el-input v-model="queryParams.topicName" placeholder="请输入" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="调查状态" prop="adjustmentStatus">
@@ -25,19 +25,12 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="700">
-      <el-table-column label="调查问卷主题" prop="topicName" />
-      <el-table-column label="调查状态" prop="adjustmentStatus">
-        <template #default="scope">
-          <dict-tag :options="statusList" :value="scope.row.adjustmentStatus" />
-        </template>
-      </el-table-column>
+      <el-table-column label="调查问卷调查名称" prop="topicName" />
       <el-table-column label="问卷状态" prop="ifStart">
         <template #default="scope">
           <span :class="scope.row.ifStart == 1 ? 'green' : 'red'">{{ scope.row.ifStart == 1 ? '启用' : '未启用' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="调查年份" prop="year" />
-      <el-table-column label="创建人" prop="createBy" />
       <el-table-column label="创建时间" prop="createTime" />
       <el-table-column label="操作" width="160" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -73,7 +66,7 @@
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
       <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="问卷主题" prop="topicName">
+        <el-form-item label="问卷调查名称" prop="topicName">
           <el-input v-model="formData.topicName" />
         </el-form-item>
         <el-form-item label="年份选择" prop="year">
diff --git a/src/views/publicService/special.vue b/src/views/publicService/special.vue
index 83ecffe..78491f7 100644
--- a/src/views/publicService/special.vue
+++ b/src/views/publicService/special.vue
@@ -3,11 +3,14 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="板块位置" prop="platePosition">
-        <el-select v-model="queryParams.platePosition" placeholder="请选择" clearable>
-          <el-option v-for="item in ywType" :key="item.value" :label="item.label" :value="item.value" />
-        </el-select>
+      <el-form-item label="培训宣传名称" prop="platePosition">
+        <el-input v-model="queryParams.road" placeholder="请输入培训宣传名称" clearable style="width: 150px" />
       </el-form-item>
+
+      <el-form-item style="width: 150px">
+        <el-date-picker type="year" v-model="dateYear" value-format="YYYY" placeholder="请选择年" style="width: 100%"></el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button type="success" icon="Refresh" @click="resetQuery">重置</el-button>
@@ -22,7 +25,12 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
+      <el-table-column label="日期" prop="createBy1" />
+      <el-table-column label="培训地点" prop="createTime" />
+      <el-table-column label="培训宣传标题" prop="createBy" />
+      <el-table-column label="参加人员" prop="createTime" />
+      <el-table-column label="跳转链接" prop="linkUrl" />
+      <!-- <el-table-column label="封面图" prop="coverPhotosFileList">
         <template #default="scope">
           <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
@@ -30,20 +38,8 @@
             :height="50"
           ></ImagePreview>
         </template>
-      </el-table-column>
-      <el-table-column label="链接类别" prop="linkType">
-        <template #default="scope">
-          <dict-tag :options="lianjType" :value="scope.row.linkType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="跳转链接" prop="linkUrl" />
-      <el-table-column label="板块位置" prop="platePosition">
-        <template #default="scope">
-          <dict-tag :options="ywType" :value="scope.row.platePosition" />
-        </template>
-      </el-table-column>
-      <el-table-column label="创建人" prop="createBy" />
-      <el-table-column label="创建时间" prop="createTime" />
+      </el-table-column> -->
+
       <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>
@@ -54,39 +50,73 @@
       </el-table-column>
     </el-table>
     <!-- 分页 -->
-    <pagination
+    <!-- <pagination
       v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getDataList"
-    />
+    /> -->
 
     <!-- 添加或修改弹窗 -->
-    <el-dialog :title="dialogTitle" v-model="dialogShow" width="600px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="180px" class="publicForm">
-        <el-form-item label="板块位置" prop="platePosition">
-          <el-select v-model="formData.platePosition" placeholder="请选择" clearable>
-            <el-option v-for="item in ywType" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="链接类别" prop="linkType">
-          <el-select v-model="formData.linkType" placeholder="请选择" clearable>
-            <el-option v-for="item in lianjType" :key="item.value" :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="跳转链接" prop="linkUrl">
-          <el-input v-model="formData.linkUrl" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="封面图(750*300px)" prop="coverPhotosFileList">
-          <ImageFileUpload
-            :limit="1"
-            :saveFileArr="formData.coverPhotosFileList"
-            :listType="'picture-card'"
-            :refType="'public_special_navigation_config'"
-            :refField="'coverPhotos'"
-          ></ImageFileUpload>
-        </el-form-item>
+    <el-dialog :title="dialogTitle" v-model="dialogShow" width="700px" append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="110px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训日期:" prop="createBy1">
+              <el-date-picker type="date" v-model="formData.createBy1" value-format="YYYY-MM-DD" placeholder="请选择日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="培训地点:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入培训地点" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训宣传名称:" prop="road">
+              <el-input
+                type="textarea"
+                v-model="formData.emergencyMeasure"
+                placeholder="请输入培训宣传名称"
+                clearable
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="参加人员:" prop="emergencyMeasure">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入参加人员" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="培训内容:" prop="road">
+              <el-input type="textarea" v-model="formData.emergencyMeasure" placeholder="请输入培训内容" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接" prop="linkUrl">
+              <el-input v-model="formData.linkUrl" controls-position="right" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="缩略图" prop="coverPhotosFileList">
+              <ImageFileUpload
+                :limit="1"
+                :saveFileArr="formData.coverPhotosFileList"
+                :listType="'picture-card'"
+                :refType="'public_special_navigation_config'"
+                :refField="'coverPhotos'"
+              ></ImageFileUpload>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -101,8 +131,8 @@
 <script setup name="专题导航">
 import { specialNavPage, specialNavAdd, specialNavDel, specialNavDetail, specialNavEdit } from '@/api/publicService/index';
 import ImageFileUpload from '@/components/ImageFileUpload/index.vue'; //图片文件上传
-
 const { proxy } = getCurrentInstance();
+const dateYear = ref(proxy.moment(new Date()).format('YYYY'));
 
 const tableData = ref([]);
 const tableLoading = ref(true);
@@ -131,23 +161,16 @@
   },
 });
 const { queryParams, formData, rulesForm } = toRefs(allData);
-const ywType = [
-  { label: '横幅', value: 'banner' },
-  { label: '轮播图', value: 'rotation' },
-];
-const lianjType = [
-  { label: '内链', value: 'innerside' },
-  { label: '外链', value: 'outside' },
-];
-
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  specialNavPage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  // tableLoading.value = true;
+  // specialNavPage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
+  tableLoading.value = false;
+  tableData.value = [{ createBy1: '2024-07-02' }];
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -156,8 +179,8 @@
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getDataList();
+  // queryParams.value.pageNum = 1;
+  // getDataList();
 }
 /** 重置按钮操作 */
 function resetQuery() {
@@ -169,52 +192,55 @@
   proxy.resetForm('formRef'); //清空表单
   formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加专题导航';
+  dialogTitle.value = '新增培训宣传';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  specialNavDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改专题导航';
-    setTimeout(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改培训宣传';
+  formData.value = row;
+  // specialNavDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改专题导航';
+  //   setTimeout(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改专题导航') {
-        specialNavEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        specialNavAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改专题导航') {
+  //       specialNavEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       specialNavAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return specialNavDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return specialNavDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
 
 onMounted(() => {
diff --git a/src/views/publicService/technical.vue b/src/views/publicService/technical.vue
index 68a1f4a..fed5c27 100644
--- a/src/views/publicService/technical.vue
+++ b/src/views/publicService/technical.vue
@@ -3,8 +3,8 @@
   <div class="publicContainer">
     <!-- 搜索区域 -->
     <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-form-item label="技术标准名称" prop="title" style="width: 300px">
+        <el-input v-model="queryParams.title" placeholder="请输入技术标准名称" clearable @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -20,19 +20,19 @@
     </el-row>
     <!-- 表格 -->
     <el-table v-loading="tableLoading" :data="tableData" max-height="650">
-      <el-table-column label="封面图" prop="coverPhotosFileList">
-        <template #default="scope">
+      <el-table-column label="日期" prop="createTime" />
+      <el-table-column label="技术标准名称" prop="title" />
+      <el-table-column label="技术标准内容" prop="degist" />
+      <el-table-column label="跳转链接" prop="createBy" />
+      <el-table-column label="封面缩略图" prop="coverPhotosFileList">
+        <!-- <template #default="scope">
           <ImagePreview
             :src="scope.row.coverPhotosFileList.length > 0 ? scope.row.coverPhotosFileList[0].url : ''"
             :width="50"
             :height="50"
           ></ImagePreview>
-        </template>
+        </template> -->
       </el-table-column>
-      <el-table-column label="技术标准标题" prop="title" />
-      <el-table-column label="技术标准简介" prop="degist" />
-      <el-table-column label="创建人" prop="createBy" />
-      <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>
@@ -53,11 +53,20 @@
 
     <!-- 添加或修改弹窗 -->
     <el-dialog :title="dialogTitle" v-model="dialogShow" width="900px" append-to-body>
-      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="120px" class="publicForm">
-        <el-form-item label="技术标准主题" prop="title">
-          <el-input v-model="formData.title" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="缩略图" prop="coverPhotosFileList">
+      <el-form ref="formRef" :model="formData" :rules="rulesForm" label-width="130px" class="publicForm">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="技术标准名称:" prop="title">
+              <el-input type="text" v-model="formData.title" placeholder="请输入技术标准名称" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="跳转链接:" prop="emergencyMeasure">
+              <el-input type="text" v-model="formData.emergencyMeasure" placeholder="请输入跳转链接" clearable style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-form-item label="缩略图" prop="coverPhotosFileList">
           <ImageFileUpload
             :limit="1"
             :saveFileArr="formData.coverPhotosFileList"
@@ -65,13 +74,7 @@
             :refType="'public_special_navigation_config'"
             :refField="'coverPhotos'"
           ></ImageFileUpload>
-        </el-form-item>
-        <el-form-item label="技术标准简介" prop="degist">
-          <el-input type="textarea" v-model="formData.degist" controls-position="right" />
-        </el-form-item>
-        <el-form-item label="技术标准内容" prop="content">
-          <WangEditor :modelValue="formData.content" :isToolbar="1" @update:modelValue="getWEditVal"></WangEditor>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -119,12 +122,14 @@
 
 /** 获取查询数据列表 */
 function getDataList() {
-  tableLoading.value = true;
-  articlePage(queryParams.value).then(response => {
-    tableData.value = response.data;
-    total.value = response.total;
-    tableLoading.value = false;
-  });
+  tableData.value = [{ createTime: '2024-07-02', title: '123' }];
+  tableLoading.value = false;
+  // tableLoading.value = true;
+  // articlePage(queryParams.value).then(response => {
+  //   tableData.value = response.data;
+  //   total.value = response.total;
+  //   tableLoading.value = false;
+  // });
 }
 /** 取消按钮 */
 function cancelForm() {
@@ -143,59 +148,58 @@
 /** 新增按钮操作 */
 function handleAdd() {
   proxy.resetForm('formRef'); //清空表单
-  formData.value.content = ' ';
   dialogShow.value = true;
-  dialogTitle.value = '添加技术标准';
+  dialogTitle.value = '新增技术标准';
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  articleDetail(row.id).then(response => {
-    dialogShow.value = true;
-    dialogTitle.value = '修改技术标准';
-    nextTick(() => {
-      formData.value = response.data;
-    });
-  });
+  dialogShow.value = true;
+  dialogTitle.value = '修改技术标准';
+  formData.value = { ...row };
+  // articleDetail(row.id).then(response => {
+  //   dialogShow.value = true;
+  //   dialogTitle.value = '修改技术标准';
+  //   nextTick(() => {
+  //     formData.value = response.data;
+  //   });
+  // });
 }
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs['formRef'].validate(valid => {
-    if (valid) {
-      if (dialogTitle.value == '修改技术标准') {
-        articleEdit(formData.value).then(response => {
-          proxy.$modal.msgSuccess('修改成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      } else {
-        if (formData.value.id) delete formData.value.id;
-        articleAdd(formData.value).then(response => {
-          proxy.$modal.msgSuccess('新增成功');
-          dialogShow.value = false;
-          getDataList();
-        });
-      }
-    }
-  });
+  // proxy.$refs['formRef'].validate(valid => {
+  //   if (valid) {
+  //     if (dialogTitle.value == '修改技术标准') {
+  //       articleEdit(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('修改成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     } else {
+  //       if (formData.value.id) delete formData.value.id;
+  //       articleAdd(formData.value).then(response => {
+  //         proxy.$modal.msgSuccess('新增成功');
+  //         dialogShow.value = false;
+  //         getDataList();
+  //       });
+  //     }
+  //   }
+  // });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.id;
-  proxy.$modal
-    .confirm('是否确认删除该数据项？')
-    .then(function () {
-      return articleDel(postIds);
-    })
-    .then(() => {
-      getDataList();
-      proxy.$modal.msgSuccess('删除成功');
-    })
-    .catch(() => {});
+  // const postIds = row.id;
+  // proxy.$modal
+  //   .confirm('是否确认删除该数据项？')
+  //   .then(function () {
+  //     return articleDel(postIds);
+  //   })
+  //   .then(() => {
+  //     getDataList();
+  //     proxy.$modal.msgSuccess('删除成功');
+  //   })
+  //   .catch(() => {});
 }
-// 富文本编辑器内容获取
-function getWEditVal(val) {
-  formData.value.content = val;
-}
+
 onMounted(() => {
   getDataList();
 });
diff --git a/src/views/sponeScreen/waterFlood/floodWZ.vue b/src/views/sponeScreen/waterFlood/floodWZ.vue
index 2b8ca1e..e6f9aed 100644
--- a/src/views/sponeScreen/waterFlood/floodWZ.vue
+++ b/src/views/sponeScreen/waterFlood/floodWZ.vue
@@ -3,8 +3,9 @@
   <div class="floodWZPage">
     <div class="partTitleHM">防汛物资</div>
     <div class="partContHM">
-      <div class="scrollMapHM">
-        <div class="scrollTitle flex">
+      <div class="scrollMapHM" @click="ChartBar3DClick">
+        <ChartBar3D :refresh="refresh" :echartData="echartData"></ChartBar3D>
+        <!-- <div class="scrollTitle flex">
           <p>物资储备地点</p>
           <p>物资详情</p>
           <p>负责人</p>
@@ -15,20 +16,38 @@
             <p class="ellipsis" :title="item.materialDetails">{{ item.materialDetails }}</p>
             <p class="ellipsis">{{ item.header }}<br />{{ item.headerPhone }}</p>
           </div>
-        </Vue3SeamlessScroll>
+        </Vue3SeamlessScroll> -->
       </div>
     </div>
+    <el-dialog :title="title" v-model="open" width="1200px" append-to-body :close-on-click-modal="false">
+      <el-table :data="dataList" v-loading="loading" stripe :max-height="620">
+        <el-table-column type="index" width="55" label="序号" />
+        <el-table-column label="物资储备地点" prop="specificLocation" />
+        <el-table-column label="具体位置" prop="address" />
+        <el-table-column label="主要储备物资" prop="materialDetails" width="600" />
+        <el-table-column label="负责人" prop="header" />
+        <el-table-column label="联系方式" prop="headerPhone" />
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import { FloodPreventionMaterialList } from '@/api/longoPeration/MaterialManagement';
+import ChartBar3D from '@/views/sponeScreen/Echarts/echartBar3D.vue';
 import { Vue3SeamlessScroll } from 'vue3-seamless-scroll';
 
 const { proxy } = getCurrentInstance();
-
+const open = ref(false);
+const title = ref('');
 const dataList = ref([]);
 const loading = ref(true);
+const FormData = ref({});
+const refresh = ref(1);
+const echartData = ref({
+  xAxis: ['车辆类', '泵类', '编织物料', '救生设备', '其他'],
+  seriesData: [5, 35, 690, 86, 290],
+});
 
 /** 查询列表 */
 const getList = async () => {
@@ -36,10 +55,17 @@
   let res = await FloodPreventionMaterialList({});
   if (res && res.code == 200) {
     dataList.value = res.data || [];
-    console.log(dataList.value);
+    // console.log(dataList.value);
   }
   loading.value = false;
 };
+//图例点击事件
+function ChartBar3DClick() {
+  open.value = true;
+  title.value = '查看物资管理';
+  getList();
+}
+
 onMounted(() => {
   getList();
 });
@@ -50,6 +76,7 @@
   width: 100%;
   .scrollMapHM {
     height: 270px;
+    // background: red;
     p {
       width: 30%;
     }