重构文章管理接口及前端组件

src/api/manage/article/index.ts

@@ -3,81 +3,61 @@ import { AxiosPromise } from 'axios';
 import { ArticleVO, ArticleForm, ArticleQuery } from '@/api/manage/article/types';
 
 /**
- * 查询景点管理列表
+ * 查询文章列表
  * @param query
  * @returns {*}
  */
 
 export const listArticle = (query?: ArticleQuery): AxiosPromise<ArticleVO[]> => {
   return request({
-    url: '/manage/content/list',
+    url: '/manage/article/list',
     method: 'get',
     params: query
   });
 };
 
 /**
- * 查询景点管理详细
+ * 查询文章详细
  * @param id
  */
 export const getArticle = (id: string | number): AxiosPromise<ArticleVO> => {
   return request({
-    url: '/manage/content/' + id,
+    url: '/manage/article/' + id,
     method: 'get'
   });
 };
 
 /**
- * 新增景点管理
+ * 新增文章
  * @param data
  */
 export const addArticle = (data: ArticleForm) => {
   return request({
-    url: '/manage/content',
+    url: '/manage/article',
     method: 'post',
     data: data
   });
 };
 
 /**
- * 修改景点管理
+ * 修改文章
  * @param data
  */
 export const updateArticle = (data: ArticleForm) => {
   return request({
-    url: '/manage/content',
+    url: '/manage/article',
     method: 'put',
     data: data
   });
 };
 
 /**
- * 删除景点管理
+ * 删除文章
  * @param id
  */
 export const delArticle = (id: string | number | Array<string | number>) => {
   return request({
-    url: '/manage/content/' + id,
+    url: '/manage/article/' + id,
     method: 'delete'
   });
 };
-
-export const geocoder = (address: string) => {
-  return request({
-    url: 'https://apis.map.qq.com/ws/geocoder/v1/?address=' + address + '&key=6XFBZ-SAVLT-JGIX2-VOLMK-6S2H3-XUBGO',
-    method: 'get'
-  });
-};
-
-/**
- *
- * @param query 根据标签查询相关笔记
- * @returns
- */
-export const listByTagIdNotebook = (query: any): AxiosPromise<ArticleVO[]> => {
-  return request({
-    url: '/manage/notebook/listByTagId',
-    method: 'get',
-    params: query
-  });
-};

src/api/manage/article/types.ts

@@ -1,286 +1,141 @@
-import { number } from 'vue-types';
-
 export interface ArticleVO {
   /**
-   * 景点ID/租赁ID/游艇ID
+   * ID
    */
   id: string | number;
-  tagId_copy: string[] | number[];
-  /**
-   *
-   */
-  type: string;
 
   /**
-   * 二级类别（未定）
+   * 标题
    */
-  secondType: string;
+  title: string;
 
   /**
-   * 开放/营业
+   * 内容
    */
-  isOpen: string;
+  content: string;
 
   /**
-   * 景点属性/商家属性
+   * 用户ID
    */
-  attribute: string;
+  userId: string | number;
 
   /**
-   * 状态 0-未发布 1-审核中 2-发布
+   * 标签id，以逗号分隔
-   */
-  status: string;
-
-  /**
-   * 省code
-   */
-  province: string;
-
-  /**
-   * 市/区
-   */
-  city: string;
-
-  /**
-   * 简介
-   */
-  remark: string;
-
-  /**
-   * 会员等级
-   */
-  memberLevel: number;
-
-  /**
-   * 标签
    */
   tagId: string | number;
 
   /**
-   * 推荐语
+   * 喜欢数
    */
-  recommend: string;
+  agreeCount: number;
 
   /**
-   * 介绍
+   * 评论数
    */
-  intro: string;
+  commentCount: number;
 
   /**
-   * 详细地址
+   * 状态（0-未发布 1-审核中 2-发布）
    */
-  address: string;
+  status: number;
 
   /**
-   * 经度
+   * 更新者
    */
-  longitude: number;
+  updateBy: number;
 
   /**
-   * 纬度
+   * 更新时间
    */
-  latitude: number;
+  updateTime: string;
 
-  /**
-   * 排序
-   */
-  orderNum: number;
-
-  /**
-   * 景区等级
-   */
-  level: number;
 }
 
 export interface ArticleForm extends BaseEntity {
-  icon?: string;
-  region?: string;
-  tagId_copy: string[] | number[];
   /**
-   * 景点名称 商家名称
+   * ID
-   */
-  name: string;
-  /**
-   * 详细地址
-   */
-  address?: string;
-  /**
-   * 经度
-   */
-  longitude?: number;
-
-  /**
-   * 纬度
-   */
-  latitude?: number;
-  /**
-   * 联系电话
-   */
-  number?: number | string;
-  /**
-   * 景点ID/租赁ID/游艇ID
    */
   id?: string | number;
 
   /**
-   *
+   * 标题
    */
-  type?: string;
+  title?: string;
 
   /**
-   * 二级类别（未定）
+   * 内容
    */
-  secondType?: string;
+  content?: string;
 
   /**
-   * 开放/营业
+   * 用户ID
    */
-  isOpen?: string | number;
+  userId?: string | number;
 
   /**
-   * 景点属性/商家属性
+   * 标签id，以逗号分隔
-   */
-  attribute?: string | number;
-
-  /**
-   * 状态 0-未发布 1-审核中 2-发布
-   */
-  status?: string;
-
-  /**
-   * 省code
-   */
-  province?: string;
-
-  /**
-   * 市/区
-   */
-  city?: string;
-
-  /**
-   * 简介
-   */
-  remark?: string;
-
-  /**
-   * 会员等级
-   */
-  memberLevel?: number;
-
-  /**
-   * 标签
    */
   tagId?: string | number;
 
   /**
-   * 推荐语
+   * 喜欢数
    */
-  recommend?: string;
+  agreeCount?: number;
 
   /**
-   * 介绍
+   * 评论数
    */
-  intro?: string;
+  commentCount?: number;
 
   /**
-   * 排序
+   * 状态（0-未发布 1-审核中 2-发布）
    */
-  orderNum?: number;
+  status?: number;
 
-  /**
-   * 景区等级
-   */
-  level?: number;
-  /**
-   * 景区/商家图像
-   */
-  mediaBoList?: any[];
 }
 
 export interface ArticleQuery extends PageQuery {
-  /**
-   *
-   */
-  type?: string;
-  name?: string;
-  tagId_copy: string[] | number[];
-  /**
-   * 二级类别（未定）
-   */
-  secondType?: string;
 
   /**
-   * 开放/营业
+   * 标题
    */
-  isOpen?: string;
+  title?: string;
 
   /**
-   * 景点属性/商家属性
+   * 内容
    */
-  attribute?: string;
+  content?: string;
 
   /**
-   * 状态 0-未发布 1-审核中 2-发布
+   * 用户ID
    */
-  status?: string;
+  userId?: string | number;
 
   /**
-   * 省code
+   * 标签id，以逗号分隔
-   */
-  province?: string;
-
-  /**
-   * 市/区
-   */
-  city?: string;
-
-  /**
-   * 会员等级
-   */
-  memberLevel?: number;
-
-  /**
-   * 标签
    */
   tagId?: string | number;
 
   /**
-   * 推荐语
+   * 喜欢数
    */
-  recommend?: string;
+  agreeCount?: number;
 
   /**
-   * 介绍
+   * 评论数
    */
-  intro?: string;
+  commentCount?: number;
 
   /**
-   * 详细地址
+   * 状态（0-未发布 1-审核中 2-发布）
    */
-  address?: string;
+  status?: number;
 
-  /**
+    /**
-   * 经度
+     * 日期范围参数
-   */
+     */
-  longitude?: number;
+    params?: any;
-
-  /**
-   * 纬度
-   */
-  latitude?: number;
-
-  /**
-   * 排序
-   */
-  orderNum?: number;
-
-  /**
-   * 景区等级
-   */
-  level?: number;
-
-  /**
-   * 日期范围参数
-   */
-  params?: any;
 }
+
+
+

src/api/manage/scenic/index.ts

@@ -0,0 +1,83 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ArticleVO, ArticleForm, ArticleQuery } from '@/api/manage/scenic/types';
+
+/**
+ * 查询景点管理列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listArticle = (query?: ArticleQuery): AxiosPromise<ArticleVO[]> => {
+  return request({
+    url: '/manage/content/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询景点管理详细
+ * @param id
+ */
+export const getArticle = (id: string | number): AxiosPromise<ArticleVO> => {
+  return request({
+    url: '/manage/content/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增景点管理
+ * @param data
+ */
+export const addArticle = (data: ArticleForm) => {
+  return request({
+    url: '/manage/content',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改景点管理
+ * @param data
+ */
+export const updateArticle = (data: ArticleForm) => {
+  return request({
+    url: '/manage/content',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除景点管理
+ * @param id
+ */
+export const delArticle = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/manage/content/' + id,
+    method: 'delete'
+  });
+};
+
+export const geocoder = (address: string) => {
+  return request({
+    url: 'https://apis.map.qq.com/ws/geocoder/v1/?address=' + address + '&key=6XFBZ-SAVLT-JGIX2-VOLMK-6S2H3-XUBGO',
+    method: 'get'
+  });
+};
+
+/**
+ *
+ * @param query 根据标签查询相关笔记
+ * @returns
+ */
+export const listByTagIdNotebook = (query: any): AxiosPromise<ArticleVO[]> => {
+  return request({
+    url: '/manage/notebook/listByTagId',
+    method: 'get',
+    params: query
+  });
+};

src/api/manage/scenic/types.ts

@@ -0,0 +1,287 @@
+import { number } from 'vue-types';
+
+export interface ArticleVO {
+  /**
+   * 景点ID/租赁ID/游艇ID
+   */
+  id: string | number;
+  tagId_copy: string[] | number[];
+  /**
+   *
+   */
+  type: string;
+
+  /**
+   * 二级类别（未定）
+   */
+  secondType: string;
+
+  /**
+   * 开放/营业
+   */
+  isOpen: string;
+
+  /**
+   * 景点属性/商家属性
+   */
+  attribute: string;
+
+  /**
+   * 状态 0-未发布 1-审核中 2-发布
+   */
+  status: string;
+
+  /**
+   * 省code
+   */
+  province: string;
+
+  /**
+   * 市/区
+   */
+  city: string;
+
+  /**
+   * 简介
+   */
+  remark: string;
+
+  /**
+   * 会员等级
+   */
+  memberLevel: number;
+
+  /**
+   * 标签
+   */
+  tagId: string | number;
+
+  /**
+   * 推荐语
+   */
+  recommend: string;
+
+  /**
+   * 介绍
+   */
+  intro: string;
+
+  /**
+   * 详细地址
+   */
+  address: string;
+
+  /**
+   * 经度
+   */
+  longitude: number;
+
+  /**
+   * 纬度
+   */
+  latitude: number;
+
+  /**
+   * 排序
+   */
+  orderNum: number;
+
+  /**
+   * 景区等级
+   */
+  level: number;
+}
+
+export interface ArticleForm extends BaseEntity {
+  icon?: string;
+  region?: string;
+  regionCode?: string;
+  tagId_copy: string[] | number[];
+  /**
+   * 景点名称 商家名称
+   */
+  name: string;
+  /**
+   * 详细地址
+   */
+  address?: string;
+  /**
+   * 经度
+   */
+  longitude?: number;
+
+  /**
+   * 纬度
+   */
+  latitude?: number;
+  /**
+   * 联系电话
+   */
+  number?: number | string;
+  /**
+   * 景点ID/租赁ID/游艇ID
+   */
+  id?: string | number;
+
+  /**
+   *
+   */
+  type?: string;
+
+  /**
+   * 二级类别（未定）
+   */
+  secondType?: string;
+
+  /**
+   * 开放/营业
+   */
+  isOpen?: string | number;
+
+  /**
+   * 景点属性/商家属性
+   */
+  attribute?: string | number;
+
+  /**
+   * 状态 0-未发布 1-审核中 2-发布
+   */
+  status?: string;
+
+  /**
+   * 省code
+   */
+  province?: string;
+
+  /**
+   * 市/区
+   */
+  city?: string;
+
+  /**
+   * 简介
+   */
+  remark?: string;
+
+  /**
+   * 会员等级
+   */
+  memberLevel?: number;
+
+  /**
+   * 标签
+   */
+  tagId?: string | number;
+
+  /**
+   * 推荐语
+   */
+  recommend?: string;
+
+  /**
+   * 介绍
+   */
+  intro?: string;
+
+  /**
+   * 排序
+   */
+  orderNum?: number;
+
+  /**
+   * 景区等级
+   */
+  level?: number;
+  /**
+   * 景区/商家图像
+   */
+  mediaBoList?: any[];
+}
+
+export interface ArticleQuery extends PageQuery {
+  /**
+   *
+   */
+  type?: string;
+  name?: string;
+  tagId_copy: string[] | number[];
+  /**
+   * 二级类别（未定）
+   */
+  secondType?: string;
+
+  /**
+   * 开放/营业
+   */
+  isOpen?: string;
+
+  /**
+   * 景点属性/商家属性
+   */
+  attribute?: string;
+
+  /**
+   * 状态 0-未发布 1-审核中 2-发布
+   */
+  status?: string;
+
+  /**
+   * 省code
+   */
+  province?: string;
+
+  /**
+   * 市/区
+   */
+  city?: string;
+
+  /**
+   * 会员等级
+   */
+  memberLevel?: number;
+
+  /**
+   * 标签
+   */
+  tagId?: string | number | number[] | string[];
+
+  /**
+   * 推荐语
+   */
+  recommend?: string;
+
+  /**
+   * 介绍
+   */
+  intro?: string;
+
+  /**
+   * 详细地址
+   */
+  address?: string;
+
+  /**
+   * 经度
+   */
+  longitude?: number;
+
+  /**
+   * 纬度
+   */
+  latitude?: number;
+
+  /**
+   * 排序
+   */
+  orderNum?: number;
+
+  /**
+   * 景区等级
+   */
+  level?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/components/noteList/index.vue

@@ -1,13 +1,14 @@
 <!-- 笔记列表 -->
 <template>
   <div>
-    <el-table :height="props.autoTableHeight" v-loading="loading" :data="tableList" @selection-change="handleSelectionChange" border>
+    <el-table :height="props.autoTableHeight" v-loading="loading" :data="tableList"
+      @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" v-if="props.parentName != 'dyUser'" />
       <!-- <el-table-column label="ID" align="center" prop="id" v-if="props.parentName != 'dyUser'" /> -->
       <el-table-column label="笔记标题" align="center" prop="title" width="180px" />
-      <el-table-column label="笔记封面" align="center" prop="" />
+      <el-table-column label="笔记封面" align="center" prop="" width="80px" />
-      <el-table-column label="笔记类别" align="center" prop="" />
+      <el-table-column label="笔记类别" align="center" prop="" width="80px" />
-      <el-table-column label="标记地点" align="center" prop="location" />
+      <el-table-column label="标记地点" align="center" prop="location" width="180px" />
       <el-table-column label="标签" align="center" prop="">
         <template #default="scope">
           <span>{{ formatTag(scope.row.tagId.toString()) }}</span>
@@ -18,8 +19,8 @@
           <el-button link type="primary" @click="handleDetail(scope.row)">查看详情</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="笔记评论数" align="center" prop="commentCount" width="100px" />
+      <el-table-column label="评论数" align="center" prop="commentCount" width="80px" />
-      <el-table-column label="笔记点赞数" align="center" prop="agreeCount" width="100px" />
+      <el-table-column label="点赞数" align="center" prop="agreeCount" width="80px" />
       <el-table-column label="发布状态" align="center" prop="">
         <template #default="scope">
           <span>{{ scope.row.status == 0 ? '未发布' : scope.row.status == 1 ? '审核中' : scope.row.status == 2 ? '已发布' : '草稿' }}</span>
@@ -27,40 +28,33 @@
       </el-table-column>
       <el-table-column label="操作人" align="center" prop="updateByName" />
       <el-table-column label="操作时间" align="center" prop="updateTime" width="180px" />
-      <el-table-column
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width"
-        label="操作"
+        v-if="props.parentName != 'dyUser' && props.parentName != 'scenic'">
-        align="center"
-        class-name="small-padding fixed-width"
-        v-if="props.parentName != 'dyUser' && props.parentName != 'scenic'"
-      >
         <template #default="scope">
           <el-tooltip content="编辑" placement="top">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:article:edit']"></el-button>
           </el-tooltip>
           <el-tooltip content="发布" placement="top">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:article:edit']"></el-button>
           </el-tooltip>
           <el-tooltip content="删除" placement="top">
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:article:remove']"></el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:article:remove']"></el-button>
           </el-tooltip>
         </template>
       </el-table-column>
     </el-table>
-    <pagination
+    <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
-      v-show="total > 0"
+      v-model:limit="queryParams.pageSize" @pagination="getTableList" />
-      id="table_page"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getTableList"
-    />
   </div>
 </template>
 
 <script setup lang="ts" name="noteList">
 import { ref, reactive, onMounted, nextTick } from 'vue';
 import { string } from 'vue-types';
-import { listByTagIdNotebook } from '@/api/manage/article';
+import { listByTagIdNotebook } from '@/api/manage/scenic';
 
 //导入父组件传递的值
 const props = defineProps({

src/views/manage/articleManage/index.vue

@@ -1,110 +1,102 @@
-<!-- 文章管理列表 -->
 <template>
   <div class="p-2">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]" id="search_div">
+      <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="70px">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="文章标题" prop="">
+            <el-form-item label="标题" prop="title">
-              <el-input class="inputWidth" placeholder="请输入文章标题" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="发布状态" prop="">
+            <el-form-item label="用户ID" prop="userId">
-              <el-select class="inputWidth" v-model="queryParams.status" placeholder="请选择发布状态" clearable>
+              <el-input v-model="queryParams.userId" placeholder="请输入用户ID" clearable @keyup.enter="handleQuery" />
-                <el-option v-for="dict in note_publish_list" :key="dict.value" :label="dict.label" :value="dict.value" />
+            </el-form-item>
-              </el-select>
+            <el-form-item label="标签id，以逗号分隔" prop="tagId">
+              <el-input v-model="queryParams.tagId" placeholder="请输入标签id，以逗号分隔" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="喜欢数" prop="agreeCount">
+              <el-input v-model="queryParams.agreeCount" placeholder="请输入喜欢数" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="评论数" prop="commentCount">
+              <el-input v-model="queryParams.commentCount" placeholder="请输入评论数" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-              <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:article:add']">新增</el-button>
-              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:article:edit']"
-                >修改</el-button
-              >
-              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:article:remove']"
-                >删除</el-button
-              >
             </el-form-item>
           </el-form>
         </el-card>
       </div>
     </transition>
 
-    <el-table :height="autoTableHeight" v-loading="loading" :data="articleList" @selection-change="handleSelectionChange" border>
+    <el-card shadow="never">
-      <el-table-column type="selection" width="55" align="center" />
+      <template #header>
-      <el-table-column label="ID" align="center" prop="id" v-if="true" />
+        <el-row :gutter="10" class="mb8">
-      <el-table-column label="文章标题" align="center" prop="" />
+          <el-col :span="1.5">
-      <el-table-column label="线路标签" align="center" prop="" />
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['manage:article:add']">新增</el-button>
-      <el-table-column label="文章内容" align="center" prop="" />
+          </el-col>
-      <el-table-column label="喜欢数" align="center" prop="" />
+          <el-col :span="1.5">
-      <el-table-column label="线路评论数" align="center" prop="" />
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:article:edit']">修改</el-button>
-      <el-table-column label="发布状态" align="center" prop="" />
+          </el-col>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-col :span="1.5">
-        <template #default="scope">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:article:remove']">删除</el-button>
-          <el-tooltip content="编辑" placement="top">
+          </el-col>
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
+          <el-col :span="1.5">
-          </el-tooltip>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:article:export']">导出</el-button>
-          <el-tooltip content="发布" placement="top">
+          </el-col>
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-          </el-tooltip>
+        </el-row>
-          <el-tooltip content="删除" placement="top">
+      </template>
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:article:remove']"></el-button>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-    </el-table>
 
-    <pagination
+      <el-table v-loading="loading" :data="articleList" @selection-change="handleSelectionChange">
-      v-show="total > 0"
+        <el-table-column type="selection" width="55" align="center" />
-      id="table_page"
+        <el-table-column label="ID" align="center" prop="id" v-if="true" />
-      :total="total"
+        <el-table-column label="标题" align="center" prop="title" />
-      v-model:page="queryParams.pageNum"
+        <el-table-column label="内容" align="center" prop="content" />
-      v-model:limit="queryParams.pageSize"
+        <el-table-column label="用户ID" align="center" prop="userId" />
-      @pagination="getList"
+        <el-table-column label="标签id，以逗号分隔" align="center" prop="tagId" />
-    />
+        <el-table-column label="喜欢数" align="center" prop="agreeCount" />
-    <!-- 添加或修改景点、租赁管理对话框 -->
+        <el-table-column label="评论数" align="center" prop="commentCount" />
+        <el-table-column label="状态" align="center" prop="status" />
+        <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:article:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:article:remove']"></el-button>
+            </el-tooltip>
+          </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" />
+    </el-card>
+    <!-- 添加或修改文章对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="articleFormRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="开放/营业" prop="isOpen">
+        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.isOpen" placeholder="请输入开放/营业" />
+          <el-input v-model="form.title" placeholder="请输入标题" />
         </el-form-item>
-        <el-form-item label="景点属性/商家属性" prop="attribute">
+        <el-form-item label="内容">
-          <el-input v-model="form.attribute" placeholder="请输入景点属性/商家属性" />
+          <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="省code" prop="province">
+        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.province" placeholder="请输入省code" />
+          <el-input v-model="form.userId" placeholder="请输入用户ID" />
         </el-form-item>
-        <el-form-item label="市/区" prop="city">
+        <el-form-item label="标签id，以逗号分隔" prop="tagId">
-          <el-input v-model="form.city" placeholder="请输入市/区" />
+          <el-input v-model="form.tagId" placeholder="请输入标签id，以逗号分隔" />
         </el-form-item>
-        <el-form-item label="个人简介" prop="remark">
+        <el-form-item label="喜欢数" prop="agreeCount">
-          <el-input v-model="form.remark" placeholder="请输入个人简介" />
+          <el-input v-model="form.agreeCount" placeholder="请输入喜欢数" />
         </el-form-item>
-        <el-form-item label="会员等级" prop="memberLevel">
+        <el-form-item label="评论数" prop="commentCount">
-          <el-input v-model="form.memberLevel" placeholder="请输入会员等级" />
+          <el-input v-model="form.commentCount" placeholder="请输入评论数" />
-        </el-form-item>
-        <el-form-item label="标签" prop="tagId">
-          <el-input v-model="form.tagId" placeholder="请输入标签" />
-        </el-form-item>
-        <el-form-item label="推荐语" prop="recommend">
-          <el-input v-model="form.recommend" placeholder="请输入推荐语" />
-        </el-form-item>
-        <el-form-item label="介绍" prop="intro">
-          <el-input v-model="form.intro" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="详细地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入详细地址" />
-        </el-form-item>
-        <el-form-item label="经度" prop="longitude">
-          <el-input v-model="form.longitude" placeholder="请输入经度" />
-        </el-form-item>
-        <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="form.latitude" placeholder="请输入纬度" />
-        </el-form-item>
-        <el-form-item label="排序" prop="orderNum">
-          <el-input v-model="form.orderNum" placeholder="请输入排序" />
-        </el-form-item>
-        <el-form-item label="景区等级" prop="level">
-          <el-input v-model="form.level" placeholder="请输入景区等级" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -122,7 +114,7 @@ import { listArticle, getArticle, delArticle, addArticle, updateArticle } from '
 import { ArticleVO, ArticleQuery, ArticleForm } from '@/api/manage/article/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const autoTableHeight = ref<number>(750);
+
 const articleList = ref<ArticleVO[]>([]);
 const buttonLoading = ref(false);
 const loading = ref(true);
@@ -131,10 +123,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const note_publish_list = ref([
+
-  { label: '已发布', value: 1 },
-  { label: '未发布', value: 2 }
-]);
 const queryFormRef = ref<ElFormInstance>();
 const articleFormRef = ref<ElFormInstance>();
 
@@ -145,135 +134,115 @@ const dialog = reactive<DialogOption>({
 
 const initFormData: ArticleForm = {
   id: undefined,
-  type: undefined,
+  title: undefined,
-  secondType: undefined,
+  content: undefined,
-  isOpen: undefined,
+  userId: undefined,
-  attribute: undefined,
-  status: undefined,
-  province: undefined,
-  city: undefined,
-  remark: undefined,
-  memberLevel: undefined,
   tagId: undefined,
-  recommend: undefined,
+  agreeCount: undefined,
-  intro: undefined,
+  commentCount: undefined,
-  address: undefined,
+  status: undefined,
-  longitude: undefined,
+}
-  latitude: undefined,
-  orderNum: undefined,
-  level: undefined
-};
 const data = reactive<PageData<ArticleForm, ArticleQuery>>({
-  form: { ...initFormData },
+  form: {...initFormData},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    type: undefined,
+    title: undefined,
-    secondType: undefined,
+    content: undefined,
-    isOpen: undefined,
+    userId: undefined,
-    attribute: undefined,
-    status: undefined,
-    province: undefined,
-    city: undefined,
-    memberLevel: undefined,
     tagId: undefined,
-    recommend: undefined,
+    agreeCount: undefined,
-    intro: undefined,
+    commentCount: undefined,
-    address: undefined,
+    status: undefined,
-    longitude: undefined,
+    params: {
-    latitude: undefined,
+    }
-    orderNum: undefined,
-    level: undefined,
-    params: {}
   },
   rules: {
-    id: [{ required: true, message: '景点ID/租赁ID/游艇ID不能为空', trigger: 'blur' }],
+    id: [
-    type: [{ required: true, message: '类别 景点-0、租赁-1 游艇-2不能为空', trigger: 'change' }],
+      { required: true, message: "ID不能为空", trigger: "blur" }
-    secondType: [{ required: true, message: '二级类别不能为空', trigger: 'change' }],
+    ],
-    isOpen: [{ required: true, message: '开放/营业不能为空', trigger: 'blur' }],
+    title: [
-    attribute: [{ required: true, message: '景点属性/商家属性不能为空', trigger: 'blur' }],
+      { required: true, message: "标题不能为空", trigger: "blur" }
-    status: [{ required: true, message: '状态 0-未发布 1-审核中 2-发布不能为空', trigger: 'change' }],
+    ],
-    province: [{ required: true, message: '省code不能为空', trigger: 'blur' }],
+    content: [
-    city: [{ required: true, message: '市/区不能为空', trigger: 'blur' }],
+      { required: true, message: "内容不能为空", trigger: "blur" }
-    remark: [{ required: true, message: '个人简介不能为空', trigger: 'blur' }],
+    ],
-    memberLevel: [{ required: true, message: '会员等级不能为空', trigger: 'blur' }],
+    userId: [
-    tagId: [{ required: true, message: '标签不能为空', trigger: 'blur' }],
+      { required: true, message: "用户ID不能为空", trigger: "blur" }
-    recommend: [{ required: true, message: '推荐语不能为空', trigger: 'blur' }],
+    ],
-    intro: [{ required: true, message: '介绍不能为空', trigger: 'blur' }],
+    tagId: [
-    address: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
+      { required: true, message: "标签id，以逗号分隔不能为空", trigger: "blur" }
-    longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
+    ],
-    latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }],
+    agreeCount: [
-    orderNum: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+      { required: true, message: "喜欢数不能为空", trigger: "blur" }
-    level: [{ required: true, message: '景区等级不能为空', trigger: 'blur' }]
+    ],
+    commentCount: [
+      { required: true, message: "评论数不能为空", trigger: "blur" }
+    ],
+    status: [
+      { required: true, message: "状态不能为空", trigger: "change" }
+    ],
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
-onMounted(() => {
+
-  getList();
+/** 查询文章列表 */
-  nextTick(() => {
-    autoTableHeight.value = proxy?.autoTableHeight();
-  });
-  window.onresize = () => {
-    autoTableHeight.value = proxy?.autoTableHeight();
-  };
-});
-/** 查询景点、租赁管理列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listArticle(queryParams.value).finally(() => (loading.value = false));
+  const res = await listArticle(queryParams.value);
   articleList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-};
+}
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-};
+}
 
 /** 表单重置 */
 const reset = () => {
-  form.value = { ...initFormData };
+  form.value = {...initFormData};
   articleFormRef.value?.resetFields();
-};
+}
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-};
+}
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-};
+}
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: ArticleVO[]) => {
-  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?: ArticleVO) => {
   reset();
-  const _id = row?.id || ids.value[0];
+  const _id = row?.id || ids.value[0]
   const res = await getArticle(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = '修改景点、租赁管理';
+  dialog.title = "修改文章";
-};
+}
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -281,44 +250,34 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateArticle(form.value).finally(() => (buttonLoading.value = false));
+        await updateArticle(form.value).finally(() =>  buttonLoading.value = false);
       } else {
-        await addArticle(form.value).finally(() => (buttonLoading.value = false));
+        await addArticle(form.value).finally(() =>  buttonLoading.value = false);
       }
-      proxy?.$modal.msgSuccess('操作成功');
+      proxy?.$modal.msgSuccess("操作成功");
       dialog.visible = false;
       await getList();
     }
   });
-};
+}
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: ArticleVO) => {
   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 delArticle(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
+  proxy?.$modal.msgSuccess("删除成功");
   await getList();
-};
+}
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download(
+  proxy?.download('manage/article/export', {
-    'system/article/export',
+    ...queryParams.value
-    {
+  }, `article_${new Date().getTime()}.xlsx`)
-      ...queryParams.value
+}
-    },
+
-    `article_${new Date().getTime()}.xlsx`
+onMounted(() => {
-  );
+  getList();
-};
+});
 </script>
-<style lang="scss" scoped>
-.el-card :deep(.el-card__body) {
-  padding-bottom: 0px !important;
-}
-#table_page {
-  height: 50px !important;
-  margin-top: 10px !important;
-  padding-bottom: 10px !important;
-}
-</style>

src/views/manage/scenic/index.vue

@@ -1,15 +1,18 @@
 <!-- 景点列表 -->
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+      :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]" id="search_div">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="70px">
             <el-form-item :label="`${queryParams.type == '0' ? '景点' : '商家'}名称`" prop="name">
-              <el-input class="inputWidth" v-model="queryParams.name" placeholder="请输入景点名称" clearable @keyup.enter="handleQuery" />
+              <el-input class="inputWidth" v-model="queryParams.name" placeholder="请输入景点名称" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="推荐语" prop="recommend">
-              <el-input class="inputWidth" v-model="queryParams.recommend" placeholder="请输入推荐语" clearable @keyup.enter="handleQuery" />
+              <el-input class="inputWidth" v-model="queryParams.recommend" placeholder="请输入推荐语" clearable
+                @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="发布状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="请选择发布状态" clearable class="inputWidth">
@@ -21,7 +24,8 @@
             </el-form-item>
             <el-form-item label="景点等级" prop="level" v-if="queryParams.type == '0'">
               <el-select v-model="queryParams.level" placeholder="请选择等级" clearable class="inputWidth">
-                <el-option v-for="item in levelList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+                <el-option v-for="item in levelList" :key="item.value" :label="item.label"
+                  :value="item.value"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="是否开放" prop="isOpen">
@@ -37,27 +41,27 @@
               </el-select>
             </el-form-item>
             <el-form-item label="标签" prop="tagId">
-              <el-select class="inputWidth" multiple v-model="queryParams.tagId" placeholder="请选择标签" clearable>
+              <el-select class="inputWidth" filterable v-model="queryParams.tagId" placeholder="请选择标签" clearable>
                 <el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title" :value="dict.id" />
               </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>
-              <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:article:add']">新增</el-button>
+              <el-button type="primary" plain icon="Plus" @click="handleAdd"
-              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:article:edit']"
+                v-hasPermi="['system:article:add']">新增</el-button>
-                >修改</el-button
+              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-              >
+                v-hasPermi="['system:article:edit']">修改</el-button>
-              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:article:remove']"
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-                >删除</el-button
+                v-hasPermi="['system:article:remove']">删除</el-button>
-              >
             </el-form-item>
           </el-form>
         </el-card>
       </div>
     </transition>
 
-    <el-table :height="autoTableHeight" v-loading="loading" :data="articleList" @selection-change="handleSelectionChange" border>
+    <el-table :height="autoTableHeight" v-loading="loading" :data="articleList"
+      @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" fixed v-if="false" width="50px" />
       <el-table-column label="景点名称" align="center" prop="name" fixed v-if="queryParams.type == '0'" width="180px" />
@@ -127,30 +131,24 @@
       <!-- <el-table-column label="介绍" align="center" prop="intro" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="170px">
         <template #default="scope">
-          <el-button link type="primary" v-if="scope.row.status == 0" @click="updateRow(scope.row, '2')" v-hasPermi="['system:article:edit']"
+          <el-button link type="primary" v-if="scope.row.status == 0" @click="updateRow(scope.row, '2')"
-            >发布</el-button
+            v-hasPermi="['system:article:edit']">发布</el-button>
-          >
+          <el-button link type="primary" v-if="scope.row.status == 2" @click="updateRow(scope.row, '0')"
-          <el-button link type="primary" v-if="scope.row.status == 2" @click="updateRow(scope.row, '0')" v-hasPermi="['system:article:edit']"
+            v-hasPermi="['system:article:edit']">撤销发布</el-button>
-            >撤销发布</el-button
-          >
           <el-tooltip content="修改" placement="top">
-            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:article:edit']"></el-button>
           </el-tooltip>
           <el-tooltip content="删除" placement="top">
-            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:article:remove']"></el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:article:remove']"></el-button>
           </el-tooltip>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" id="table_page" :total="total" v-model:page="queryParams.pageNum"
-      v-show="total > 0"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
-      id="table_page"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
     <!-- 添加或修改景点、租赁管理对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="900px" append-to-body>
       <el-form ref="articleFormRef" :model="form" :rules="rules" label-width="80px">
@@ -189,22 +187,14 @@
         <el-row :gutter="10">
           <el-col :span="12">
             <el-form-item :label="queryParams.type == '0' ? '景点icon' : '商家icon'" prop="icon">
-              <el-upload
+              <el-upload class="upload-demo el-upload" drag :limit="1" :headers="upload.headers" :action="uploadImgUrl"
-                class="upload-demo el-upload"
-                drag
-                :limit="1"
-                :headers="upload.headers"
-                :action="uploadImgUrl"
                 v-model:file-list="fileList_icon"
                 :on-success="(res, file) => returnContractSuccess('oss_icon', res, file)"
-                :on-preview="handlePictureCardPreview"
+                :on-preview="handlePictureCardPreview" :on-remove="
-                :on-remove="
                   (res, file) => {
                     handleRemove(res, file, 'oss_icon');
                   }
-                "
+                " list-type="picture-card">
-                list-type="picture-card"
-              >
                 <el-icon class="el-icon--upload" :class="{}">
                   <Plus />
                 </el-icon>
@@ -225,7 +215,8 @@
           <el-col :span="12">
             <el-form-item label="标签" prop="tagId_copy">
               <el-select class="inputWidth" v-model="form.tagId_copy" multiple filterable placeholder="请选择标签" clearable>
-                <el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title" :value="String(dict.id)" />
+                <el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title"
+                  :value="String(dict.id)" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -241,27 +232,15 @@
           <el-col :span="24">
             <el-form-item label="地理位置" prop="introduce">
               <!-- <el-input v-model="searchLocation" type="text" placeholder="请输入地址信息" clearable /> -->
-              <el-input
+              <el-input v-model="searchLocation" placeholder="请输入地址信息" class="input-with-select"
-                v-model="searchLocation"
+                @keyup.enter="debouncedSearch(searchLocation)">
-                placeholder="请输入地址信息"
-                class="input-with-select"
-                @keyup.enter="debouncedSearch(searchLocation)"
-              >
                 <template #append>
                   <el-button @click="debouncedSearch(searchLocation)" :icon="Search" />
                 </template>
               </el-input>
             </el-form-item>
-            <tlbs-map
+            <tlbs-map style="margin-left: 80px" ref="map" api-key="	
-              style="margin-left: 80px"
+6XFBZ-SAVLT-JGIX2-VOLMK-6S2H3-XUBGO" :center="center" :zoom="zoom" :control="control" @click="onClick">
-              ref="map"
-              api-key="	
-6XFBZ-SAVLT-JGIX2-VOLMK-6S2H3-XUBGO"
-              :center="center"
-              :zoom="zoom"
-              :control="control"
-              @click="onClick"
-            >
               <tlbs-multi-marker :geometries="geometries" :styles="styles" :options="options" />
             </tlbs-map>
           </el-col>
@@ -278,22 +257,14 @@
         <el-row :gutter="10">
           <el-col :span="24">
             <el-form-item :label="`${queryParams.type == '0' ? '景点' : '商家'}照片/视频`" prop="">
-              <el-upload
+              <el-upload class="upload-demo el-upload" drag :headers="upload.headers" :action="uploadImgUrl"
-                class="upload-demo el-upload"
+                v-model:file-list="fileList_1" multiple
-                drag
-                :headers="upload.headers"
-                :action="uploadImgUrl"
-                v-model:file-list="fileList_1"
-                multiple
                 :on-success="(res, file) => returnContractSuccess('oss_1', res, file)"
-                :on-preview="handlePictureCardPreview"
+                :on-preview="handlePictureCardPreview" :on-remove="
-                :on-remove="
                   (res, file) => {
                     handleRemove(res, file, 'oss_1');
                   }
-                "
+                " list-type="picture-card">
-                list-type="picture-card"
-              >
                 <el-icon class="el-icon--upload" :class="{}">
                   <Plus />
                 </el-icon>
@@ -308,13 +279,8 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button :loading="buttonLoading" @click="submitForm('preview')" style="float: left">预 览</el-button>
-          <el-button
+          <el-button :loading="buttonLoading" @click="submitForm('draft')" style="float: left"
-            :loading="buttonLoading"
+            v-if="form.status != '0' && form.status != '1' && form.status != '2'">存草稿</el-button>
-            @click="submitForm('draft')"
-            style="float: left"
-            v-if="form.status != '0' && form.status != '1' && form.status != '2'"
-            >存草稿</el-button
-          >
           <el-button @click="cancel('submit')">取 消</el-button>
           <el-button :loading="buttonLoading" type="primary" @click="submitForm('submit')">确 定</el-button>
         </div>
@@ -373,7 +339,8 @@
           <el-col :span="12">
             <el-form-item label="标签" prop="tagId">
               <el-select class="inputWidth" v-model="form.tagId" placeholder="请选择标签" clearable disabled>
-                <el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title" :value="String(dict.id)" />
+                <el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title"
+                  :value="String(dict.id)" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -419,14 +386,8 @@
     </el-dialog>
     <!-- 相关笔记 -->
     <el-dialog title="相关笔记" v-model="noteBookVisible" width="1200px" append-to-body>
-      <noteList
+      <noteList :autoTableHeight="300" :sys_user_tagOptions="sys_user_tagOptions" :noteBookTagIds="noteBookTagIds"
-        :autoTableHeight="300"
+        parentName="scenic" :type="queryParams.type" :id="form.id"></noteList>
-        :sys_user_tagOptions="sys_user_tagOptions"
-        :noteBookTagIds="noteBookTagIds"
-        parentName="scenic"
-        :type="queryParams.type"
-        :id="form.id"
-      ></noteList>
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="cancel('noteBookVisible')">关 闭</el-button>
@@ -438,9 +399,8 @@
 
 <script setup name="Article" lang="ts">
 import { listTag } from '@/api/manage/tag';
-
+import { listArticle, getArticle, delArticle, addArticle, updateArticle, listByTagIdNotebook } from '@/api/manage/scenic';
-import { listArticle, getArticle, delArticle, addArticle, updateArticle, listByTagIdNotebook } from '@/api/manage/article';
+import { ArticleVO, ArticleQuery, ArticleForm } from '@/api/manage/scenic/types';
-import { ArticleVO, ArticleQuery, ArticleForm } from '@/api/manage/article/types';
 import { useRouter } from 'vue-router';
 import { getToken } from '@/utils/auth';
 import { debounce } from '@/utils/debounce.js';
@@ -504,6 +464,7 @@ const initFormData: ArticleForm = {
   province: '',
   city: '',
   region: '',
+  regionCode: '',
   remark: undefined,
   memberLevel: undefined,
   tagId: undefined,
@@ -654,6 +615,7 @@ const performSearch = async (text) => {
         form.value.latitude = data.result.location.lat;
         form.value.longitude = data.result.location.lng;
         form.value.region = data.result.ad_info.adcode; //行政区划编码
+        form.value.regionCode = data.result.ad_info.adcode; //行政区划编码
 
         // form.value.province = data.result.address_components.province;
         // form.value.city = data.result.address_components.city;
@@ -685,6 +647,7 @@ const onClick = (e: any) => {
         // form.value.province = data.result.address_component.province;
         // form.value.city = data.result.address_component.city;
         form.value.region = data.result.ad_info.adcode; //行政区划编码
+        form.value.regionCode = data.result.ad_info.adcode; //行政区划编码
         center.value.lat = data.result.location.lat;
         center.value.lng = data.result.location.lng;
         searchLocation.value = data.result.formatted_addresses.recommend;
@@ -702,6 +665,14 @@ const getList = async () => {
     queryParams.value.tagId = queryParams.value.tagId.toString();
   }
   const res = await listArticle(queryParams.value).finally(() => (loading.value = false));
+  res.rows.forEach((element: any) => {
+    if (element.region == null) {
+      element.region = element.city;
+      element.regionCode = element.city;
+    } else {
+      element.regionCode = element.region;
+    }
+  });
   articleList.value = res.rows;
   total.value = res.total;
   loading.value = false;
@@ -804,6 +775,9 @@ const handleUpdate = async (row?: any) => {
   res.data.tagId_copy = res.data.tagId?.split(',');
   if (res.data.region == null) {
     res.data.region = res.data.city;
+    res.data.regionCode = res.data.city;
+  } else {
+    res.data.regionCode = res.data.region;
   }
   Object.assign(form.value, res.data);
   dialog.visible = true;
@@ -958,15 +932,18 @@ const handleRemove = (uploadFile, uploadFiles, type) => {
 .el-card :deep(.el-card__body) {
   padding-bottom: 0px !important;
 }
+
 #table_page {
   height: 50px !important;
   margin-top: 10px !important;
   padding-bottom: 10px !important;
 }
+
 .el-upload {
   :deep(.el-upload-dragger) {
     padding: 0;
     height: 100%;
+
     i {
       top: 30%;
       left: 50%;