diff --git a/src/api/manage/article/types.ts b/src/api/manage/article/types.ts
index ba83047..4e6d498 100644
--- a/src/api/manage/article/types.ts
+++ b/src/api/manage/article/types.ts
@@ -97,6 +97,19 @@ export interface ArticleForm extends BaseEntity {
    * 景点名称 商家名称
    */
   name: string;
+  /**
+   * 详细地址
+   */
+  address?: string;
+  /**
+   * 经度
+   */
+  longitude?: number;
+
+  /**
+   * 纬度
+   */
+  latitude?: number;
   /**
    * 联系电话
    */
@@ -166,21 +179,6 @@ export interface ArticleForm extends BaseEntity {
    */
   intro?: string;
 
-  /**
-   * 详细地址
-   */
-  address?: string;
-
-  /**
-   * 经度
-   */
-  longitude?: number;
-
-  /**
-   * 纬度
-   */
-  latitude?: number;
-
   /**
    * 排序
    */
diff --git a/src/utils/ruoyi.ts b/src/utils/ruoyi.ts
index a91fdd6..27458f5 100644
--- a/src/utils/ruoyi.ts
+++ b/src/utils/ruoyi.ts
@@ -251,7 +251,7 @@ export const autoTableHeight = () => {
   let allHeight = window.innerHeight;
   let element = [document.getElementById('topBar'), document.getElementById('search_div'), document.getElementById('table_page')];
   let domHeight = element.map((item) => (item.offsetHeight ? item.offsetHeight : 0));
-  let tableHeight = allHeight - domHeight[0] - domHeight[1] - 80 - 10;
+  let tableHeight = allHeight - domHeight[0] - domHeight[1] - 80 - 17;
   console.log('全局计算表格高度：', tableHeight, allHeight, domHeight[0], domHeight[1], domHeight[2]);
   return tableHeight;
 };
diff --git a/src/views/manage/scenic/index.vue b/src/views/manage/scenic/index.vue
index b81dece..34f67df 100644
--- a/src/views/manage/scenic/index.vue
+++ b/src/views/manage/scenic/index.vue
@@ -8,17 +8,19 @@
             <el-form-item :label="`${queryParams.type == '0' ? '景点' : '商家'}名称`" prop="name">
               <el-input class="inputWidth" v-model="queryParams.name" placeholder="请输入景点名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="推荐语" prop="">
-              <el-input class="inputWidth" placeholder="请输入推荐语" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="推荐语" prop="recommend">
+              <el-input class="inputWidth" v-model="queryParams.recommend" placeholder="请输入推荐语" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="发布状态" prop="">
+            <el-form-item label="发布状态" prop="status">
               <el-select v-model="queryParams.status" placeholder="请选择发布状态" clearable class="inputWidth">
                 <el-option label="已发布" value="1"></el-option>
                 <el-option label="未发布" value="0"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="景点等级" prop="" v-if="queryParams.type == '0'">
-              <el-input class="inputWidth" placeholder="请输入提示语" clearable @keyup.enter="handleQuery" />
+            <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-select>
             </el-form-item>
             <el-form-item label="是否开放" prop="isOpen">
               <el-select v-model="queryParams.isOpen" placeholder="请选择开放状态" clearable class="inputWidth">
@@ -28,12 +30,15 @@
             </el-form-item>
             <el-form-item :label="`${queryParams.type == '0' ? '景点' : '商家'}属性`" prop="attribute">
               <el-select v-model="queryParams.attribute" placeholder="请选择属性" clearable class="inputWidth">
-                <el-option label="标志性景点" value="1"></el-option>
-                <el-option label="非标志性景点" value="0"></el-option>
+                <el-option :label="queryParams.type == '0' ? '标志性景点' : '标志性商家'" value="1"></el-option>
+                <el-option :label="queryParams.type == '0' ? '非标志性景点' : '非标志性商家'" value="0"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标签" prop="attribute">
-              <el-input class="inputWidth" v-model="queryParams.tagId" placeholder="请输入景点标签" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="标签" prop="tagId">
+              <!-- <el-input class="inputWidth" v-model="queryParams.tagId" placeholder="请输入景点标签" clearable @keyup.enter="handleQuery" /> -->
+              <el-select class="inputWidth" 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>
@@ -84,7 +89,11 @@
       </el-table-column>
       <el-table-column label="地址信息" align="center" prop="address" width="180px" />
       <el-table-column label="联系电话" align="center" prop="number" width="120px" />
-      <el-table-column label="标签" align="center" prop="tagId" />
+      <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="recommend" width="180px" />
       <el-table-column :label="queryParams.type == '0' ? '景点详情' : '详情'" align="center" prop="remark">
         <template #default="scope">
@@ -93,7 +102,11 @@
       </el-table-column>
       <el-table-column label="喜欢数量" align="center" prop="likeNumber" />
       <el-table-column label="收藏数量" align="center" prop="collectNumber" />
-      <el-table-column label="相关笔记" align="center" prop="noteNumber" />
+      <el-table-column label="相关笔记" align="center" prop="noteNumber">
+        <template #default="scope">
+          <el-button link type="primary" @click="handleNote(scope.row)">{{ scope.row.noteNumber }}</el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="笔记评论数" align="center" prop="commentNumber" width="90px" />
       <el-table-column label="笔记点赞数" align="center" prop="likeNoteNumber" width="90px" />
       <!--  0-未发布 1-审核中 2-发布 -->
@@ -103,8 +116,14 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="介绍" align="center" prop="intro" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="120px">
+      <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
+          >
+          <el-button link type="primary" v-if="scope.row.status == 2" @click="updateRow(scope.row, '0')" v-hasPermi="['system:article:edit']"
+            >撤销发布</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-tooltip>
@@ -167,7 +186,7 @@
           <el-col :span="12">
             <el-form-item label="标签" prop="tagId">
               <el-select class="inputWidth" v-model="form.tagId" placeholder="请选择标签" clearable>
-                <el-option v-for="dict in sys_user_tagOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
+                <el-option v-for="dict in sys_user_tagOptions" :key="dict.id" :label="dict.title" :value="dict.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -180,9 +199,19 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="20">
+          <el-col :span="24">
             <el-form-item label="地理位置" prop="introduce">
-              <el-input v-model="searchLocation" type="text" placeholder="请输入地址信息" @keyup.enter="debouncedSearch" />
+              <!-- <el-input v-model="searchLocation" type="text" placeholder="请输入地址信息" clearable /> -->
+              <el-input
+                v-model="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
               style="margin-left: 80px"
@@ -198,6 +227,15 @@
             </tlbs-map>
           </el-col>
         </el-row>
+        <el-form-item label="详细地址" prop="address" style="margin-top: 15px">
+          <el-input v-model="form.address" placeholder="输入地理位置或点击度图上的地点" disabled />
+        </el-form-item>
+        <el-form-item label="经度" prop="longitude">
+          <el-input v-model="form.longitude" placeholder="输入地理位置或点击度图上的地点" disabled />
+        </el-form-item>
+        <el-form-item label="纬度" prop="latitude">
+          <el-input v-model="form.latitude" placeholder="输入地理位置或点击度图上的地点" disabled />
+        </el-form-item>
         <el-row :gutter="10">
           <el-col :span="24">
             <el-form-item :label="`${queryParams.type == '0' ? '景点' : '商家'}照片/视频`" prop="">
@@ -224,15 +262,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <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="`${queryParams.type == '0' ? '景点' : '商家'}简介`" prop="intro">
           <editor v-model="form.intro" :min-height="150" :height="200" />
         </el-form-item>
@@ -248,72 +277,16 @@
 </template>
 
 <script setup name="Article" lang="ts">
+import { listTag } from '@/api/manage/tag';
+
 import { listArticle, getArticle, delArticle, addArticle, updateArticle, geocoder } from '@/api/manage/article';
 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';
 import { jsonp } from 'vue-jsonp';
+import { Search } from '@element-plus/icons-vue';
 import type { UploadProps, UploadUserFile } from 'element-plus';
-const map = ref(null);
-const center = ref({ lat: 39.145902, lng: 117.17546 });
-const zoom = ref(20);
-const onClick = (e: Event) => {
-  console.log(e);
-};
-const control = reactive({
-  scale: {},
-  zoom: {
-    position: 'topLeft'
-  }
-});
-const searchLocation = ref(''); // 搜索地点
-const geometries = ref([{ styleId: 'marker', position: { lat: 39.145902, lng: 117.17546 } }]);
-const styles = reactive({
-  marker: {
-    width: 20,
-    height: 30,
-    anchor: { x: 10, y: 30 }
-  }
-});
-const options = reactive({
-  minZoom: 5,
-  maxZoom: 20
-});
-
-//输入位置，搜索位置
-const performSearch = async (text) => {
-  // 这里简单模拟延迟，模拟真实的异步请求耗时
-  // await new Promise((resolve) => setTimeout(resolve, 500));
-  // 假设这里根据输入的文本去查找匹配的数据，实际中替换成真实逻辑
-  if (text === '') {
-    console.log('搜索内容为空');
-  } else {
-    console.log('搜索内容为：', text);
-    // 调用腾讯地图API进行搜索，并展示在地图上
-    // geocoder(text).then((result) => {
-    //   console.log(result);
-    // });
-    jsonp('https://apis.map.qq.com/ws/geocoder/v1', {
-      address: text,
-      key: '6XFBZ-SAVLT-JGIX2-VOLMK-6S2H3-XUBGO',
-      output: 'jsonp'
-    }).then((data) => {
-      console.log(data);
-      center.value.lat = data.result.location.lat;
-      center.value.lng = data.result.location.lng;
-      geometries.value = [{ styleId: 'marker', position: { lat: data.result.location.lat, lng: data.result.location.lng } }];
-      console.log(map.value);
-    });
-  }
-};
-
-const debouncedSearch = debounce(performSearch, 300); // 创建防抖后的搜索函数，延迟设为300毫秒
-
-// 监听输入框内容变化，调用防抖后的搜索函数
-watch(searchLocation, (newValue) => {
-  debouncedSearch(newValue);
-});
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const uploadImgUrl = ref(baseUrl + '/resource/oss/upload'); // 上传的图片服务器地址
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -326,11 +299,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const sys_user_tagOptions = ref([
-  { label: '标签1', value: 1 },
-  { label: '标签2', value: 2 },
-  { label: '标签3', value: 3 }
-]);
+const sys_user_tagOptions = ref([]); //标签库
 const fileList_1 = ref<UploadUserFile[]>([]);
 const queryFormRef = ref<ElFormInstance>();
 const articleFormRef = ref<ElFormInstance>();
@@ -353,6 +322,13 @@ const upload = reactive({
     Authorization: 'Bearer ' + getToken()
   }
 });
+const levelList = ref([
+  { label: 'A级', value: 1 },
+  { label: 'AA级', value: 2 },
+  { label: 'AAA级', value: 3 },
+  { label: 'AAAA级', value: 4 },
+  { label: 'AAAAA级', value: 5 }
+]);
 const initFormData: ArticleForm = {
   name: undefined,
   id: undefined,
@@ -420,6 +396,32 @@ const data = reactive<PageData<ArticleForm, ArticleQuery>>({
 });
 
 const { queryParams, form, rules } = toRefs(data);
+const map = ref(null);
+const center = ref({ lat: form.value.latitude || 39.145902, lng: form.value.longitude || 117.17546 });
+const zoom = ref(20);
+const control = reactive({
+  scale: {},
+  zoom: {
+    position: 'topLeft'
+  }
+});
+const searchLocation = ref(''); // 搜索地点
+const geometries = ref([{ styleId: 'marker', position: { lat: form.value.latitude || 39.145902, lng: form.value.longitude || 117.17546 } }]);
+const styles = reactive({
+  marker: {
+    width: 20,
+    height: 30,
+    anchor: { x: 10, y: 30 }
+  }
+});
+const options = reactive({
+  minZoom: 5,
+  maxZoom: 20
+});
+// 监听输入框内容变化，调用防抖后的搜索函数
+watch(searchLocation, (newValue) => {
+  // debouncedSearch(newValue);
+});
 // 路由监听================================================
 let router = useRouter();
 watch(
@@ -434,6 +436,7 @@ watch(
   { immediate: true }
 );
 onMounted(() => {
+  getTag(); //标签库
   getList();
   nextTick(() => {
     autoTableHeight.value = proxy?.autoTableHeight();
@@ -442,6 +445,61 @@ onMounted(() => {
     autoTableHeight.value = proxy?.autoTableHeight();
   };
 });
+const getTag = async () => {
+  const res = await listTag({ pageNum: 1, pageSize: 1000 });
+  sys_user_tagOptions.value = res.rows; //标签库
+};
+//输入位置，搜索位置
+const performSearch = async (text) => {
+  // 这里简单模拟延迟，模拟真实的异步请求耗时
+  // await new Promise((resolve) => setTimeout(resolve, 500));
+  // 假设这里根据输入的文本去查找匹配的数据，实际中替换成真实逻辑
+  if (text === '') {
+    console.log('搜索内容为空');
+  } else {
+    console.log('搜索内容为：', text);
+    // 调用腾讯地图API进行搜索，并展示在地图上
+    // geocoder(text).then((result) => {
+    //   console.log(result);
+    // });
+    jsonp(`https://apis.map.qq.com/ws/geocoder/v1/?address=${text}&key=${'6XFBZ-SAVLT-JGIX2-VOLMK-6S2H3-XUBGO'}&output=jsonp`, {}).then((data) => {
+      console.log(data);
+      if (data.status == 0) {
+        center.value.lat = data.result.location.lat;
+        center.value.lng = data.result.location.lng;
+        form.value.address = data.result.address;
+        form.value.latitude = data.result.location.lat;
+        form.value.longitude = data.result.location.lng;
+        geometries.value = [{ styleId: 'marker', position: { lat: data.result.location.lat, lng: data.result.location.lng } }];
+      } else if (data.status == 348) {
+        //地址信息不明确，需弹出提示
+        proxy?.$modal.msgError('未查询到地点，请补充详细地址信息');
+        return;
+      }
+    });
+  }
+};
+// 点击地点，获取经纬度及地址信息
+const onClick = (e: any) => {
+  jsonp(
+    `https://apis.map.qq.com/ws/geocoder/v1/?key=${'6XFBZ-SAVLT-JGIX2-VOLMK-6S2H3-XUBGO'}&location=${e.latLng.lat},${e.latLng.lng}&output=jsonp`,
+    {}
+  ).then((data) => {
+    if (data.status == 0) {
+      if (form.value) {
+        form.value.address = data.result.address;
+        form.value.latitude = data.result.location.lat;
+        form.value.longitude = data.result.location.lng;
+        center.value.lat = data.result.location.lat;
+        center.value.lng = data.result.location.lng;
+        searchLocation.value = data.result.formatted_addresses.recommend;
+        geometries.value = [{ styleId: 'marker', position: { lat: data.result.location.lat, lng: data.result.location.lng } }];
+      }
+    }
+  });
+};
+const debouncedSearch = debounce(performSearch, 300); // 创建防抖后的搜索函数，延迟设为300毫秒
+
 /** 查询景点、租赁管理列表 */
 const getList = async () => {
   loading.value = true;
@@ -459,6 +517,7 @@ const cancel = () => {
 
 /** 表单重置 */
 const reset = () => {
+  searchLocation.value = '';
   form.value = { ...initFormData };
   articleFormRef.value?.resetFields();
 };
@@ -505,6 +564,17 @@ const formatLevel = (level: number | string) => {
       break;
   }
 };
+/**
+ * 标签格式化
+ */
+const formatTag = (tagId: string) => {
+  for (let i = 0; i < sys_user_tagOptions.value.length; i++) {
+    const element = sys_user_tagOptions.value[i];
+    if (element.id == tagId) {
+      return element.title;
+    }
+  }
+};
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
@@ -523,7 +593,9 @@ const handleUpdate = async (row?: ArticleVO) => {
   const res = await getArticle(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = '修改景点、租赁管理';
+  dialog.title = queryParams.value.type == '0' ? '修改景点' : '修改商家';
+  center.value = { lat: row.latitude, lng: row.longitude };
+  geometries.value = [{ styleId: 'marker', position: { lat: row.latitude, lng: row.longitude } }];
 };
 
 /** 新增景点，商家提交按钮 */
@@ -548,11 +620,23 @@ const submitForm = () => {
     }
   });
 };
-
+/**
+ *
+ * @param row 发布，撤销发布
+ * @param type
+ */
+const updateRow = async (row: any, type: string) => {
+  await proxy?.$modal.confirm('是否确认' + (type == '0' ? '撤销发布' : '发布') + '名称为"' + row.name + '"的数据项？');
+  row.status = type;
+  buttonLoading.value = true;
+  await updateArticle(row).finally(() => (buttonLoading.value = false));
+  proxy?.$modal.msgSuccess('操作成功');
+  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('删除成功');
   await getList();
@@ -578,7 +662,7 @@ const returnContractSuccess = (type: string, response: any, uploadFile: UploadFi
       mediaType: type,
       mediaOssId: response.data.ossId
     };
-    form.mediaBoList.push(obj);
+    form.value.mediaBoList.push(obj);
   }
 };
 /**
@@ -597,9 +681,9 @@ const handlePictureCardPreview: UploadProps['onPreview'] = (uploadFile) => {
  */
 const handleRemove = (uploadFile, uploadFiles, type) => {
   console.log(uploadFile, uploadFiles, type);
-  form.mediaBoList.forEach((item, index) => {
+  form.value.mediaBoList.forEach((item, index) => {
     if (type == item.mediaType) {
-      form.mediaBoList.splice(index, 1);
+      form.value.mediaBoList.splice(index, 1);
     }
   });
 };
diff --git a/src/views/manage/tag/index.vue b/src/views/manage/tag/index.vue
index 2328cc1..42f9840 100644
--- a/src/views/manage/tag/index.vue
+++ b/src/views/manage/tag/index.vue
@@ -1,68 +1,61 @@
+<!-- 标签管理 -->
 <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]">
+      <div v-show="showSearch" class="mb-[10px]" id="search_div">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="标签名称" prop="title">
               <el-input v-model="queryParams.title" placeholder="请输入标签名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="排序" prop="sort">
+            <!-- <el-form-item label="排序" prop="sort">
               <el-input v-model="queryParams.sort" placeholder="请输入排序" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+            </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="['manage:tag:add']">新增</el-button>
+              <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:tag:edit']">修改</el-button>
+              <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:tag:remove']"
+                >删除</el-button
+              >
             </el-form-item>
           </el-form>
         </el-card>
       </div>
     </transition>
 
-    <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:tag:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['manage:tag:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['manage:tag:remove']">删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['manage:tag:export']">导出</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-      </template>
+    <el-table v-loading="loading" :height="autoTableHeight" :data="tagList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="标签ID" align="center" prop="id" v-if="false" width="70px" />
+      <el-table-column label="标签名称" align="center" prop="title" />
+      <el-table-column label="排序" align="center" prop="sort" />
+      <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:tag:edit']"></el-button>
+          </el-tooltip>
+          <el-tooltip content="删除" placement="top">
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:tag:remove']"></el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
 
-      <el-table v-loading="loading" :data="tagList" @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="标签名称" align="center" prop="title" />
-        <el-table-column label="排序" align="center" prop="sort" />
-        <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:tag:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['manage:tag: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>
+    <pagination
+      v-show="total > 0"
+      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="500px" append-to-body>
       <el-form ref="tagFormRef" :model="form" :rules="rules" label-width="80px">
@@ -70,7 +63,8 @@
           <el-input v-model="form.title" placeholder="请输入标签名称" />
         </el-form-item>
         <el-form-item label="排序" prop="sort">
-          <el-input v-model="form.sort" placeholder="请输入排序" />
+          <!-- <el-input v-model="form.sort" placeholder="请输入排序" /> -->
+          <el-input-number v-model="form.sort" :min="1" :max="1000" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -97,7 +91,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-
+const autoTableHeight = ref<number>(750);
 const queryFormRef = ref<ElFormInstance>();
 const tagFormRef = ref<ElFormInstance>();
 
@@ -109,33 +103,34 @@ const dialog = reactive<DialogOption>({
 const initFormData: TagForm = {
   id: undefined,
   title: undefined,
-  sort: undefined,
-}
+  sort: 0
+};
 const data = reactive<PageData<TagForm, TagQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     title: undefined,
     sort: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
-    id: [
-      { required: true, message: "标签ID不能为空", trigger: "blur" }
-    ],
-    title: [
-      { required: true, message: "标签名称不能为空", trigger: "blur" }
-    ],
-    sort: [
-      { required: true, message: "排序不能为空", trigger: "blur" }
-    ],
+    id: [{ required: true, message: '标签ID不能为空', trigger: 'blur' }],
+    title: [{ required: true, message: '标签名称不能为空', trigger: 'blur' }],
+    sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
   }
 });
 
 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;
@@ -143,55 +138,55 @@ const getList = async () => {
   tagList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   tagFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: TagVO[]) => {
-  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?: TagVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getTag(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改标签";
-}
+  dialog.title = '修改标签';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -199,34 +194,44 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateTag(form.value).finally(() =>  buttonLoading.value = false);
+        await updateTag(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addTag(form.value).finally(() =>  buttonLoading.value = false);
+        await addTag(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: TagVO) => {
   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 delTag(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('manage/tag/export', {
-    ...queryParams.value
-  }, `tag_${new Date().getTime()}.xlsx`)
-}
-
-onMounted(() => {
-  getList();
-});
+  proxy?.download(
+    'manage/tag/export',
+    {
+      ...queryParams.value
+    },
+    `tag_${new Date().getTime()}.xlsx`
+  );
+};
 </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>