diff --git a/admin/components.d.ts b/admin/components.d.ts
index 266a85b9..e5b7f07b 100644
--- a/admin/components.d.ts
+++ b/admin/components.d.ts
@@ -10,6 +10,7 @@ declare module '@vue/runtime-core' {
     Attachment: typeof import('./src/components/upload-attachment/attachment.vue')['default']
     DiyLink: typeof import('./src/components/diy-link/index.vue')['default']
     Editor: typeof import('./src/components/editor/index.vue')['default']
+    ElAlert: typeof import('element-plus/es')['ElAlert']
     ElAside: typeof import('element-plus/es')['ElAside']
     ElAvatar: typeof import('element-plus/es')['ElAvatar']
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
@@ -44,6 +45,7 @@ declare module '@vue/runtime-core' {
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElResult: typeof import('element-plus/es')['ElResult']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
@@ -56,6 +58,8 @@ declare module '@vue/runtime-core' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElTimeline: typeof import('element-plus/es')['ElTimeline']
+    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
diff --git a/admin/src/app/api/venue.ts b/admin/src/app/api/venue.ts
index 36489c79..695778f5 100644
--- a/admin/src/app/api/venue.ts
+++ b/admin/src/app/api/venue.ts
@@ -1,5 +1,7 @@
 import request from '@/utils/request'
 
+
+
 // USER_CODE_BEGIN -- venue
 /**
  * 获取场地列表
@@ -7,7 +9,7 @@ import request from '@/utils/request'
  * @returns
  */
 export function getVenueList(params: Record<string, any>) {
-  return request.get(`venue/venue`, { params })
+    return request.get(`venue/venue`, {params})
 }
 
 /**
@@ -16,7 +18,7 @@ export function getVenueList(params: Record<string, any>) {
  * @returns
  */
 export function getVenueInfo(id: number) {
-  return request.get(`venue/venue/${id}`)
+    return request.get(`venue/venue/${id}`);
 }
 
 /**
@@ -25,10 +27,7 @@ export function getVenueInfo(id: number) {
  * @returns
  */
 export function addVenue(params: Record<string, any>) {
-  return request.post('venue/venue', params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.post('venue/venue', params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -38,10 +37,7 @@ export function addVenue(params: Record<string, any>) {
  * @returns
  */
 export function editVenue(params: Record<string, any>) {
-  return request.put(`venue/venue/${params.id}`, params, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.put(`venue/venue/${params.id}`, params, { showErrorMessage: true, showSuccessMessage: true })
 }
 
 /**
@@ -50,10 +46,11 @@ export function editVenue(params: Record<string, any>) {
  * @returns
  */
 export function deleteVenue(id: number) {
-  return request.delete(`venue/venue/${id}`, {
-    showErrorMessage: true,
-    showSuccessMessage: true,
-  })
+    return request.delete(`venue/venue/${id}`, { showErrorMessage: true, showSuccessMessage: true })
+}
+
+export function getWithCampusList(params: Record<string,any>){
+    return request.get('venue/campus_all', {params})
 }
 
 // USER_CODE_END -- venue
diff --git a/admin/src/app/lang/zh-cn/venue.venue.json b/admin/src/app/lang/zh-cn/venue.venue.json
index 45915b90..03d57f6a 100644
--- a/admin/src/app/lang/zh-cn/venue.venue.json
+++ b/admin/src/app/lang/zh-cn/venue.venue.json
@@ -1,25 +1,27 @@
 {
-  "id": "场地编号",
-  "idPlaceholder": "请输入场地编号",
-  "campusId": "校区ID",
-  "campusIdPlaceholder": "请输入校区ID",
-  "venueName": "场地名称",
-  "venueNamePlaceholder": "请输入场地名称",
-  "capacity": "场地可容纳人数上限",
-  "capacityPlaceholder": "请输入场地可容纳人数上限",
-  "availabilityStatus": "场地可用状态",
-  "availabilityStatusPlaceholder": "请输入场地可用状态",
-  "timeRangeType": "场地可用时间范围类型",
-  "timeRangeTypePlaceholder": "请输入场地可用时间范围类型",
-  "timeRangeStart": "范围类型的开始时间",
-  "timeRangeStartPlaceholder": "请输入范围类型的开始时间",
-  "timeRangeEnd": "范围类型的结束时间",
-  "timeRangeEndPlaceholder": "请输入范围类型的结束时间",
-  "fixedTimeRanges": "固定时间范围类型的可用时间, 存储为JSON数组",
-  "fixedTimeRangesPlaceholder": "请输入固定时间范围类型的可用时间, 存储为JSON数组",
-  "addVenue": "添加场地",
-  "updateVenue": "编辑场地",
-  "venueDeleteTips": "确定要删除该数据吗？",
-  "startDate": "请选择开始时间",
-  "endDate": "请选择结束时间"
-}
+      "campusId":"校区",
+      "campusIdPlaceholder":"全部",
+      "venueName":"场地名称",
+      "venueNamePlaceholder":"请输入场地名称",
+      "capacity":"场地可容纳人数上限",
+      "capacityPlaceholder":"请输入场地可容纳人数上限",
+      "availabilityStatus":"场地可用状态",
+      "availabilityStatusPlaceholder":"请输入场地可用状态",
+      "timeRangeType":"场地可用时间范围类型",
+      "timeRangeTypePlaceholder":"请输入场地可用时间范围类型",
+      "timeRangeStart":"范围类型的开始时间",
+      "timeRangeStartPlaceholder":"请输入范围类型的开始时间",
+      "timeRangeEnd":"范围类型的结束时间",
+      "timeRangeEndPlaceholder":"请输入范围类型的结束时间",
+      "fixedTimeRanges":"固定时间范围类型的可用时间, 存储为JSON数组",
+      "fixedTimeRangesPlaceholder":"请输入固定时间范围类型的可用时间, 存储为JSON数组",
+      "createdAt":"创建时间",
+      "createdAtPlaceholder":"请输入创建时间",
+      "updatedAt":"修改时间",
+      "updatedAtPlaceholder":"请输入修改时间",
+      "addVenue":"添加场地",
+      "updateVenue":"编辑场地",
+      "venueDeleteTips":"确定要删除该数据吗？",
+      "startDate":"请选择开始时间",
+      "endDate":"请选择结束时间"
+}
\ No newline at end of file
diff --git a/admin/src/app/views/campus/components/campus-edit.vue b/admin/src/app/views/campus/components/campus-edit.vue
index 87a56e9e..ca00310a 100644
--- a/admin/src/app/views/campus/components/campus-edit.vue
+++ b/admin/src/app/views/campus/components/campus-edit.vue
@@ -23,23 +23,26 @@
         />
       </el-form-item>
 
-      <el-form-item :label="t('campusAddress')">
-        <el-input
-          v-model="formData.campus_address"
-          clearable
-          :placeholder="t('campusAddressPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
+      <!--      <el-form-item :label="t('campusAddress')">-->
+      <!--        <el-input-->
+      <!--          v-model="formData.campus_address"-->
+      <!--          clearable-->
+      <!--          :placeholder="t('campusAddressPlaceholder')"-->
+      <!--          class="input-width"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
 
       <el-form-item :label="t('campusPreviewImage')">
         <upload-image v-model="formData.campus_preview_image" />
       </el-form-item>
 
       <el-form-item :label="t('campusCoordinates')">
-        <el-button @click="showMapPicker">{{
-          t('campusCoordinatesPlaceholder')
-        }}</el-button>
+        <el-button @click="showMapPicker">
+          {{
+            formData.campus_coordinates?.address ||
+            t('campusCoordinatesPlaceholder')
+          }}</el-button
+        >
         <TencentMapPicker
           ref="mapPickerRef"
           v-model="formData.campus_coordinates"
diff --git a/admin/src/app/views/venue/components/venue-edit.vue b/admin/src/app/views/venue/components/venue-edit.vue
index 05e285d3..47ec3aad 100644
--- a/admin/src/app/views/venue/components/venue-edit.vue
+++ b/admin/src/app/views/venue/components/venue-edit.vue
@@ -1,278 +1,267 @@
-<template>
-  <el-dialog
-    v-model="showDialog"
-    :title="formData.id ? t('updateVenue') : t('addVenue')"
-    width="50%"
-    class="diy-dialog-wrap"
-    :destroy-on-close="true"
-  >
-    <el-form
-      :model="formData"
-      label-width="120px"
-      ref="formRef"
-      :rules="formRules"
-      class="page-form"
-      v-loading="loading"
-    >
-      <el-form-item :label="t('campusId')" prop="campus_id">
-        <el-input
-          v-model="formData.campus_id"
-          clearable
-          :placeholder="t('campusIdPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('venueName')" prop="venue_name">
-        <el-input
-          v-model="formData.venue_name"
-          clearable
-          :placeholder="t('venueNamePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('capacity')" prop="capacity">
-        <el-input
-          v-model="formData.capacity"
-          clearable
-          :placeholder="t('capacityPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('availabilityStatus')" prop="availability_status">
-        <el-input
-          v-model="formData.availability_status"
-          clearable
-          :placeholder="t('availabilityStatusPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('timeRangeType')" prop="time_range_type">
-        <el-input
-          v-model="formData.time_range_type"
-          clearable
-          :placeholder="t('timeRangeTypePlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('timeRangeStart')">
-        <el-input
-          v-model="formData.time_range_start"
-          clearable
-          :placeholder="t('timeRangeStartPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('timeRangeEnd')">
-        <el-input
-          v-model="formData.time_range_end"
-          clearable
-          :placeholder="t('timeRangeEndPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-
-      <el-form-item :label="t('fixedTimeRanges')">
-        <el-input
-          v-model="formData.fixed_time_ranges"
-          clearable
-          :placeholder="t('fixedTimeRangesPlaceholder')"
-          class="input-width"
-        />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
-        <el-button
-          type="primary"
-          :loading="loading"
-          @click="confirm(formRef)"
-          >{{ t('confirm') }}</el-button
-        >
-      </span>
-    </template>
-  </el-dialog>
-</template>
-
-<script lang="ts" setup>
-import { ref, reactive, computed, watch } from 'vue'
-import { useDictionary } from '@/app/api/dict'
-import { t } from '@/lang'
-import type { FormInstance } from 'element-plus'
-import { addVenue, editVenue, getVenueInfo } from '@/app/api/venue'
-
-let showDialog = ref(false)
-const loading = ref(false)
-
-/**
- * 表单数据
- */
-const initialFormData = {
-  id: '',
-  campus_id: '',
-  venue_name: '',
-  capacity: '',
-  availability_status: '',
-  time_range_type: '',
-  time_range_start: '',
-  time_range_end: '',
-  fixed_time_ranges: '',
-}
-const formData: Record<string, any> = reactive({ ...initialFormData })
-
-const formRef = ref<FormInstance>()
-
-// 表单验证规则
-const formRules = computed(() => {
-  return {
-    campus_id: [
-      { required: true, message: t('campusIdPlaceholder'), trigger: 'blur' },
-    ],
-    venue_name: [
-      { required: true, message: t('venueNamePlaceholder'), trigger: 'blur' },
-    ],
-    capacity: [
-      { required: true, message: t('capacityPlaceholder'), trigger: 'blur' },
-    ],
-    availability_status: [
-      {
-        required: true,
-        message: t('availabilityStatusPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    time_range_type: [
-      {
-        required: true,
-        message: t('timeRangeTypePlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    time_range_start: [
-      {
-        required: true,
-        message: t('timeRangeStartPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    time_range_end: [
-      {
-        required: true,
-        message: t('timeRangeEndPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-    fixed_time_ranges: [
-      {
-        required: true,
-        message: t('fixedTimeRangesPlaceholder'),
-        trigger: 'blur',
-      },
-    ],
-  }
-})
-
-const emit = defineEmits(['complete'])
-
-/**
- * 确认
- * @param formEl
- */
-const confirm = async (formEl: FormInstance | undefined) => {
-  if (loading.value || !formEl) return
-  let save = formData.id ? editVenue : addVenue
-
-  await formEl.validate(async (valid) => {
-    if (valid) {
-      loading.value = true
-
-      let data = formData
-
-      save(data)
-        .then((res) => {
-          loading.value = false
-          showDialog.value = false
-          emit('complete')
-        })
-        .catch((err) => {
-          loading.value = false
-        })
-    }
-  })
-}
-
-// 获取字典数据
-
-const setFormData = async (row: any = null) => {
-  Object.assign(formData, initialFormData)
-  loading.value = true
-  if (row) {
-    const data = await (await getVenueInfo(row.id)).data
-    if (data)
-      Object.keys(formData).forEach((key: string) => {
-        if (data[key] != undefined) formData[key] = data[key]
-      })
-  }
-  loading.value = false
-}
-
-// 验证手机号格式
-const mobileVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/^1[3-9]\d{9}$/.test(value)) {
-    callback(new Error(t('generateMobile')))
-  } else {
-    callback()
-  }
-}
-
-// 验证身份证号
-const idCardVerify = (rule: any, value: any, callback: any) => {
-  if (
-    value &&
-    !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(
-      value
-    )
-  ) {
-    callback(new Error(t('generateIdCard')))
-  } else {
-    callback()
-  }
-}
-
-// 验证邮箱号
-const emailVerify = (rule: any, value: any, callback: any) => {
-  if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
-    callback(new Error(t('generateEmail')))
-  } else {
-    callback()
-  }
-}
-
-// 验证请输入整数
-const numberVerify = (rule: any, value: any, callback: any) => {
-  if (!Number.isInteger(value)) {
-    callback(new Error(t('generateNumber')))
-  } else {
-    callback()
-  }
-}
-
-defineExpose({
-  showDialog,
-  setFormData,
-})
-</script>
-
-<style lang="scss" scoped></style>
-<style lang="scss">
-.diy-dialog-wrap .el-form-item__label {
-  height: auto !important;
-}
-</style>
+<template>
+    <el-dialog v-model="showDialog" :title="formData.id ? t('updateVenue') : t('addVenue')" width="50%" class="diy-dialog-wrap" :destroy-on-close="true">
+        <el-form :model="formData" label-width="120px" ref="formRef" :rules="formRules" class="page-form" v-loading="loading">
+                <el-form-item :label="t('campusId')" prop="campus_id">
+                    <el-select class="input-width" v-model="formData.campus_id" clearable :placeholder="t('campusIdPlaceholder')">
+                       <el-option label="请选择" value=""></el-option>
+                        <el-option
+                            v-for="(item, index) in campusIdList"
+                            :key="index"
+                            :label="item['campus_name']"
+                            :value="item['id']"
+                        />
+                    </el-select>
+                </el-form-item>
+                
+                <el-form-item :label="t('venueName')" prop="venue_name">
+                    <el-input v-model="formData.venue_name" clearable :placeholder="t('venueNamePlaceholder')" class="input-width" />
+                </el-form-item>
+                
+                <el-form-item :label="t('capacity')" prop="capacity">
+                    <el-input-number v-model="formData.capacity" clearable :placeholder="t('capacityPlaceholder')"  class="input-width"  :min = "1" max = "500" />
+                </el-form-item>
+                
+                <el-form-item :label="t('availabilityStatus')" prop="availability_status">
+                    <el-radio-group  v-model="formData.availability_status" :placeholder="t('availabilityStatusPlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in availability_statusList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                
+                <el-form-item :label="t('timeRangeType')" prop="time_range_type">
+                    <el-radio-group  v-model="formData.time_range_type" :placeholder="t('timeRangeTypePlaceholder')">
+                        <el-radio
+                            v-for="(item, index) in time_range_typeList"
+                            :key="index" :label="item.value">
+                              {{ item.name }}
+                        </el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                
+                <el-form-item :label="t('timeRangeStart')"  class="input-width">
+                    <el-date-picker 
+                        class="flex-1 !flex"
+                        v-model="formData.time_range_start"
+                        clearable
+                        type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss"
+                        :placeholder="t('timeRangeStartPlaceholder')">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item :label="t('timeRangeEnd')"  class="input-width">
+                    <el-date-picker 
+                        class="flex-1 !flex"
+                        v-model="formData.time_range_end"
+                        clearable
+                        type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss"
+                        :placeholder="t('timeRangeEndPlaceholder')">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item :label="t('fixedTimeRanges')"  class="input-width">
+                    <el-date-picker 
+                        class="flex-1 !flex"
+                        v-model="formData.fixed_time_ranges"
+                        clearable
+                        type="datetime"
+                        value-format="YYYY-MM-DD HH:mm:ss"
+                        :placeholder="t('fixedTimeRangesPlaceholder')">
+                    </el-date-picker>
+                </el-form-item>

+        </el-form>
+
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="showDialog = false">{{ t('cancel') }}</el-button>
+                <el-button type="primary" :loading="loading" @click="confirm(formRef)">{{
+                    t('confirm')
+                }}</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, computed, watch } from 'vue'
+import { useDictionary } from '@/app/api/dict'
+import { t } from '@/lang'
+import type { FormInstance } from 'element-plus'
+import { addVenue, editVenue, getVenueInfo, getWithCampusList } from '@/app/api/venue'
+
+let showDialog = ref(false)
+const loading = ref(false)
+
+/**
+ * 表单数据
+ */
+const initialFormData = {
+    id: '',
+    campus_id: '',
+    venue_name: '',
+    capacity: '',
+    availability_status: '',
+    time_range_type: '',
+    time_range_start: '',
+    time_range_end: '',
+    fixed_time_ranges: '',

+}
+const formData: Record<string, any> = reactive({ ...initialFormData })
+
+const formRef = ref<FormInstance>()
+
+// 表单验证规则
+const formRules = computed(() => {
+    return {
+    campus_id: [
+        { required: true, message: t('campusIdPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    venue_name: [
+        { required: true, message: t('venueNamePlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    capacity: [
+        { required: true, message: t('capacityPlaceholder'), trigger: 'blur' },
+        { validator: (rule: any, value: string, callback: any) => {  if (value && !/^\d{1,500}$/.test(value)) { callback(new Error(t('generateBetween')))} else { callback() }}},
+    ]
+,
+    availability_status: [
+        { required: true, message: t('availabilityStatusPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    time_range_type: [
+        { required: true, message: t('timeRangeTypePlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    time_range_start: [
+        { required: true, message: t('timeRangeStartPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    time_range_end: [
+        { required: true, message: t('timeRangeEndPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    fixed_time_ranges: [
+        { required: true, message: t('fixedTimeRangesPlaceholder'), trigger: 'blur' },
+        
+    ]
+,
+    }
+})
+
+const emit = defineEmits(['complete'])
+
+/**
+ * 确认
+ * @param formEl
+ */
+const confirm = async (formEl: FormInstance | undefined) => {
+    if (loading.value || !formEl) return
+    let save = formData.id ? editVenue : addVenue
+
+    await formEl.validate(async (valid) => {
+        if (valid) {
+            loading.value = true
+
+            let data = formData
+
+            save(data).then(res => {
+                loading.value = false
+                showDialog.value = false
+                emit('complete')
+            }).catch(err => {
+                loading.value = false
+            })
+        }
+    })
+}
+
+// 获取字典数据
+    let availability_statusList = ref([])
+    const availability_statusDictList = async () => {
+    availability_statusList.value = await (await useDictionary('SiteStatus')).data.dictionary
+    }
+    availability_statusDictList();
+    watch(() => availability_statusList.value, () => { formData.availability_status = availability_statusList.value[0].value })
+    let time_range_typeList = ref([])
+    const time_range_typeDictList = async () => {
+    time_range_typeList.value = await (await useDictionary('ALLOTTED_TIME')).data.dictionary
+    }
+    time_range_typeDictList();
+    watch(() => time_range_typeList.value, () => { formData.time_range_type = time_range_typeList.value[0].value })

+
+    
+    const campusIdList = ref([] as any[])
+    const setCampusIdList = async () => {
+    campusIdList.value = await (await getWithCampusList({})).data
+    }
+    setCampusIdList()
+const setFormData = async (row: any = null) => {
+    Object.assign(formData, initialFormData)
+    loading.value = true
+    if(row){
+        const data = await (await getVenueInfo(row.id)).data
+        if (data) Object.keys(formData).forEach((key: string) => {
+            if (data[key] != undefined) formData[key] = data[key]
+        })
+    }
+    loading.value = false
+}
+
+// 验证手机号格式
+const mobileVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^1[3-9]\d{9}$/.test(value)) {
+        callback(new Error(t('generateMobile')))
+    } else {
+        callback()
+    }
+}
+
+// 验证身份证号
+const idCardVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/.test(value)) {
+        callback(new Error(t('generateIdCard')))
+    } else {
+        callback()
+    }
+}
+
+// 验证邮箱号
+const emailVerify = (rule: any, value: any, callback: any) => {
+    if (value && !/\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(value)) {
+        callback(new Error(t('generateEmail')))
+    } else {
+        callback()
+    }
+}
+
+// 验证请输入整数
+const numberVerify = (rule: any, value: any, callback: any) => {
+    if (!Number.isInteger(value)) {
+        callback(new Error(t('generateNumber')))
+    } else {
+        callback()
+    }
+}
+
+defineExpose({
+    showDialog,
+    setFormData
+})
+</script>
+
+<style lang="scss" scoped></style>
+<style lang="scss">
+.diy-dialog-wrap .el-form-item__label{
+    height: auto  !important;
+}
+</style>
diff --git a/admin/src/app/views/venue/venue.vue b/admin/src/app/views/venue/venue.vue
index a02b843b..9cdc60de 100644
--- a/admin/src/app/views/venue/venue.vue
+++ b/admin/src/app/views/venue/venue.vue
@@ -1,293 +1,251 @@
-<template>
-  <div class="main-container">
-    <el-card class="box-card !border-none" shadow="never">
-      <div class="flex justify-between items-center">
-        <span class="text-lg">{{ pageName }}</span>
-        <el-button type="primary" @click="addEvent">
-          {{ t('addVenue') }}
-        </el-button>
-      </div>
-
-      <el-card
-        class="box-card !border-none my-[10px] table-search-wrap"
-        shadow="never"
-      >
-        <el-form
-          :inline="true"
-          :model="venueTable.searchParam"
-          ref="searchFormRef"
-        >
-          <el-form-item :label="t('campusId')" prop="campus_id">
-            <el-input
-              v-model="venueTable.searchParam.campus_id"
-              :placeholder="t('campusIdPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('venueName')" prop="venue_name">
-            <el-input
-              v-model="venueTable.searchParam.venue_name"
-              :placeholder="t('venueNamePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('capacity')" prop="capacity">
-            <el-input
-              v-model="venueTable.searchParam.capacity"
-              :placeholder="t('capacityPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item
-            :label="t('availabilityStatus')"
-            prop="availability_status"
-          >
-            <el-input
-              v-model="venueTable.searchParam.availability_status"
-              :placeholder="t('availabilityStatusPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('timeRangeType')" prop="time_range_type">
-            <el-input
-              v-model="venueTable.searchParam.time_range_type"
-              :placeholder="t('timeRangeTypePlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('timeRangeStart')" prop="time_range_start">
-            <el-input
-              v-model="venueTable.searchParam.time_range_start"
-              :placeholder="t('timeRangeStartPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('timeRangeEnd')" prop="time_range_end">
-            <el-input
-              v-model="venueTable.searchParam.time_range_end"
-              :placeholder="t('timeRangeEndPlaceholder')"
-            />
-          </el-form-item>
-          <el-form-item :label="t('fixedTimeRanges')" prop="fixed_time_ranges">
-            <el-input
-              v-model="venueTable.searchParam.fixed_time_ranges"
-              :placeholder="t('fixedTimeRangesPlaceholder')"
-            />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="loadVenueList()">{{
-              t('search')
-            }}</el-button>
-            <el-button @click="resetForm(searchFormRef)">{{
-              t('reset')
-            }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-card>
-
-      <div class="mt-[10px]">
-        <el-table
-          :data="venueTable.data"
-          size="large"
-          v-loading="venueTable.loading"
-        >
-          <template #empty>
-            <span>{{ !venueTable.loading ? t('emptyData') : '' }}</span>
-          </template>
-          <el-table-column
-            prop="campus_id"
-            :label="t('campusId')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="venue_name"
-            :label="t('venueName')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="capacity"
-            :label="t('capacity')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="availability_status"
-            :label="t('availabilityStatus')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="time_range_type"
-            :label="t('timeRangeType')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="time_range_start"
-            :label="t('timeRangeStart')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="time_range_end"
-            :label="t('timeRangeEnd')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            prop="fixed_time_ranges"
-            :label="t('fixedTimeRanges')"
-            min-width="120"
-            :show-overflow-tooltip="true"
-          />
-
-          <el-table-column
-            :label="t('operation')"
-            fixed="right"
-            min-width="120"
-          >
-            <template #default="{ row }">
-              <el-button type="primary" link @click="editEvent(row)">{{
-                t('edit')
-              }}</el-button>
-              <el-button type="primary" link @click="deleteEvent(row.id)">{{
-                t('delete')
-              }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="mt-[16px] flex justify-end">
-          <el-pagination
-            v-model:current-page="venueTable.page"
-            v-model:page-size="venueTable.limit"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="venueTable.total"
-            @size-change="loadVenueList()"
-            @current-change="loadVenueList"
-          />
-        </div>
-      </div>
-
-      <edit ref="editVenueDialog" @complete="loadVenueList" />
-    </el-card>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { reactive, ref, watch } from 'vue'
-import { t } from '@/lang'
-import { useDictionary } from '@/app/api/dict'
-import { getVenueList, deleteVenue } from '@/app/api/venue'
-import { img } from '@/utils/common'
-import { ElMessageBox, FormInstance } from 'element-plus'
-import Edit from '@/app/views/venue/components/venue-edit.vue'
-import { useRoute } from 'vue-router'
-const route = useRoute()
-const pageName = route.meta.title
-
-let venueTable = reactive({
-  page: 1,
-  limit: 10,
-  total: 0,
-  loading: true,
-  data: [],
-  searchParam: {
-    campus_id: '',
-    venue_name: '',
-    capacity: '',
-    availability_status: '',
-    time_range_type: '',
-    time_range_start: '',
-    time_range_end: '',
-    fixed_time_ranges: '',
-  },
-})
-
-const searchFormRef = ref<FormInstance>()
-
-// 选中数据
-const selectData = ref<any[]>([])
-
-// 字典数据
-
-/**
- * 获取场地列表
- */
-const loadVenueList = (page: number = 1) => {
-  venueTable.loading = true
-  venueTable.page = page
-
-  getVenueList({
-    page: venueTable.page,
-    limit: venueTable.limit,
-    ...venueTable.searchParam,
-  })
-    .then((res) => {
-      venueTable.loading = false
-      venueTable.data = res.data.data
-      venueTable.total = res.data.total
-    })
-    .catch(() => {
-      venueTable.loading = false
-    })
-}
-loadVenueList()
-
-const editVenueDialog: Record<string, any> | null = ref(null)
-
-/**
- * 添加场地
- */
-const addEvent = () => {
-  editVenueDialog.value.setFormData()
-  editVenueDialog.value.showDialog = true
-}
-
-/**
- * 编辑场地
- * @param data
- */
-const editEvent = (data: any) => {
-  editVenueDialog.value.setFormData(data)
-  editVenueDialog.value.showDialog = true
-}
-
-/**
- * 删除场地
- */
-const deleteEvent = (id: number) => {
-  ElMessageBox.confirm(t('venueDeleteTips'), t('warning'), {
-    confirmButtonText: t('confirm'),
-    cancelButtonText: t('cancel'),
-    type: 'warning',
-  }).then(() => {
-    deleteVenue(id)
-      .then(() => {
-        loadVenueList()
-      })
-      .catch(() => {})
-  })
-}
-
-const resetForm = (formEl: FormInstance | undefined) => {
-  if (!formEl) return
-  formEl.resetFields()
-  loadVenueList()
-}
-</script>
-
-<style lang="scss" scoped>
-/* 多行超出隐藏 */
-.multi-hidden {
-  word-break: break-all;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-</style>
+<template>
+    <div class="main-container">
+        <el-card class="box-card !border-none" shadow="never">
+
+            <div class="flex justify-between items-center">
+                <span class="text-lg">{{pageName}}</span>
+                <el-button type="primary" @click="addEvent">
+                    {{ t('addVenue') }}
+                </el-button>
+            </div>
+
+            <el-card class="box-card !border-none my-[10px] table-search-wrap" shadow="never">
+                <el-form :inline="true" :model="venueTable.searchParam" ref="searchFormRef">
+                    
+                    <el-form-item :label="t('campusId')" prop="campus_id">
+                        <el-select class="w-[280px]" v-model="venueTable.searchParam.campus_id" clearable :placeholder="t('campusIdPlaceholder')">
+                           <el-option
+                                       v-for="(item, index) in campusIdList"
+                                       :key="index"
+                                       :label="item['campus_name']"
+                                       :value="item['id']"
+                                   />
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('venueName')" prop="venue_name">
+                        <el-input v-model="venueTable.searchParam.venue_name" :placeholder="t('venueNamePlaceholder')" />
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('availabilityStatus')" prop="availability_status">
+                        <el-select class="w-[280px]" v-model="venueTable.searchParam.availability_status" clearable :placeholder="t('availabilityStatusPlaceholder')">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option
+                                v-for="(item, index) in availability_statusList"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    
+                    
+                    <el-form-item :label="t('timeRangeType')" prop="time_range_type">
+                        <el-select class="w-[280px]" v-model="venueTable.searchParam.time_range_type" clearable :placeholder="t('timeRangeTypePlaceholder')">
+                            <el-option label="全部" value=""></el-option>
+                            <el-option
+                                v-for="(item, index) in time_range_typeList"
+                                :key="index"
+                                :label="item.name"
+                                :value="item.value"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('createdAt')" prop="created_at">
+                        <el-date-picker v-model="venueTable.searchParam.created_at" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    
+                    <el-form-item :label="t('updatedAt')" prop="updated_at">
+                        <el-date-picker v-model="venueTable.searchParam.updated_at" type="datetimerange" format="YYYY-MM-DD hh:mm:ss"
+                            :start-placeholder="t('startDate')" :end-placeholder="t('endDate')" />
+                    </el-form-item>
+                    

+                    <el-form-item>
+                        <el-button type="primary" @click="loadVenueList()">{{ t('search') }}</el-button>
+                        <el-button @click="resetForm(searchFormRef)">{{ t('reset') }}</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+
+            <div class="mt-[10px]">
+                <el-table :data="venueTable.data" size="large" v-loading="venueTable.loading">
+                    <template #empty>
+                        <span>{{ !venueTable.loading ? t('emptyData') : '' }}</span>
+                    </template>
+                    <el-table-column prop="campus_id_name" :label="t('campusId')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="venue_name" :label="t('venueName')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="capacity" :label="t('capacity')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column :label="t('availabilityStatus')" min-width="180" align="center" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div v-for="(item, index) in availability_statusList">
+                                <div v-if="item.value == row.availability_status">{{ item.name }}</div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column :label="t('timeRangeType')" min-width="180" align="center" :show-overflow-tooltip="true">
+                        <template #default="{ row }">
+                            <div v-for="(item, index) in time_range_typeList">
+                                <div v-if="item.value == row.time_range_type">{{ item.name }}</div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    
+                    <el-table-column prop="created_at" :label="t('createdAt')" min-width="120" :show-overflow-tooltip="true"/>
+                    
+                    <el-table-column prop="updated_at" :label="t('updatedAt')" min-width="120" :show-overflow-tooltip="true"/>
+                    

+                    <el-table-column :label="t('operation')" fixed="right" min-width="120">
+                       <template #default="{ row }">
+                           <el-button type="primary" link @click="editEvent(row)">{{ t('edit') }}</el-button>
+                           <el-button type="primary" link @click="deleteEvent(row.id)">{{ t('delete') }}</el-button>
+                       </template>
+                    </el-table-column>
+
+                </el-table>
+                <div class="mt-[16px] flex justify-end">
+                    <el-pagination v-model:current-page="venueTable.page" v-model:page-size="venueTable.limit"
+                        layout="total, sizes, prev, pager, next, jumper" :total="venueTable.total"
+                        @size-change="loadVenueList()" @current-change="loadVenueList" />
+                </div>
+            </div>
+
+            <edit ref="editVenueDialog" @complete="loadVenueList" />
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, ref, watch } from 'vue'
+import { t } from '@/lang'
+import { useDictionary } from '@/app/api/dict'
+import { getVenueList, deleteVenue, getWithCampusList } from '@/app/api/venue'
+import { img } from '@/utils/common'
+import { ElMessageBox,FormInstance } from 'element-plus'
+import Edit from '@/app/views/venue/components/venue-edit.vue'
+import { useRoute } from 'vue-router'
+const route = useRoute()
+const pageName = route.meta.title;
+
+let venueTable = reactive({
+    page: 1,
+    limit: 10,
+    total: 0,
+    loading: true,
+    data: [],
+    searchParam:{
+      "campus_id":"",
+      "venue_name":"",
+      "capacity":"",
+      "availability_status":"",
+      "time_range_type":"",
+      "created_at":"",
+      "updated_at":""
+    }
+})
+
+const searchFormRef = ref<FormInstance>()
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 字典数据
+    const availability_statusList = ref([] as any[])
+    const availability_statusDictList = async () => {
+    availability_statusList.value = await (await useDictionary('SiteStatus')).data.dictionary
+    }
+    availability_statusDictList();
+    const time_range_typeList = ref([] as any[])
+    const time_range_typeDictList = async () => {
+    time_range_typeList.value = await (await useDictionary('ALLOTTED_TIME')).data.dictionary
+    }
+    time_range_typeDictList();

+
+/**
+ * 获取场地列表
+ */
+const loadVenueList = (page: number = 1) => {
+    venueTable.loading = true
+    venueTable.page = page
+
+    getVenueList({
+        page: venueTable.page,
+        limit: venueTable.limit,
+         ...venueTable.searchParam
+    }).then(res => {
+        venueTable.loading = false
+        venueTable.data = res.data.data
+        venueTable.total = res.data.total
+    }).catch(() => {
+        venueTable.loading = false
+    })
+}
+loadVenueList()
+
+const editVenueDialog: Record<string, any> | null = ref(null)
+
+/**
+ * 添加场地
+ */
+const addEvent = () => {
+    editVenueDialog.value.setFormData()
+    editVenueDialog.value.showDialog = true
+}
+
+/**
+ * 编辑场地
+ * @param data
+ */
+const editEvent = (data: any) => {
+    editVenueDialog.value.setFormData(data)
+    editVenueDialog.value.showDialog = true
+}
+
+/**
+ * 删除场地
+ */
+const deleteEvent = (id: number) => {
+    ElMessageBox.confirm(t('venueDeleteTips'), t('warning'),
+        {
+            confirmButtonText: t('confirm'),
+            cancelButtonText: t('cancel'),
+            type: 'warning',
+        }
+    ).then(() => {
+        deleteVenue(id).then(() => {
+            loadVenueList()
+        }).catch(() => {
+        })
+    })
+}
+
+    
+    const campusIdList = ref([])
+    const setCampusIdList = async () => {
+    campusIdList.value = await (await getWithCampusList({})).data
+    }
+    setCampusIdList()
+
+const resetForm = (formEl: FormInstance | undefined) => {
+    if (!formEl) return
+    formEl.resetFields()
+    loadVenueList()
+}
+</script>
+
+<style lang="scss" scoped>
+/* 多行超出隐藏 */
+.multi-hidden {
+		word-break: break-all;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/admin/src/components/TencentMapPicker.vue b/admin/src/components/TencentMapPicker.vue
index cb6719bd..41341f31 100644
--- a/admin/src/components/TencentMapPicker.vue
+++ b/admin/src/components/TencentMapPicker.vue
@@ -12,9 +12,7 @@
       <div
         v-if="!props.modelValue.lat || !props.modelValue.lng"
         class="map-placeholder"
-      >
-        {{ props.placeholder }}
-      </div>
+      ></div>
     </div>
     <div class="address-search">
       <el-select
@@ -55,10 +53,7 @@
           :value="item.id"
         />
       </el-select>
-      <el-input
-        v-model="detailAddress"
-        :placeholder="t('detailAddressPlaceholder')"
-      />
+      <el-input v-model="detailAddress" placeholder="输入地区" />
       <el-button
         type="primary"
         @click="handleAddressSearch"
@@ -78,11 +73,13 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, onMounted, watch, computed } from 'vue'
-import { getAreaListByPid, getAreaByCode } from '@/app/api/sys'
-import { createMarker, latLngToAddress, addressToLatLng } from '@/utils/qqmap'
+import { ref, onMounted, watch, computed, nextTick, onBeforeUnmount } from 'vue'
+import { ElMessage } from 'element-plus'
+import { getAreaListByPid } from '@/app/api/sys'
+import { createMarker, addressToLatLng } from '@/utils/qqmap'
 import { t } from '@/lang'
 
+// ====================== Props定义 ======================
 const props = defineProps({
   modelValue: {
     type: Object,
@@ -104,6 +101,7 @@ const props = defineProps({
 
 const emit = defineEmits(['update:visible', 'update:modelValue', 'confirm'])
 
+// ====================== 状态管理 ======================
 const dialogVisible = computed({
   get() {
     return props.visible
@@ -113,10 +111,74 @@ const dialogVisible = computed({
   },
 })
 
-watch(dialogVisible, (newVal) => {
-  emit('update:modelValue', newVal)
+// 地图相关
+let map: any = null
+let marker: any = null
+const mapKey = ref('YOUR_API_KEY') // 替换为你的API Key
+let mapScript: HTMLScriptElement | null = null
+let resizeTimer: number | null = null
+
+// 区域选择
+const province = ref('')
+const city = ref('')
+const district = ref('')
+const detailAddress = ref('')
+const provinceList = ref<any[]>([])
+const cityList = ref<any[]>([])
+const districtList = ref<any[]>([])
+
+// ====================== 生命周期 ======================
+onMounted(() => {
+  // 预加载地图SDK（可选优化）
+  const preloadScript = document.createElement('script')
+  preloadScript.src = `https://map.qq.com/api/gljs?key= ${mapKey.value}`
+  document.head.appendChild(preloadScript)
 })
 
+// ====================== 监听器 ======================
+watch(
+  dialogVisible,
+  async (newVal) => {
+    if (newVal) {
+      try {
+        // 清理旧实例
+        cleanupMap()
+
+        // 等待DOM更新
+        await nextTick()
+
+        // 确保容器存在
+        const container = document.getElementById('container')
+        if (!container) throw new Error('地图容器未找到')
+
+        // 加载地图SDK
+        await loadMapSDK()
+
+        // 初始化地图
+        initMap()
+
+        // 获取省份数据
+        const res = await getAreaListByPid(0)
+        provinceList.value = res.data
+
+        // 如果存在初始地址，进行解析
+        if (props.modelValue.address) {
+          await parseAndSetAddress(props.modelValue.address)
+        }
+
+        // 绑定resize监听器
+        bindResizeListener()
+      } catch (error) {
+        handleError(error)
+      }
+    } else {
+      cleanupMap()
+    }
+  },
+  { immediate: true }
+)
+
+// ====================== 方法实现 ======================
 const handleClose = (done: () => void) => {
   done()
 }
@@ -126,80 +188,164 @@ const handleConfirm = () => {
     ElMessage.warning(t('mapPickerWarning'))
     return
   }
+
+  // 拼接完整地址
+  const provinceName = province.value
+    ? provinceList.value.find((p) => p.id === province.value)?.name || ''
+    : ''
+  const cityName = city.value
+    ? cityList.value.find((c) => c.id === city.value)?.name || ''
+    : ''
+  const districtName = district.value
+    ? districtList.value.find((d) => d.id === district.value)?.name || ''
+    : ''
+
+  const fullAddress = `${provinceName}${cityName}${districtName}${detailAddress.value}`
+
   emit('confirm', {
     lat: props.modelValue.lat,
     lng: props.modelValue.lng,
-    address: detailAddress.value,
+    address: fullAddress,
   })
+
   dialogVisible.value = false
 }
 
-// 地图相关
-let map: any
-let marker: any
-const mapKey = ref('')
+// 地址解析逻辑
+const parseAndSetAddress = async (address: string) => {
+  // 解析地址
+  const { provinceName, cityName, districtName, detail } = parseAddress(address)
+  detailAddress.value = detail
 
-// 区域选择
-const province = ref('')
-const city = ref('')
-const district = ref('')
-const detailAddress = ref('')
-const provinceList = ref<any[]>([])
-const cityList = ref<any[]>([])
-const districtList = ref<any[]>([])
+  // 1. 处理省份选择
+  if (provinceName) {
+    const provinceItem = provinceList.value.find((p) =>
+      p.name.includes(provinceName)
+    )
+    if (provinceItem) {
+      province.value = provinceItem.id
 
-// 初始化地图
-const initMapScript = () => {
-  const container = document.getElementById('container')
-  if (!container) return
-
-  mapScript = document.createElement('script')
-  mapKey.value = 'IZQBZ-3UHEU-WTCVD-2464U-I5N4V-ZFFU3'
-  mapScript.type = 'text/javascript'
-  mapScript.src =
-    'https://map.qq.com/api/gljs?libraries=tools,service&v=1.exp&key=IZQBZ-3UHEU-WTCVD-2464U-I5N4V-ZFFU3'
-  document.body.appendChild(mapScript)
-  mapScript.onload = () => {
-    setTimeout(() => {
-      initMap()
-    }, 500)
+      // 2. 处理城市选择
+      const cityRes = await getAreaListByPid(province.value)
+      cityList.value = cityRes.data
+
+      if (cityName) {
+        const cityItem = cityList.value.find((c) => c.name.includes(cityName))
+        if (cityItem) {
+          city.value = cityItem.id
+
+          // 3. 处理区县选择
+          const districtRes = await getAreaListByPid(city.value)
+          districtList.value = districtRes.data
+
+          if (districtName) {
+            const districtItem = districtList.value.find((d) =>
+              d.name.includes(districtName)
+            )
+            if (districtItem) {
+              district.value = districtItem.id
+            }
+          }
+        }
+      }
+    }
+  }
+
+  // 触发地址搜索
+  handleAddressSearch()
+}
+
+// 地址拆分函数
+const parseAddress = (address: string) => {
+  let provinceName = ''
+  let cityName = ''
+  let districtName = ''
+  let detail = address
+
+  // 提取省/直辖市/自治区
+  const provinceMatch = address.match(/^([^省市自治区]+[省市区]|[^市]+市)/)
+  if (provinceMatch) {
+    provinceName = provinceMatch[0]
+    detail = address.slice(provinceName.length)
+  }
+
+  // 提取市
+  const cityMatch = detail.match(/^([^市区]+市)/)
+  if (cityMatch) {
+    cityName = cityMatch[0]
+    detail = detail.slice(cityName.length)
+  }
+
+  // 提取区/县
+  const districtMatch = detail.match(/^([^区县]+[区县])/)
+  if (districtMatch) {
+    districtName = districtMatch[0]
+    detail = detail.slice(districtName.length)
   }
 
-  mapScript.onerror = (error) => {
-    console.error('地图脚本加载失败:', error)
+  return {
+    provinceName,
+    cityName,
+    districtName,
+    detail: detail.trim() || '',
   }
 }
 
-let mapScript: HTMLScriptElement | null = null
+// ====================== 地图相关方法 ======================
+const cleanupMap = () => {
+  if (mapScript) {
+    document.body.removeChild(mapScript)
+    mapScript = null
+  }
 
-watch(
-  dialogVisible,
-  (newVal) => {
-    if (newVal) {
-      if (mapScript) {
-        document.body.removeChild(mapScript)
-        mapScript = null
-      }
-      initMapScript()
-      getAreaListByPid(0).then((res) => {
-        provinceList.value = res.data
-      })
-    } else {
-      if (mapScript) {
-        document.body.removeChild(mapScript)
-        mapScript = null
+  if (map) {
+    map.destroy()
+    map = null
+  }
+
+  marker = null
+
+  if (resizeTimer) {
+    clearTimeout(resizeTimer)
+    resizeTimer = null
+  }
+
+  window.removeEventListener('resize', handleResize)
+}
+
+const loadMapSDK = (): Promise<void> => {
+  return new Promise((resolve, reject) => {
+    mapKey.value = 'AKTBZ-OGICT-E5NXQ-LGEGK-H5AJ5-M2BOX'
+
+    mapScript = document.createElement('script')
+    mapScript.type = 'text/javascript'
+    mapScript.src = `https://map.qq.com/api/gljs?libraries=tools ,service&v=1.exp&key=${mapKey.value}`
+
+    mapScript.onload = () => {
+      if ((window as any).TMap) {
+        resolve()
+      } else {
+        reject(new Error('TMap未定义'))
       }
-      map = null
-      marker = null
     }
-  },
-  { immediate: true }
-)
+
+    mapScript.onerror = (error) => {
+      reject(error)
+    }
+
+    document.body.appendChild(mapScript)
+  })
+}
 
 const initMap = () => {
-  console.log('initMap')
+  const container = document.getElementById('container')
+  if (!(window as any).TMap || !container) {
+    throw new Error('地图SDK未加载或容器不存在')
+  }
+
   const TMap = (window as any).TMap
   const center = new TMap.LatLng(39.90403, 116.407526)
+
   map = new TMap.Map('container', {
     center,
     zoom: 12,
@@ -221,20 +367,37 @@ const initMap = () => {
   })
 }
 
-// 区域选择处理
-const handleProvinceChange = (val: string) => {
-  getAreaListByPid(val).then((res) => {
+const bindResizeListener = () => {
+  window.addEventListener('resize', handleResize)
+}
+
+const handleResize = () => {
+  if (resizeTimer) clearTimeout(resizeTimer)
+  resizeTimer = setTimeout(() => {
+    map?.setSize()
+  }, 300)
+}
+
+// ====================== 区域选择处理 ======================
+const handleProvinceChange = async (val: string) => {
+  try {
+    const res = await getAreaListByPid(val)
     cityList.value = res.data
     city.value = ''
     district.value = ''
-  })
+  } catch (error) {
+    handleError(error)
+  }
 }
 
-const handleCityChange = (val: string) => {
-  getAreaListByPid(val).then((res) => {
+const handleCityChange = async (val: string) => {
+  try {
+    const res = await getAreaListByPid(val)
     districtList.value = res.data
     district.value = ''
-  })
+  } catch (error) {
+    handleError(error)
+  }
 }
 
 const handleDistrictChange = (val: string) => {
@@ -242,47 +405,59 @@ const handleDistrictChange = (val: string) => {
 }
 
 // 地址搜索
-const handleAddressSearch = () => {
-  const address = [
-    province.value
-      ? provinceList.value.find((p) => p.id === province.value)?.name
-      : '',
-    city.value ? cityList.value.find((c) => c.id === city.value)?.name : '',
-    district.value
-      ? districtList.value.find((d) => d.id === district.value)?.name
-      : '',
-    detailAddress.value,
-  ].join('')
-
-  addressToLatLng({ mapKey: mapKey.value, address }).then(
-    ({ message, result }) => {
-      if (message == 'Success' || message == 'query ok') {
-        const latLng = new (window as any).TMap.LatLng(
-          result.location.lat,
-          result.location.lng
-        )
-        map.setCenter(latLng)
-        marker.updateGeometries({
-          id: 'center',
-          position: latLng,
-        })
-        emit('update:modelValue', {
-          lat: result.location.lat,
-          lng: result.location.lng,
-          address: detailAddress.value,
-        })
-      }
+const handleAddressSearch = async () => {
+  try {
+    const address = [
+      province.value
+        ? provinceList.value.find((p) => p.id === province.value)?.name
+        : '',
+      city.value ? cityList.value.find((c) => c.id === city.value)?.name : '',
+      district.value
+        ? districtList.value.find((d) => d.id === district.value)?.name
+        : '',
+      detailAddress.value,
+    ].join('')
+
+    const { message, result } = await addressToLatLng({
+      mapKey: mapKey.value,
+      address,
+    })
+
+    if (message == 'Success' || message == 'query ok') {
+      const latLng = new (window as any).TMap.LatLng(
+        result.location.lat,
+        result.location.lng
+      )
+      map.setCenter(latLng)
+      marker.updateGeometries({
+        id: 'center',
+        position: latLng,
+      })
+      emit('update:modelValue', {
+        lat: result.location.lat,
+        lng: result.location.lng,
+        address: detailAddress.value,
+      })
     }
-  )
+  } catch (error) {
+    handleError(error)
+  }
+}
+
+// ====================== 错误处理 ======================
+const handleError = (error: any) => {
+  console.error('地图组件错误:', error)
+  ElMessage.error(t('mapLoadFailed'))
+  dialogVisible.value = false
 }
 
 // 回显处理
 watch(
   () => props.modelValue,
   (newVal) => {
-    if (newVal.lat && newVal.lng) {
+    if (newVal.lat && newVal.lng && map) {
       const latLng = new (window as any).TMap.LatLng(newVal.lat, newVal.lng)
-      map?.setCenter(latLng)
+      map.setCenter(latLng)
       marker?.updateGeometries({
         id: 'center',
         position: latLng,
@@ -291,6 +466,10 @@ watch(
   },
   { immediate: true }
 )
+
+onBeforeUnmount(() => {
+  cleanupMap()
+})
 </script>
 
 <style scoped>
diff --git a/niucloud/app/adminapi/controller/venue/Venue.php b/niucloud/app/adminapi/controller/venue/Venue.php
index 63cc4f63..9db487d8 100644
--- a/niucloud/app/adminapi/controller/venue/Venue.php
+++ b/niucloud/app/adminapi/controller/venue/Venue.php
@@ -33,9 +33,8 @@ class Venue extends BaseAdminController
              ["capacity",""],
              ["availability_status",""],
              ["time_range_type",""],
-             ["time_range_start",""],
-             ["time_range_end",""],
-             ["fixed_time_ranges",""]
+             ["created_at",""],
+             ["updated_at",""]
         ]);
         return success((new VenueService())->getPage($data));
     }
@@ -103,4 +102,8 @@ class Venue extends BaseAdminController
     }
 
     
+    public function getCampusAll(){
+         return success(( new VenueService())->getCampusAll());
+    }
+
 }
diff --git a/niucloud/app/adminapi/route/venue.php b/niucloud/app/adminapi/route/venue.php
index fad57d05..35faef3e 100644
--- a/niucloud/app/adminapi/route/venue.php
+++ b/niucloud/app/adminapi/route/venue.php
@@ -14,6 +14,7 @@ use think\facade\Route;
 use app\adminapi\middleware\AdminCheckRole;
 use app\adminapi\middleware\AdminCheckToken;
 use app\adminapi\middleware\AdminLog;
+
 // USER_CODE_BEGIN -- venue
 
 Route::group('venue', function () {
@@ -29,6 +30,8 @@ Route::group('venue', function () {
     //删除场地
     Route::delete('venue/:id', 'venue.Venue/del');
     
+    Route::get('campus_all','venue.Venue/getCampusAll');
+
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,
diff --git a/niucloud/app/model/venue/Venue.php b/niucloud/app/model/venue/Venue.php
index 0f5e48e3..946753ce 100644
--- a/niucloud/app/model/venue/Venue.php
+++ b/niucloud/app/model/venue/Venue.php
@@ -9,19 +9,21 @@
 // | Author: Niucloud Team
 // +----------------------------------------------------------------------
 
-namespace app\model\campus;
+namespace app\model\venue;
 
 use core\base\BaseModel;
 use think\model\concern\SoftDelete;
 use think\model\relation\HasMany;
 use think\model\relation\HasOne;
 
+use app\model\campus\Campus;
+
 /**
- * 校区模型
- * Class Campus
- * @package app\model\campus
+ * 场地模型
+ * Class Venue
+ * @package app\model\venue
  */
-class Campus extends BaseModel
+class Venue extends BaseModel
 {
 
      use SoftDelete;
@@ -36,13 +38,13 @@ class Campus extends BaseModel
      * 模型名称
      * @var string
      */
-    protected $name = 'campus';
+    protected $name = 'venue';
 
     /**
     * 定义软删除标记字段.
     * @var string
     */
-    protected $deleteTime = 'delete_time';
+    protected $deleteTime = 'deleted_at';
 
     /**
     * 定义软删除字段的默认值.
@@ -51,38 +53,86 @@ class Campus extends BaseModel
     protected $defaultSoftDelete = 0;
 
     /**
-     * 搜索器:校区校区名称
+     * 搜索器:场地校区
+     * @param $value
+     * @param $data
+     */
+    public function searchCampusIdAttr($query, $value, $data)
+    {
+       if ($value) {
+            $query->where("campus_id", $value);
+        }
+    }
+    
+    /**
+     * 搜索器:场地场地名称
      * @param $value
      * @param $data
      */
-    public function searchCampusNameAttr($query, $value, $data)
+    public function searchVenueNameAttr($query, $value, $data)
     {
        if ($value) {
-            $query->where("campus_name", "like", "%".$value."%");
+            $query->where("venue_name", $value);
         }
     }
     
     /**
-     * 搜索器:校区校区地址
+     * 搜索器:场地场地可容纳人数上限
      * @param $value
      * @param $data
      */
-    public function searchCampusAddressAttr($query, $value, $data)
+    public function searchCapacityAttr($query, $value, $data)
     {
        if ($value) {
-            $query->where("campus_address", $value);
+            $query->where("capacity", $value);
         }
     }
     
     /**
-     * 搜索器:校区校区状态
+     * 搜索器:场地场地可用状态
      * @param $value
      * @param $data
      */
-    public function searchCampusStatusAttr($query, $value, $data)
+    public function searchAvailabilityStatusAttr($query, $value, $data)
     {
        if ($value) {
-            $query->where("campus_status", $value);
+            $query->where("availability_status", $value);
+        }
+    }
+    
+    /**
+     * 搜索器:场地场地可用时间范围类型
+     * @param $value
+     * @param $data
+     */
+    public function searchTimeRangeTypeAttr($query, $value, $data)
+    {
+       if ($value) {
+            $query->where("time_range_type", $value);
+        }
+    }
+    
+    /**
+     * 搜索器:场地创建时间
+     * @param $value
+     * @param $data
+     */
+    public function searchCreatedAtAttr($query, $value, $data)
+    {
+       if ($value) {
+            $query->where("created_at", $value);
+        }
+    }
+    
+    /**
+     * 搜索器:场地修改时间
+     * @param $value
+     * @param $data
+     */
+    public function searchUpdatedAtAttr($query, $value, $data)
+    {
+       if ($value) {
+            $query->where("updated_at", $value);
         }
     }
     
@@ -91,4 +141,8 @@ class Campus extends BaseModel
     
 
     
+    public function campus(){
+       return $this->hasOne(Campus::class, 'id', 'campus_id')->joinType('left')->withField('campus_name,id')->bind(['campus_id_name'=>'campus_name']);
+    }
+
 }
diff --git a/niucloud/app/service/admin/campus/CampusService.php b/niucloud/app/service/admin/campus/CampusService.php
index 2d67b47f..8603413b 100644
--- a/niucloud/app/service/admin/campus/CampusService.php
+++ b/niucloud/app/service/admin/campus/CampusService.php
@@ -39,7 +39,7 @@ class CampusService extends BaseAdminService
         $field = 'id,campus_name,campus_address,campus_preview_image,campus_coordinates,campus_introduction,campus_status,create_time,update_time,delete_time';
         $order = '';
 
-        $search_model = $this->model->withSearch(["campus_name","campus_address","campus_status"], $where)->field($field)->order($order);
+        $search_model = $this->model->withSearch(["campus_name", "campus_address", "campus_status"], $where)->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
@@ -54,7 +54,8 @@ class CampusService extends BaseAdminService
         $field = 'id,campus_name,campus_address,campus_preview_image,campus_coordinates,campus_introduction,campus_status,create_time,update_time,delete_time';
 
         $info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
-   $info['campus_status'] = strval($info['campus_status']);
+        $info['campus_status'] = strval($info['campus_status']);
+        $info['campus_coordinates'] = json_decode($info['campus_coordinates'], true);
         return $info;
     }
 
@@ -65,6 +66,10 @@ class CampusService extends BaseAdminService
      */
     public function add(array $data)
     {
+        if (is_array($data['campus_coordinates'])) {
+            $data['campus_address'] = $data['campus_coordinates']['address'];
+            $data['campus_coordinates'] = json_encode($data['campus_coordinates']);
+        }
         $res = $this->model->create($data);
         return $res->id;
 
@@ -78,7 +83,10 @@ class CampusService extends BaseAdminService
      */
     public function edit(int $id, array $data)
     {
-
+        if (is_array($data['campus_coordinates'])) {
+            $data['campus_address'] = $data['campus_coordinates']['address'];
+            $data['campus_coordinates'] = json_encode($data['campus_coordinates']);
+        }
         $this->model->where([['id', '=', $id]])->update($data);
         return true;
     }
@@ -95,6 +103,5 @@ class CampusService extends BaseAdminService
         return $res;
     }
 
-    
 
 }
diff --git a/niucloud/app/service/admin/student_courses/StudentCoursesService.php b/niucloud/app/service/admin/student_courses/StudentCoursesService.php
index 2d67b47f..2aab388d 100644
--- a/niucloud/app/service/admin/student_courses/StudentCoursesService.php
+++ b/niucloud/app/service/admin/student_courses/StudentCoursesService.php
@@ -21,7 +21,7 @@ use core\base\BaseAdminService;
  * Class CampusService
  * @package app\service\admin\campus
  */
-class CampusService extends BaseAdminService
+class StudentCoursesService extends BaseAdminService
 {
     public function __construct()
     {
diff --git a/niucloud/app/service/admin/venue/VenueService.php b/niucloud/app/service/admin/venue/VenueService.php
index 929d22a5..c5ee49ac 100644
--- a/niucloud/app/service/admin/venue/VenueService.php
+++ b/niucloud/app/service/admin/venue/VenueService.php
@@ -12,6 +12,7 @@
 namespace app\service\admin\venue;
 
 use app\model\venue\Venue;
+use app\model\campus\Campus;
 
 use core\base\BaseAdminService;
 
@@ -37,9 +38,9 @@ class VenueService extends BaseAdminService
     public function getPage(array $where = [])
     {
         $field = 'id,campus_id,venue_name,capacity,availability_status,time_range_type,time_range_start,time_range_end,fixed_time_ranges,created_at,updated_at,deleted_at';
-        $order = 'id desc';
+        $order = 'updated_at desc';
 
-        $search_model = $this->model->withSearch(["id","campus_id","venue_name","capacity","availability_status","time_range_type","time_range_start","time_range_end","fixed_time_ranges"], $where)->field($field)->order($order);
+        $search_model = $this->model->withSearch(["campus_id","venue_name","capacity","availability_status","time_range_type","created_at","updated_at"], $where)->with(['campus'])->field($field)->order($order);
         $list = $this->pageQuery($search_model);
         return $list;
     }
@@ -53,7 +54,9 @@ class VenueService extends BaseAdminService
     {
         $field = 'id,campus_id,venue_name,capacity,availability_status,time_range_type,time_range_start,time_range_end,fixed_time_ranges,created_at,updated_at,deleted_at';
 
-        $info = $this->model->field($field)->where([['id', "=", $id]])->findOrEmpty()->toArray();
+        $info = $this->model->field($field)->where([['id', "=", $id]])->with(['campus'])->findOrEmpty()->toArray();
+   $info['availability_status'] = strval($info['availability_status']);
+   $info['time_range_type'] = strval($info['time_range_type']);
         return $info;
     }
 
@@ -95,5 +98,10 @@ class VenueService extends BaseAdminService
     }
 
     
+    public function getCampusAll(){
+       $campusModel = new Campus();
+       return $campusModel->select()->toArray();
+    }
+
 
 }
diff --git a/niucloud/app/validate/venue/Venue.php b/niucloud/app/validate/venue/Venue.php
index 1d760a09..d4e25396 100644
--- a/niucloud/app/validate/venue/Venue.php
+++ b/niucloud/app/validate/venue/Venue.php
@@ -22,7 +22,7 @@ class Venue extends BaseValidate
        protected $rule = [
             'campus_id' => 'require',
             'venue_name' => 'require',
-            'capacity' => 'require',
+            'capacity' => 'require|between:1,500',
             'availability_status' => 'require',
             'time_range_type' => 'require',
         ];
@@ -31,6 +31,7 @@ class Venue extends BaseValidate
             'campus_id.require' => ['common_validate.require', ['campus_id']],
             'venue_name.require' => ['common_validate.require', ['venue_name']],
             'capacity.require' => ['common_validate.require', ['capacity']],
+            'capacity.between' => ['common_validate.between', ['capacity','1','500']],
             'availability_status.require' => ['common_validate.require', ['availability_status']],
             'time_range_type.require' => ['common_validate.require', ['time_range_type']],
         ];