From e09ad2fcc8f46684d188bdb40785a4b386c88479 Mon Sep 17 00:00:00 2001
From: helen <zhushui060631@163.com>
Date: Thu, 26 Dec 2024 14:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/manage/banned/types.ts        |  3 ++
 src/components/Map/index.vue          |  9 ++--
 src/views/manage/activity/index.vue   |  4 +-
 src/views/manage/hotel/index.vue      | 18 ++-----
 src/views/manage/mkJigsaw/index.vue   | 12 +----
 src/views/manage/noteManage/index.vue | 71 ++++++++++++-------------
 src/views/manage/report/index.vue     | 40 ++++++++------
 src/views/manage/route/index.vue      | 76 ++++++++++++++++-----------
 src/views/system/user/index.vue       | 30 +++++------
 9 files changed, 130 insertions(+), 133 deletions(-)

diff --git a/src/api/manage/banned/types.ts b/src/api/manage/banned/types.ts
index 86cc5aa..2eabf24 100644
--- a/src/api/manage/banned/types.ts
+++ b/src/api/manage/banned/types.ts
@@ -48,6 +48,7 @@ export interface BannedVO {
    * 状态(0=已发布,1=已下架)
    */
   handlingStatus: number;
+  nickName?: string | number;
 
   /**
    * 1=用户,2=笔记,3=活动,4=评论
@@ -106,6 +107,7 @@ export interface BannedForm extends BaseEntity {
    * 状态(0=已发布,1=已下架)
    */
   handlingStatus?: number;
+  nickName?: string | number;
 
   /**
    * 1=用户,2=笔记,3=活动,4=评论
@@ -120,6 +122,7 @@ export interface BannedQuery extends PageQuery {
    * 被举报内容id
    */
   contentId?: string | number;
+  nickName?: string | number;
 
   /**
    * 被举报用户ID
diff --git a/src/components/Map/index.vue b/src/components/Map/index.vue
index e6bad42..378b0fb 100644
--- a/src/components/Map/index.vue
+++ b/src/components/Map/index.vue
@@ -33,6 +33,7 @@
 import { Search } from '@element-plus/icons-vue';
 import { propTypes } from '@/utils/propTypes';
 import { jsonp } from 'vue-jsonp';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 import { debounce } from '@/utils/debounce.js';
 import { OssVO } from '@/api/system/oss/types';
 import { listByIds } from '@/api/system/oss';
@@ -93,8 +94,7 @@ const onClick = (e: any) => {
         // 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;
+        center.value = { lat: data.result.location.lat, 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 } }];
         console.log(form.value);
@@ -119,8 +119,6 @@ const performSearch = async (text) => {
     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_components.province +
         //   data.result.address_components.city +
@@ -132,8 +130,9 @@ const performSearch = async (text) => {
         // form.value.region = data.result.ad_info.adcode; //行政区划编码
         // form.value.regionCode = data.result.ad_info.adcode; //行政区划编码
 
-        form.value.address = data.result.formatted_addresses.recommend;
+        form.value.address = text;
         // form.value.city = data.result.address_components.city;
+        center.value = { lat: data.result.location.lat, lng: data.result.location.lng };
         geometries.value = [{ styleId: 'marker', position: { lat: data.result.location.lat, lng: data.result.location.lng } }];
         console.log(form.value);
         emit('modelValue', form.value);
diff --git a/src/views/manage/activity/index.vue b/src/views/manage/activity/index.vue
index 9b557e3..9c69b39 100644
--- a/src/views/manage/activity/index.vue
+++ b/src/views/manage/activity/index.vue
@@ -465,7 +465,7 @@ const saveupdate = async (row?: ActivityVO, type) => {
   form.value.status = type == 1 ? 2 : 0;
   const test = type == 1 ? '发布' : '撤销发布';
   const _ids = row?.activityName || ids.value;
-  await proxy?.$modal.confirm('是否确认' + test + '活动信息编号为' + _ids + '的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认' + test + '活动名称 为' + _ids + '的数据项？').finally(() => (loading.value = false));
   await updateActivity(form.value).finally(() => (buttonLoading.value = false));
   proxy?.$modal.msgSuccess(test + '成功');
   await getList();
@@ -526,7 +526,7 @@ const submitForm = () => {
 const handleDelete = async (row?: ActivityVO) => {
   const _ids = row?.id || ids.value;
   const _idsname = row?.activityName || ids.value;
-  await proxy?.$modal.confirm('是否确认删除活动信息编号为"' + _idsname + '"的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认删除活动名称为"' + _idsname + '"的数据项？').finally(() => (loading.value = false));
   await delActivity(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
diff --git a/src/views/manage/hotel/index.vue b/src/views/manage/hotel/index.vue
index 50d125d..672d26b 100644
--- a/src/views/manage/hotel/index.vue
+++ b/src/views/manage/hotel/index.vue
@@ -16,6 +16,7 @@
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button v-hasPermi="['manage:hotel:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -23,15 +24,6 @@
     </transition>
 
     <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['manage:hotel:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
-        </el-row>
-      </template>
-
       <el-table v-loading="loading" :data="hotelList">
         <el-table-column v-if="true" label="ID" align="center" prop="id" />
         <el-table-column label="住宿商家名称" align="center" prop="name" />
@@ -307,7 +299,7 @@ const handleEdit = async (row?: HotelVO) => {
   const res = await getHotel(_id);
   Object.assign(form.value, res.data);
   const _idname = row?.name;
-  const text = row?.status != 1 ? '是否确认发布商家名称为' : '是否撤销发布商家名称为';
+  const text = row?.status != 1 ? '是否确认发布商家名称为"' : '是否撤销发布商家名称为"';
   const messages = row?.status != 1 ? '发布成功' : '撤销成功';
   await proxy?.$modal.confirm(text + _idname + '"的数据项？').finally(() => (loading.value = false));
   const template = {
@@ -337,8 +329,6 @@ const performSearch = async (text) => {
     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_components.province +
           data.result.address_components.city +
@@ -351,6 +341,7 @@ const performSearch = async (text) => {
         form.value.regionCode = data.result.ad_info.adcode; //行政区划编码
         // form.value.province = data.result.address_components.province;
         // form.value.city = data.result.address_components.city;
+        center.value = { lat: data.result.location.lat, lng: data.result.location.lng };
         geometries.value = [{ styleId: 'marker', position: { lat: data.result.location.lat, lng: data.result.location.lng } }];
       } else if (data.status == 348) {
         //地址信息不明确，需弹出提示
@@ -380,8 +371,7 @@ const onClick = (e: any) => {
         // 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;
+        center.value = { lat: data.result.location.lat, 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 } }];
       }
diff --git a/src/views/manage/mkJigsaw/index.vue b/src/views/manage/mkJigsaw/index.vue
index 887acc8..4af0193 100644
--- a/src/views/manage/mkJigsaw/index.vue
+++ b/src/views/manage/mkJigsaw/index.vue
@@ -15,6 +15,7 @@
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button v-hasPermi="['manage:mkJigsaw:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -22,15 +23,6 @@
     </transition>
 
     <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button v-hasPermi="['manage:mkJigsaw:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
-          </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
-        </el-row>
-      </template>
-
       <el-table v-loading="loading" :data="mkJigsawList">
         <el-table-column label="任务名称" align="center" prop="name" />
         <el-table-column label="任务类别" align="center" prop="category">
@@ -131,7 +123,7 @@
             end-placeholder="选择结束时间"
             format="YYYY-MM-DD HH:mm:ss"
             date-format="YYYY/MM/DD ddd"
-            time-format="A hh:mm:ss"
+            time-format="HH:mm:ss"
             value-format="YYYY-MM-DD HH:mm:ss"
             :picker-options="{ disabledDate: dateOptions }"
             @change="mkdatetime"
diff --git a/src/views/manage/noteManage/index.vue b/src/views/manage/noteManage/index.vue
index 1f2d0b1..0dde58c 100644
--- a/src/views/manage/noteManage/index.vue
+++ b/src/views/manage/noteManage/index.vue
@@ -1,8 +1,7 @@
 <!-- 笔记管理 -->
 <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]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -20,14 +19,14 @@
             </el-form-item>
             <el-form-item label="发布状态" prop="tagId">
               <!-- <el-input v-model="queryParams.tagId" placeholder="请输入标签" clearable @keyup.enter="handleQuery" /> -->
-              <el-select v-model="queryParams.tagId" placeholder="请选择发布状态" style="width: 240px"
-                @keyup.enter="handleQuery">
+              <el-select v-model="queryParams.status" placeholder="请选择发布状态" style="width: 240px" @keyup.enter="handleQuery">
                 <el-option v-for="item in statusoptions" :key="item.value" :label="item.label" :value="item.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>
+              <el-button v-hasPermi="['manage:notebook:add']" type="primary" plain icon="Plus" @click="handleAdd">新增 </el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -35,25 +34,6 @@
     </transition>
 
     <el-card shadow="never">
-      <template #header>
-        <el-row :gutter="10" class="mb8">
-          <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: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>
-          </el-col> -->
-          <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar>
-        </el-row>
-      </template>
-
       <el-table v-loading="loading" :data="notebookList" @selection-change="handleSelectionChange">
         <!--        <el-table-column type="selection" width="55" align="center" />-->
         <el-table-column v-if="true" label="ID" align="center" prop="id" />
@@ -101,23 +81,36 @@
         <el-table-column label="操作时间" align="center" prop="updateTime" width="200px" />
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
           <template #default="scope">
-            <el-button v-if="scope.row.status == 0||scope.row.status == 1" v-hasPermi="['manage:notebook:edit']" link
-              type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
-            <el-button v-if="scope.row.status == 0" v-hasPermi="['manage:notebook:edit']" link type="primary"
-              @click="fabudata(scope.row)">发布</el-button>
-            <el-button v-if="scope.row.status == 3" v-hasPermi="['manage:notebook:edit']" link type="primary"
-              @click="fabudata(scope.row)">撤销发布</el-button>
+            <el-button
+              v-if="scope.row.status == 0 || scope.row.status == 1"
+              v-hasPermi="['manage:notebook:edit']"
+              link
+              type="primary"
+              @click="handleUpdate(scope.row)"
+              >编辑</el-button
+            >
+            <el-button v-if="scope.row.status == 0" v-hasPermi="['manage:notebook:edit']" link type="primary" @click="fabudata(scope.row)"
+              >发布</el-button
+            >
+            <el-button v-if="scope.row.status == 3" 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-button v-if="scope.row.status == 0||scope.row.status == 1" v-hasPermi="['manage:notebook:remove']" link
-              type="primary" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button
+              v-if="scope.row.status == 0 || scope.row.status == 1"
+              v-hasPermi="['manage:notebook:remove']"
+              link
+              type="primary"
+              @click="handleDelete(scope.row)"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-        :total="total" @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 v-model="dialog.visible" :title="dialog.title" width="60%" append-to-body>
@@ -302,9 +295,9 @@ const formatTag = (tagId: string | null) => {
   // }
   for (let i = 0; i < sys_user_tagOptions.value.length; i++) {
     const element = sys_user_tagOptions.value[i];
-    if (tagId!=null) {
-      let filteredArray = tagId.split(',').filter((item) => item==element.id);
-      if (filteredArray.length>0) {
+    if (tagId != null) {
+      let filteredArray = tagId.split(',').filter((item) => item == element.id);
+      if (filteredArray.length > 0) {
         tagString += '，' + element.title;
       }
     }
@@ -383,6 +376,8 @@ const handleSelectionChange = (selection: NotebookVO[]) => {
 const handleAdd = () => {
   reset();
   dialog.visible = true;
+  tagvalue.value = '';
+  addressvalue.value = '';
   dialog.title = '添加笔记';
 };
 
@@ -392,8 +387,8 @@ 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(',');
-  addressvalue.value = form.value.location.split(',');
+  tagvalue.value = form.value.tagId && form.value.tagId.split(',');
+  addressvalue.value = form.value.tagId && form.value.location.split(',');
   dialog.visible = true;
   dialog.title = '修改笔记';
 };
diff --git a/src/views/manage/report/index.vue b/src/views/manage/report/index.vue
index f8a2a6a..110e0e2 100644
--- a/src/views/manage/report/index.vue
+++ b/src/views/manage/report/index.vue
@@ -5,20 +5,21 @@
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
             <el-form-item label="用户昵称" prop="contentId">
-              <el-input v-model="queryParams.contentId" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.nickName" placeholder="请输入用户昵称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="账号状态" prop="handlingStatus">
+            <el-form-item label=" 状态">
               <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-option label="未处理" value="0" />
+                <el-option label="已处理" value="1" />
               </el-select>
             </el-form-item>
-            <el-form-item label="性别" prop="handlingStatus">
+            <el-form-item label="性别">
               <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="会员等级" prop="handlingStatus">
-              <el-select v-model="queryParams.handlingStatus" placeholder="请选择状态" clearable>
+            <el-form-item label="会员等级">
+              <el-select v-model="queryParams.levelId" placeholder="请选择状态" clearable>
                 <el-option v-for="dict in dy_banned_handling_status" :key="dict.id" :label="dict.levelName" :value="dict.id" />
               </el-select>
             </el-form-item>
@@ -42,25 +43,25 @@
       </template>
 
       <el-table v-loading="loading" :data="bannedList">
-        <el-table-column v-if="queryParams.type == 1" label="笔记名称" align="center" prop="contentId" >
+        <el-table-column v-if="queryParams.type == 1" label="笔记名称" align="center" prop="contentId">
           <template #default="scope">
-            <el-button type="primary" link>查看笔记</el-button>
+            <el-button type="primary" link>{{ scope.row.contentName }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column v-if="queryParams.type == 2" label="活动名称" align="center" prop="contentId" >
+        <el-table-column v-if="queryParams.type == 2" label="活动名称" align="center" prop="contentId">
           <template #default="scope">
-            <el-button type="primary" link>查看活动</el-button>
+            <el-button type="primary" link>{{ scope.row.contentName }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="queryParams.type == 3" label="评论内容" align="center" prop="contentId">
+          <template #default="scope">
+            <el-button type="primary" link>{{ scope.row.contentName }}</el-button>
           </template>
         </el-table-column>
-          <el-table-column v-if="queryParams.type == 3" label="评论内容" align="center" prop="contentId" >
-            <template #default="scope">
-              <el-button type="primary" link>查看笔记</el-button>
-            </template>
-          </el-table-column>
         <el-table-column label="用户ID" align="center" prop="reportUserId" />
         <el-table-column label="会员等级" align="center" prop="userLevel">
           <template #default="scope">
-            <div>{{formatlevel(scope.row.levelId)}}</div>
+            <div>{{ formatlevel(scope.row.levelId) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="昵称" align="center" prop="nickName" />
@@ -75,7 +76,7 @@
         <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="updateName" width="150px" />
-        <el-table-column label="状态" align="center" prop="handlingStatus" >
+        <el-table-column label="状态" align="center" prop="handlingStatus">
           <template #default="scope">
             <el-tag v-if="scope.row.handlingStatus == 0" type="info">未处理</el-tag>
             <el-tag v-if="scope.row.handlingStatus == 1" type="warning">已处理</el-tag>
@@ -171,6 +172,7 @@ const data = reactive<PageData<BannedForm, BannedQuery>>({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
+    nickName: undefined,
     contentId: undefined,
     reportUserId: undefined,
     reportReason: undefined,
@@ -229,6 +231,10 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
+  queryParams.value.nickName = '';
+  queryParams.value.sex = '';
+  queryParams.value.handlingStatus = '';
+  queryParams.value.levelId = '';
   handleQuery();
 };
 
diff --git a/src/views/manage/route/index.vue b/src/views/manage/route/index.vue
index 32a0035..dd86f01 100644
--- a/src/views/manage/route/index.vue
+++ b/src/views/manage/route/index.vue
@@ -1,34 +1,29 @@
 <!-- 路线导航管理列表 -->
 <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" id="search_div" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="70px">
             <el-form-item label="线路标题" prop="">
-              <el-input v-model="queryParams.title" class="inputWidth" placeholder="请输入线路标题" clearable
-                @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.title" class="inputWidth" placeholder="请输入线路标题" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="发布状态" prop="">
               <el-select v-model="queryParams.status" class="inputWidth" placeholder="请选择发布状态" clearable>
-                <el-option v-for="dict in note_publish_list" :key="dict.value" :label="dict.label"
-                  :value="dict.value" />
+                <el-option v-for="dict in note_publish_list" :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>
-              <el-button v-hasPermi="['system:Route:add']" type="primary" plain icon="Plus"
-                @click="handleAdd">新增</el-button>
+              <el-button v-hasPermi="['system:Route:add']" type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
             </el-form-item>
           </el-form>
         </el-card>
       </div>
     </transition>
 
-    <el-table v-loading="loading" :height="autoTableHeight" :data="RouteList" border
-      @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :height="autoTableHeight" :data="RouteList" border @selection-change="handleSelectionChange">
       <el-table-column label="ID" align="center" prop="id" width="180px" fixed />
       <el-table-column label="线路标题" align="center" prop="title" width="150px" show-overflow-tooltip fixed />
       <el-table-column label="线路封面" align="center" prop="" />
@@ -80,20 +75,40 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160px" fixed="right">
         <template #default="scope">
-          <el-button v-if="scope.row.status == 0 || scope.row.status == 1" v-hasPermi="['system:Route:edit']" link
-            type="primary" @click="handleUpdate(scope.row)">编辑</el-button>
-          <el-button v-if="scope.row.status == 0 || scope.row.status == 1" v-hasPermi="['system:Route:remove']" link
-            type="primary" @click="handleDelete(scope.row)">删除</el-button>
-          <el-button v-if="scope.row.status == 0" v-hasPermi="['system:Route:remove']" link type="primary"
-            @click="savelistrow(scope.row)">发布</el-button>
-          <el-button v-if="scope.row.status == 3" v-hasPermi="['system:Route:remove']" link type="primary"
-            @click="savelistrow(scope.row)">撤销发布</el-button>
+          <el-button
+            v-if="scope.row.status == 0 || scope.row.status == 1"
+            v-hasPermi="['system:Route:edit']"
+            link
+            type="primary"
+            @click="handleUpdate(scope.row)"
+            >编辑</el-button
+          >
+          <el-button
+            v-if="scope.row.status == 0 || scope.row.status == 1"
+            v-hasPermi="['system:Route:remove']"
+            link
+            type="primary"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+          <el-button v-if="scope.row.status == 0" v-hasPermi="['system:Route:remove']" link type="primary" @click="savelistrow(scope.row)"
+            >发布</el-button
+          >
+          <el-button v-if="scope.row.status == 3" v-hasPermi="['system:Route:remove']" link type="primary" @click="savelistrow(scope.row)"
+            >撤销发布</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" id="table_page" v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      id="table_page"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
     <!-- 添加或修改景点、租赁管理对话框 -->
     <el-dialog v-model="dialog.visible" :title="dialog.title" width="60%" append-to-body>
       <el-form ref="RouteFormRef" :model="form" :rules="rules" label-width="120px">
@@ -110,9 +125,8 @@
             <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="treevalue">
-          <el-cascader v-model="treevalue" :options="regiontree" :props="props" clearable placeholder="请选择涉及的行政区域"
-            style="width: 400px" />
+        <el-form-item label="涉及的行政区域" prop="region">
+          <el-cascader v-model="treevalue" :options="regiontree" :props="props" clearable placeholder="请选择涉及的行政区域" style="width: 400px" />
         </el-form-item>
         <div style="display: flex">
           <el-form-item label="行程天数" prop="routeDays">
@@ -176,15 +190,13 @@
           <el-input v-model="routeDetailsList.title" placeholder="请输入标题" style="width: 500px" />
         </el-form-item>
         <el-form-item label="描述">
-          <el-input v-model="routeDetailsList.description" placeholder="请输入描述" style="width: 500px" autosize
-            type="textarea" />
+          <el-input v-model="routeDetailsList.description" placeholder="请输入描述" style="width: 500px" autosize type="textarea" />
         </el-form-item>
         <el-form-item label="添加地点">
           <el-button type="primary" @click="addjingdain">添加景点</el-button>
         </el-form-item>
         <div v-for="(item, index) in routeDetailsList.lowerList" class="articlelist">
-          <CircleClose v-if="index != 0" style="width: 2em; height: 2em; position: relative; left: 98%"
-            @click="delLowerList(index)" />
+          <CircleClose v-if="index != 0" style="width: 2em; height: 2em; position: relative; left: 98%" @click="delLowerList(index)" />
           <el-form-item label="添加地点">
             <el-select v-model="item.articleId" placeholder="请选择标记地点" size="large" style="width: 500px">
               <el-option v-for="item in sys_user_contentOptions" :key="item.id" :label="item.name" :value="item.id" />
@@ -383,7 +395,7 @@ const data = reactive<PageData<RouteForm, RouteQuery>>({
     routeDriveHour: [{ required: true, message: '行驶时长', trigger: 'blur' }],
     routeMileage: [{ required: true, message: '行程里数', trigger: 'blur' }],
     routeDays: [{ required: true, message: '行程天数', trigger: 'blur' }],
-    region: [{ required: true, message: '涉及的行政区', trigger: 'blur' }],
+    region: [{ required: true, message: '涉及的行政区不能为空', trigger: 'blur' }],
     tagId: [{ required: true, message: '标签不能为空', trigger: 'blur' }],
     title: [{ required: true, message: '线路标题', trigger: 'blur' }]
   }
@@ -510,9 +522,9 @@ const formatTag = (tagId: string | null) => {
   // }
   for (let i = 0; i < sys_user_tagOptions.value.length; i++) {
     const element = sys_user_tagOptions.value[i];
-    if (tagId!=null) {
-      let filteredArray = tagId.split(',').filter((item) => item==element.id);
-      if (filteredArray.length>0) {
+    if (tagId != null) {
+      let filteredArray = tagId.split(',').filter((item) => item == element.id);
+      if (filteredArray.length > 0) {
         tagString += '，' + element.title;
       }
     }
@@ -536,7 +548,7 @@ const handleUpdate = async (row?: RouteVO) => {
 /** 提交按钮 */
 const submitForm = async (type) => {
   form.value.tagId = tagvalue?.value.length != 0 ? tagvalue?.value.join(',') : '';
-  form.value.region = treevalue?.value ? JSON.stringify(treevalue?.value) : '';
+  form.value.region = treevalue?.value.length ==0?'': JSON.stringify(treevalue?.value);
   form.value.status = Number(type);
   form.value.routeDetailsList = bookrouteDetailsList.value;
   if (type == 1) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 46bffd2..512bf38 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -72,21 +72,21 @@
                   删除
                 </el-button>
               </el-col>
-              <el-col :span="1.5">
-                <el-dropdown class="mt-[1px]">
-                  <el-button plain type="info">
-                    更多
-                    <el-icon class="el-icon--right"><arrow-down /></el-icon
-                  ></el-button>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>
-                      <el-dropdown-item icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>
-                      <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </el-col>
+              <!--              <el-col :span="1.5">-->
+              <!--                <el-dropdown class="mt-[1px]">-->
+              <!--                  <el-button plain type="info">-->
+              <!--                    更多-->
+              <!--                    <el-icon class="el-icon&#45;&#45;right"><arrow-down /></el-icon-->
+              <!--                  ></el-button>-->
+              <!--                  <template #dropdown>-->
+              <!--                    <el-dropdown-menu>-->
+              <!--                      <el-dropdown-item icon="Download" @click="importTemplate">下载模板</el-dropdown-item>-->
+              <!--                      <el-dropdown-item icon="Top" @click="handleImport"> 导入数据</el-dropdown-item>-->
+              <!--                      <el-dropdown-item icon="Download" @click="handleExport"> 导出数据</el-dropdown-item>-->
+              <!--                    </el-dropdown-menu>-->
+              <!--                  </template>-->
+              <!--                </el-dropdown>-->
+              <!--              </el-col>-->
               <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @query-table="getList"></right-toolbar>
             </el-row>
           </template>