diff --git a/src/api/manage/banned/types.ts b/src/api/manage/banned/types.ts
index be134e4..86cc5aa 100644
--- a/src/api/manage/banned/types.ts
+++ b/src/api/manage/banned/types.ts
@@ -52,26 +52,16 @@ export interface BannedVO {
   /**
    * 1=用户,2=笔记,3=活动,4=评论
    */
-  classify: number;
-
-  /**
-   * 举报时间
-   */
-  createTime: string;
-
-  /**
-   * 操作人
-   */
-  updateBy: number;
-
-  /**
-   * 操作时间
-   */
-  updateTime: string;
+  type: number;
 
 }
 
 export interface BannedForm extends BaseEntity {
+  /**
+   * 唯一标识ID
+   */
+  id?: string | number;
+
   /**
    * 被举报内容id
    */
@@ -120,7 +110,7 @@ export interface BannedForm extends BaseEntity {
   /**
    * 1=用户,2=笔记,3=活动,4=评论
    */
-  classify?: number;
+  type?: number;
 
 }
 
@@ -174,7 +164,7 @@ export interface BannedQuery extends PageQuery {
   /**
    * 1=用户,2=笔记,3=活动,4=评论
    */
-  classify?: number;
+  type?: number;
 
     /**
      * 日期范围参数
diff --git a/src/api/manage/notebook/index.ts b/src/api/manage/notebook/index.ts
index 380b393..84d11b7 100644
--- a/src/api/manage/notebook/index.ts
+++ b/src/api/manage/notebook/index.ts
@@ -73,11 +73,12 @@ export const tagall = (): AxiosPromise<NotebookVO> => {
 };
 /**
  * 查询景点
- * @param id
+ * @param query
  */
-export const contentall = (): AxiosPromise<NotebookVO> => {
+export const contentall = (query?: NotebookQuery): AxiosPromise<NotebookVO> => {
   return request({
     url: '/manage/content/all',
-    method: 'get'
+    method: 'get',
+    params: query
   });
 };
diff --git a/src/views/manage/banned/index.vue b/src/views/manage/banned/index.vue
index 38548ea..ca55898 100644
--- a/src/views/manage/banned/index.vue
+++ b/src/views/manage/banned/index.vue
@@ -4,40 +4,28 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="被举报内容id" prop="contentId">
-              <el-input v-model="queryParams.contentId" placeholder="请输入被举报内容id" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="用户昵称" prop="contentId">
+              <el-input v-model="queryParams.contentId" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="被举报用户ID" prop="reportUserId">
-              <el-input v-model="queryParams.reportUserId" placeholder="请输入被举报用户ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="手机号" prop="reportUserId">
+              <el-input v-model="queryParams.reportUserId" placeholder="请输入手机号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="举报理由" prop="reportReason">
-              <el-input v-model="queryParams.reportReason" placeholder="请输入举报理由" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="举报详细信息" prop="reportDetails">
-              <el-input v-model="queryParams.reportDetails" placeholder="请输入举报详细信息" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="举报人id" prop="informerUserId">
-              <el-input v-model="queryParams.informerUserId" placeholder="请输入举报人id" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="封禁理由" prop="banReason">
-              <el-input v-model="queryParams.banReason" placeholder="请输入封禁理由" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="封禁天数" prop="banDays">
-              <el-input v-model="queryParams.banDays" placeholder="请输入封禁天数" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
-            <el-form-item label="处理方式(0=未处理,1=已下架)" prop="handlingMethod">
-              <el-select v-model="queryParams.handlingMethod" placeholder="请选择处理方式(0=未处理,1=已下架)" clearable >
-                <el-option v-for="dict in dy_banned_handling_method" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            <el-form-item label="账号状态" prop="handlingStatus">
+              <el-select v-model="queryParams.handlingStatus" placeholder="请选择状态" clearable>
+                <el-option v-for="dict in dy_banned_handling_status" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="状态(0=已发布,1=已下架)" prop="handlingStatus">
-              <el-select v-model="queryParams.handlingStatus" placeholder="请选择状态(0=已发布,1=已下架)" clearable >
-                <el-option v-for="dict in dy_banned_handling_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+            <el-form-item label="性别" prop="handlingStatus">
+              <el-select v-model="queryParams.sex" placeholder="请选择用户性别" clearable>
+                <el-option v-for="dict in sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="1=用户,2=笔记,3=活动,4=评论" prop="classify">
-              <el-input v-model="queryParams.classify" placeholder="请输入1=用户,2=笔记,3=活动,4=评论" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="会员等级" prop="handlingStatus">
+              <el-select v-model="queryParams.handlingStatus" placeholder="请选择状态" clearable>
+                <el-option v-for="dict in dy_banned_handling_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
             </el-form-item>
+
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -50,112 +38,59 @@
     <el-card shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:banned:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:banned:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:banned:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:banned:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <el-radio-group v-model="queryParams.type" size="large" @change="handleQuery">
+            <el-radio-button v-for="item in tablist" :key="item.value" :label="item.name" :value="item.value" />
+          </el-radio-group>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="bannedList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="唯一标识ID" align="center" prop="id" v-if="true" />
-        <el-table-column label="被举报内容id" align="center" prop="contentId" />
-        <el-table-column label="被举报用户ID" align="center" prop="reportUserId" />
-        <el-table-column label="举报理由" align="center" prop="reportReason" />
-        <el-table-column label="举报详细信息" align="center" prop="reportDetails" />
-        <el-table-column label="举报人id" align="center" prop="informerUserId" />
-        <el-table-column label="封禁理由" align="center" prop="banReason" />
-        <el-table-column label="封禁天数" align="center" prop="banDays" />
-        <el-table-column label="处理方式(0=未处理,1=已下架)" align="center" prop="handlingMethod">
+      <el-table v-loading="loading" :data="bannedList">
+        <el-table-column v-if="queryParams.type == 1" label="笔记名称" align="center" prop="contentname" />
+        <el-table-column v-if="queryParams.type == 2" label="活动名称" align="center" prop="contentname" />
+        <el-table-column v-if="queryParams.type == 3" label="评论名称" align="center" prop="contentname" />
+        <el-table-column label="用户ID" align="center" prop="reportUserId" />
+        <el-table-column label="会员等级" align="center" prop="userLever" />
+        <el-table-column label="昵称" align="center" prop="nickname" />
+        <el-table-column label="性别" align="center" prop="sex">
           <template #default="scope">
-            <dict-tag :options="dy_banned_handling_method" :value="scope.row.handlingMethod"/>
+            <dict-tag :options="sys_user_sex" :value="scope.row.sex" />
           </template>
         </el-table-column>
-        <el-table-column label="状态(0=已发布,1=已下架)" align="center" prop="handlingStatus">
+        <el-table-column label="头像" align="center" prop="avatar" />
+        <el-table-column label="举报理由" align="center" prop="reportDetails" width="200px" show-overflow-tooltip />
+        <el-table-column label="举报人" align="center" prop="informerNickname" />
+        <el-table-column label="举报时间" align="center" prop="createTime" width="200px" />
+        <el-table-column label="操作时间" align="center" prop="updateTime" width="200px" />
+        <el-table-column label="操作人" align="center" prop="updateByName" width="150px" />
+        <el-table-column label="状态" align="center" prop="handLingStatus" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
           <template #default="scope">
-            <dict-tag :options="dy_banned_handling_status" :value="scope.row.handlingStatus"/>
-          </template>
-        </el-table-column>
-        <el-table-column label="1=用户,2=笔记,3=活动,4=评论" align="center" prop="classify" />
-        <el-table-column label="举报时间" align="center" prop="createTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作人" align="center" prop="updateBy" />
-        <el-table-column label="操作时间" align="center" prop="updateTime" width="180">
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['manage:banned:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:banned:remove']"></el-button>
-            </el-tooltip>
+            <el-button v-hasPermi="['manage:banned:edit']" link type="primary" @click="handleUpdate(scope.row)">封禁</el-button>
+            <el-button v-hasPermi="['manage:banned:remove']" link type="primary" @click="handleDelete(scope.row)">删除{{ radio1 }}</el-button>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
     </el-card>
     <!-- 添加或修改举报对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
       <el-form ref="bannedFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="被举报内容id" prop="contentId">
-          <el-input v-model="form.contentId" placeholder="请输入被举报内容id" />
+        <el-form-item label="封禁原因" prop="banReason">
+          <el-select v-model="form.reason" placeholder="请选择封禁理由" clearable>
+            <el-option v-for="dict in dy_banned_ban_reason" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
-        <el-form-item label="被举报用户ID" prop="reportUserId">
-          <el-input v-model="form.reportUserId" placeholder="请输入被举报用户ID" />
-        </el-form-item>
-        <el-form-item label="举报理由" prop="reportReason">
-          <el-input v-model="form.reportReason" placeholder="请输入举报理由" />
-        </el-form-item>
-        <el-form-item label="举报详细信息" prop="reportDetails">
-            <el-input v-model="form.reportDetails" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="举报人id" prop="informerUserId">
-          <el-input v-model="form.informerUserId" placeholder="请输入举报人id" />
-        </el-form-item>
-        <el-form-item label="封禁理由" prop="banReason">
-          <el-input v-model="form.banReason" placeholder="请输入封禁理由" />
-        </el-form-item>
-        <el-form-item label="封禁天数" prop="banDays">
-          <el-input v-model="form.banDays" placeholder="请输入封禁天数" />
-        </el-form-item>
-        <el-form-item label="处理方式(0=未处理,1=已下架)" prop="handlingMethod">
+        <el-form-item label="处理方式" prop="handlingMethod">
           <el-radio-group v-model="form.handlingMethod">
-            <el-radio
-              v-for="dict in dy_banned_handling_method"
-              :key="dict.value"
-              :value="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
+            <el-radio value="1" size="large">禁言</el-radio>
+            <el-radio value="2" size="large">封禁</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="状态(0=已发布,1=已下架)" prop="handlingStatus">
-          <el-radio-group v-model="form.handlingStatus">
-            <el-radio
-              v-for="dict in dy_banned_handling_status"
-              :key="dict.value"
-              :value="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="1=用户,2=笔记,3=活动,4=评论" prop="classify">
-          <el-input v-model="form.classify" placeholder="请输入1=用户,2=笔记,3=活动,4=评论" />
+        <el-form-item label="处理天数" prop="banDays">
+          <el-select v-model="form.banDays" placeholder="请选择封禁天数" clearable>
+            <el-option v-for="dict in dy_user_ban_days" :key="dict.value" :label="dict.label" :value="dict.value" />
+          </el-select>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -173,7 +108,9 @@ import { listBanned, getBanned, delBanned, addBanned, updateBanned } from '@/api
 import { BannedVO, BannedQuery, BannedForm } from '@/api/manage/banned/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { dy_banned_handling_method, dy_banned_handling_status } = toRefs<any>(proxy?.useDict('dy_banned_handling_method', 'dy_banned_handling_status'));
+const { dy_banned_handling_method, dy_banned_handling_status, sys_user_sex, dy_banned_ban_reason, dy_user_ban_days } = toRefs<any>(
+  proxy?.useDict('dy_banned_handling_method', 'dy_banned_handling_status', 'sys_user_sex', 'dy_banned_ban_reason', 'dy_user_ban_days')
+);
 
 const bannedList = ref<BannedVO[]>([]);
 const buttonLoading = ref(false);
@@ -183,7 +120,12 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
+const radio1 = ref('笔记');
+const tablist = ref([
+  { value: 1, name: '笔记' },
+  { value: 2, name: '活动' },
+  { value: 3, name: '评论' }
+]);
 const queryFormRef = ref<ElFormInstance>();
 const bannedFormRef = ref<ElFormInstance>();
 
@@ -193,6 +135,7 @@ const dialog = reactive<DialogOption>({
 });
 
 const initFormData: BannedForm = {
+  id: undefined,
   contentId: undefined,
   reportUserId: undefined,
   reportReason: undefined,
@@ -202,10 +145,10 @@ const initFormData: BannedForm = {
   banDays: undefined,
   handlingMethod: undefined,
   handlingStatus: undefined,
-  classify: undefined,
-}
+  type: 1
+};
 const data = reactive<PageData<BannedForm, BannedQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -218,41 +161,20 @@ const data = reactive<PageData<BannedForm, BannedQuery>>({
     banDays: undefined,
     handlingMethod: undefined,
     handlingStatus: undefined,
-    classify: undefined,
-    params: {
-    }
+    type: 1,
+    params: {}
   },
   rules: {
-    contentId: [
-      { required: true, message: "被举报内容id不能为空", trigger: "blur" }
-    ],
-    reportUserId: [
-      { required: true, message: "被举报用户ID不能为空", trigger: "blur" }
-    ],
-    reportReason: [
-      { required: true, message: "举报理由不能为空", trigger: "blur" }
-    ],
-    reportDetails: [
-      { required: true, message: "举报详细信息不能为空", trigger: "blur" }
-    ],
-    informerUserId: [
-      { required: true, message: "举报人id不能为空", trigger: "blur" }
-    ],
-    banReason: [
-      { required: true, message: "封禁理由不能为空", trigger: "blur" }
-    ],
-    banDays: [
-      { required: true, message: "封禁天数不能为空", trigger: "blur" }
-    ],
-    handlingMethod: [
-      { required: true, message: "处理方式(0=未处理,1=已下架)不能为空", trigger: "change" }
-    ],
-    handlingStatus: [
-      { required: true, message: "状态(0=已发布,1=已下架)不能为空", trigger: "change" }
-    ],
-    classify: [
-      { required: true, message: "1=用户,2=笔记,3=活动,4=评论不能为空", trigger: "blur" }
-    ],
+    id: [{ required: true, message: '唯一标识ID不能为空', trigger: 'blur' }],
+    contentId: [{ required: true, message: '被举报内容id不能为空', trigger: 'blur' }],
+    reportUserId: [{ required: true, message: '被举报用户ID不能为空', trigger: 'blur' }],
+    reportReason: [{ required: true, message: '举报理由不能为空', trigger: 'blur' }],
+    reportDetails: [{ required: true, message: '举报详细信息不能为空', trigger: 'blur' }],
+    informerUserId: [{ required: true, message: '举报人id不能为空', trigger: 'blur' }],
+    banReason: [{ required: true, message: '封禁理由不能为空', trigger: 'blur' }],
+    banDays: [{ required: true, message: '封禁天数不能为空', trigger: 'blur' }],
+    handlingMethod: [{ required: true, message: '处理方式(0=未处理,1=已下架)不能为空', trigger: 'change' }],
+    handlingStatus: [{ required: true, message: '状态(0=已发布,1=已下架)不能为空', trigger: 'change' }]
   }
 });
 
@@ -265,55 +187,55 @@ const getList = async () => {
   bannedList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   bannedFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: BannedVO[]) => {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加举报";
-}
+  dialog.title = '添加举报';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: BannedVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getBanned(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改举报";
-}
+  dialog.title = `封禁【${row.nickname}】`;
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -321,32 +243,36 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateBanned(form.value).finally(() =>  buttonLoading.value = false);
+        await updateBanned(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addBanned(form.value).finally(() =>  buttonLoading.value = false);
+        await addBanned(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: BannedVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除举报编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除举报编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
   await delBanned(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('manage/banned/export', {
-    ...queryParams.value
-  }, `banned_${new Date().getTime()}.xlsx`)
-}
+  proxy?.download(
+    'manage/banned/export',
+    {
+      ...queryParams.value
+    },
+    `banned_${new Date().getTime()}.xlsx`
+  );
+};
 
 onMounted(() => {
   getList();
diff --git a/src/views/manage/noteManage/index.vue b/src/views/manage/noteManage/index.vue
index 3fc3f76..d2c2276 100644
--- a/src/views/manage/noteManage/index.vue
+++ b/src/views/manage/noteManage/index.vue
@@ -13,7 +13,7 @@
             </el-form-item>
             <el-form-item label="标记地点" prop="cover">
               <!--              <el-input v-model="queryParams.cover" placeholder="请输入标记地点" clearable @keyup.enter="handleQuery" />-->
-              <el-select v-model="queryParams.cover" placeholder="请选择标记地点" size="large" style="width: 240px">
+              <el-select v-model="queryParams.cover" placeholder="请选择标记地点" style="width: 240px">
                 <el-option v-for="item in sys_user_contentOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -38,16 +38,11 @@
           <el-col :span="1.5">
             <el-button v-hasPermi="['manage:notebook:add']" type="primary" plain icon="Plus" @click="handleAdd">新增 </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['manage:notebook:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-              >修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['manage:notebook:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              >删除
-            </el-button>
-          </el-col>
+          <!--          <el-col :span="1.5">-->
+          <!--            <el-button v-hasPermi="['manage:notebook:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"-->
+          <!--              >删除-->
+          <!--            </el-button>-->
+          <!--          </el-col>-->
           <!-- <el-col :span="1.5">
             <el-button v-hasPermi="['manage:notebook:export']" type="warning" plain icon="Download"
               @click="handleExport">导出 </el-button>
@@ -57,7 +52,7 @@
       </template>
 
       <el-table v-loading="loading" :data="notebookList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
+        <!--        <el-table-column type="selection" width="55" align="center" />-->
         <el-table-column v-if="true" label="ID" align="center" prop="id" />
         <el-table-column label="笔记标题" align="center" prop="title" />
         <el-table-column label="笔记封面" align="center" prop="cover">
@@ -66,8 +61,16 @@
             <!-- <image-preview :src="scope.row.productImageUrl" /> -->
           </template>
         </el-table-column>
-        <el-table-column label="标记地点" align="center" prop="cover" />
-        <el-table-column label="标签" align="center" prop="status" />
+        <el-table-column label="标记地点" align="center" prop="location">
+          <template #default="scope">
+            <span>{{ formatlocation(scope.row.location) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="标签" align="center" prop="tagId">
+          <template #default="scope">
+            <span>{{ formatTag(scope.row.tagId) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="笔记详情" align="center" prop="tagId">
           <template #default="scope">
             <el-button type="text" @click="contenttext(scope.row)">查看详情</el-button>
@@ -80,7 +83,7 @@
             <!-- <image-preview :src="scope.row.productImageUrl" /> -->
           </template>
         </el-table-column>
-        <el-table-column label="笔记点赞数" align="center" prop="likeCount" />
+        <el-table-column label="笔记点赞数" align="center" prop="agreeCount" />
         <el-table-column label="发布状态" align="center" prop="status">
           <template #default="scope">
             <el-tag v-if="scope.row.status == 0" type="info">未发布</el-tag>
@@ -94,18 +97,19 @@
         <el-table-column label="操作时间" align="center" prop="updateTime" width="200px" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
-            <el-tooltip content="编辑" placement="top">
-              <el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
-            </el-tooltip>
+            <el-button v-if="scope.row.status != 2" v-hasPermi="['manage:notebook:edit']" link type="primary" @click="handleUpdate(scope.row)"
+              >编辑</el-button
+            >
+            <el-button v-if="scope.row.status != 2" v-hasPermi="['manage:notebook:edit']" link type="primary" @click="fabudata(scope.row)"
+              >发布</el-button
+            >
+            <el-button v-if="scope.row.status == 2" v-hasPermi="['manage:notebook:edit']" link type="primary" @click="fabudata(scope.row)"
+              >撤销发布</el-button
+            >
             <!--            <el-tooltip content="发布" placement="top">-->
             <!--              <el-button v-hasPermi="['manage:notebook:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>-->
             <!--            </el-tooltip>-->
-            <el-tooltip content="删除" placement="top">
-              <el-button v-hasPermi="['manage:notebook:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-            </el-tooltip>
+            <el-button v-hasPermi="['manage:notebook:remove']" link type="primary" @click="handleDelete(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -116,29 +120,29 @@
     <el-dialog v-model="dialog.visible" :title="dialog.title" width="60%" append-to-body>
       <el-form ref="notebookFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="笔记标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入攻略名称" style="width: 300px" />
+          <el-input v-model="form.title" placeholder="请输入笔记标题" style="width: 300px" />
         </el-form-item>
         <el-form-item label="笔记标签" prop="tagId">
-          <el-select v-model="value" placeholder="请选择标签" size="large" style="width: 240px" multiple>
+          <el-select v-model="tagvalue" placeholder="请选择标签" size="large" style="width: 240px" multiple>
             <el-option v-for="item in sys_user_tagOptions" :key="item.id" :label="item.title" :value="item.id" />
           </el-select>
         </el-form-item>
-        <el-form-item label="标记地点" prop="tagId">
-          <el-select v-model="value" placeholder="请选择标记地点" size="large" style="width: 240px">
+        <el-form-item label="标记地点" prop="location">
+          <el-select v-model="addressvalue" placeholder="请选择标记地点" size="large" style="width: 240px" multiple>
             <el-option v-for="item in sys_user_contentOptions" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="笔记照片" prop="cover">
           <imageUpload :model-value="form.cover" :file-size="20" />
         </el-form-item>
-        <el-form-item label="笔记内容">
+        <el-form-item label="笔记内容" prop="content">
           <editor v-model="form.content" :min-height="192" />
         </el-form-item>
       </el-form>
       <template #footer>
         <div style="display: flex; justify-content: space-between">
           <div>
-            <el-button :loading="buttonLoading" type="primary" @click="submitForm">预 览</el-button>
+            <el-button :loading="buttonLoading" type="primary" @click="yulansave">预 览</el-button>
             <el-button @click="cancel">存草稿</el-button>
           </div>
           <div>
@@ -151,7 +155,9 @@
     <!--    笔记详情-->
     <el-dialog v-model="concentdialog.visible" title="笔记详情" width="50%" append-to-body>
       <div>{{ form.title }}</div>
-      <div>{{ form.content }}</div>
+      <div>{{ formatTag(form.tagId) }}</div>
+      <div>{{ formatlocation(form.location) }}</div>
+      <div v-html="form.content"></div>
     </el-dialog>
   </div>
 </template>
@@ -175,17 +181,20 @@ const sys_user_contentOptions = ref([]); //标签库
 const queryFormRef = ref<ElFormInstance>();
 const notebookFormRef = ref<ElFormInstance>();
 const value = ref('');
+const tagvalue = ref('');
+const addressvalue = ref('');
+
 const statusoptions = [
   {
     value: '1',
-    label: '全部'
+    label: '审核中'
   },
   {
     value: '2',
     label: '已发布'
   },
   {
-    value: '3',
+    value: '0',
     label: '未发布'
   }
 ];
@@ -221,18 +230,49 @@ const data = reactive<PageData<NotebookForm, NotebookQuery>>({
   },
   rules: {
     id: [{ required: true, message: '笔记ID不能为空', trigger: 'blur' }],
-    title: [{ required: true, message: '攻略名称不能为空', trigger: 'blur' }],
+    title: [{ required: true, message: '笔记标题不能为空', trigger: 'blur' }],
     content: [{ required: true, message: '攻略内容不能为空', trigger: 'blur' }],
-    cover: [{ required: true, message: '笔记封面不能为空', trigger: 'blur' }],
+    // cover: [{ required: true, message: '笔记照片不能为空', trigger: 'blur' }],
     status: [{ required: true, message: '帐号状态不能为空', trigger: 'change' }],
     tagId: [{ required: true, message: '标签不能为空', trigger: 'blur' }],
-    longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
-    latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
+    location: [{ required: true, message: '标记地点不能为空', trigger: 'blur' }],
+    content: [{ required: true, message: '笔记内容不能为空', trigger: 'blur' }]
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
+/**
+ * 标签格式化
+ */
+const formatTag = (tagId: string | null) => {
+  let tagString = '';
+  for (let i = 0; i < sys_user_tagOptions.value.length; i++) {
+    const element = sys_user_tagOptions.value[i];
+    if (tagId?.includes(element.id)) {
+      tagString += ',' + element.title;
+    }
+  }
+  return tagString.substring(1);
+};
+/**
+ * 标记地点格式化
+ */
+const formatlocation = (tagId: string | null) => {
+  let tagString = '';
+  let arrlist = tagId.split(',').map(Number);
 
+  for (let i = 0; i < sys_user_contentOptions.value.length; i++) {
+    const element = sys_user_contentOptions.value[i];
+    for (let j = 0; j < arrlist.length; j++) {
+      const conten = arrlist[j];
+
+      if (conten == element.id) {
+        tagString += ',' + element.name;
+      }
+    }
+  }
+  return tagString.substring(1);
+};
 /** 查询笔记列表 */
 const getList = async () => {
   loading.value = true;
@@ -246,7 +286,7 @@ const getTag = async () => {
   sys_user_tagOptions.value = res; //标签库
 };
 const getContent = async () => {
-  const res = await contentall();
+  const res = await contentall({ status: 2 });
   sys_user_contentOptions.value = res; //地点
 };
 
@@ -294,9 +334,25 @@ const handleUpdate = async (row?: NotebookVO) => {
   const _id = row?.id || ids.value[0];
   const res = await getNotebook(_id);
   Object.assign(form.value, res.data);
+  tagvalue.value = form.value.tagId.split(',').map(Number);
+  addressvalue.value = form.value.location.split(',');
   dialog.visible = true;
   dialog.title = '修改笔记';
 };
+//撤销发布
+
+const fabudata = async (row?: NotebookVO) => {
+  const _id = row?.id || ids.value[0];
+  const res = await getNotebook(_id);
+  Object.assign(form.value, res.data);
+  form.value.status = row.status == 2 ? 0 : 2;
+  const text = row.status == 2 ? '撤销发布' : '发布';
+  const textmessage = row.status == 2 ? '撤销发布成功' : '发布成功';
+  await proxy?.$modal.confirm('是否确认' + text + '笔记编号为' + _id + '"的数据项？').finally(() => (loading.value = false));
+  await updateNotebook(form.value).finally(() => (buttonLoading.value = false));
+  proxy?.$modal.msgSuccess(`${textmessage}`);
+  await getList();
+};
 const contenttext = async (row?: NotebookVO) => {
   const _id = row?.id;
   const res = await getNotebook(_id);
@@ -305,6 +361,11 @@ const contenttext = async (row?: NotebookVO) => {
 };
 /** 提交按钮 */
 const submitForm = () => {
+  form.value.tagId = tagvalue.value.join(',');
+  form.value.location = addressvalue.value.join(',');
+  form.value.cover = '';
+  form.value.status = 1;
+
   notebookFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
@@ -316,7 +377,7 @@ const submitForm = () => {
       console.log(form.value.cover);
 
       proxy?.$modal.msgSuccess('操作成功');
-      // dialog.visible = false;
+      dialog.visible = false;
       await getList();
     }
   });
@@ -330,6 +391,10 @@ const handleDelete = async (row?: NotebookVO) => {
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
 };
+// 预览
+const yulansave = () => {
+  concentdialog.visible = true;
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {