From e62f76eab4dab7a620c8008d518580daafac47fe Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Sun, 18 May 2025 11:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=8C=BA=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/app/api/venue.ts                    |   4 +
 admin/src/app/lang/zh-cn/venue.venue.json     |   8 +-
 .../app/views/venue/components/venue-edit.vue | 583 ++++++++++--------
 admin/src/components/TencentMapPicker.vue     |   5 +-
 .../app/adminapi/controller/venue/Venue.php   |   4 -
 niucloud/app/adminapi/route/venue.php         |   2 +
 niucloud/app/validate/venue/Venue.php         |   4 +-
 7 files changed, 329 insertions(+), 281 deletions(-)

diff --git a/admin/src/app/api/venue.ts b/admin/src/app/api/venue.ts
index 695778f5..bf28df73 100644
--- a/admin/src/app/api/venue.ts
+++ b/admin/src/app/api/venue.ts
@@ -2,6 +2,10 @@ import request from '@/utils/request'
 
 
 
+
+
+
+
 // USER_CODE_BEGIN -- venue
 /**
  * 获取场地列表
diff --git a/admin/src/app/lang/zh-cn/venue.venue.json b/admin/src/app/lang/zh-cn/venue.venue.json
index 03d57f6a..45c03127 100644
--- a/admin/src/app/lang/zh-cn/venue.venue.json
+++ b/admin/src/app/lang/zh-cn/venue.venue.json
@@ -9,12 +9,8 @@
       "availabilityStatusPlaceholder":"请输入场地可用状态",
       "timeRangeType":"场地可用时间范围类型",
       "timeRangeTypePlaceholder":"请输入场地可用时间范围类型",
-      "timeRangeStart":"范围类型的开始时间",
-      "timeRangeStartPlaceholder":"请输入范围类型的开始时间",
-      "timeRangeEnd":"范围类型的结束时间",
-      "timeRangeEndPlaceholder":"请输入范围类型的结束时间",
-      "fixedTimeRanges":"固定时间范围类型的可用时间, 存储为JSON数组",
-      "fixedTimeRangesPlaceholder":"请输入固定时间范围类型的可用时间, 存储为JSON数组",
+      "fixedTimeRanges":"时间范围",
+      "fixedTimeRangesPlaceholder":"请输入时间范围",
       "createdAt":"创建时间",
       "createdAtPlaceholder":"请输入创建时间",
       "updatedAt":"修改时间",
diff --git a/admin/src/app/views/venue/components/venue-edit.vue b/admin/src/app/views/venue/components/venue-edit.vue
index 47ec3aad..79e38621 100644
--- a/admin/src/app/views/venue/components/venue-edit.vue
+++ b/admin/src/app/views/venue/components/venue-edit.vue
@@ -1,267 +1,316 @@
-<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>
+<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 label="1">可用</el-radio>
+          <el-radio label="2">不可用</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('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: '',
+  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',
+      },
+    ],
+    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/components/TencentMapPicker.vue b/admin/src/components/TencentMapPicker.vue
index 41341f31..89894672 100644
--- a/admin/src/components/TencentMapPicker.vue
+++ b/admin/src/components/TencentMapPicker.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     v-model="dialogVisible"
-    :title="t('mapPickerTitle')"
+    title="位置选择"
     width="800px"
     :before-close="handleClose"
     :close-on-click-modal="false"
@@ -344,7 +344,7 @@ const initMap = () => {
   }
 
   const TMap = (window as any).TMap
-  const center = new TMap.LatLng(39.90403, 116.407526)
+  const center = new TMap.LatLng(20.029077, 110.366367)
 
   map = new TMap.Map('container', {
     center,
@@ -499,5 +499,6 @@ onBeforeUnmount(() => {
 .address-search {
   display: flex;
   gap: 8px;
+  margin-top: 20px;
 }
 </style>
diff --git a/niucloud/app/adminapi/controller/venue/Venue.php b/niucloud/app/adminapi/controller/venue/Venue.php
index 9db487d8..695807cd 100644
--- a/niucloud/app/adminapi/controller/venue/Venue.php
+++ b/niucloud/app/adminapi/controller/venue/Venue.php
@@ -59,8 +59,6 @@ class Venue extends BaseAdminController
              ["capacity",0],
              ["availability_status",0],
              ["time_range_type",""],
-             ["time_range_start",""],
-             ["time_range_end",""],
              ["fixed_time_ranges",""],
 
         ]);
@@ -81,8 +79,6 @@ class Venue extends BaseAdminController
              ["capacity",0],
              ["availability_status",0],
              ["time_range_type",""],
-             ["time_range_start",""],
-             ["time_range_end",""],
              ["fixed_time_ranges",""],
 
         ]);
diff --git a/niucloud/app/adminapi/route/venue.php b/niucloud/app/adminapi/route/venue.php
index 35faef3e..6234ac7e 100644
--- a/niucloud/app/adminapi/route/venue.php
+++ b/niucloud/app/adminapi/route/venue.php
@@ -15,6 +15,8 @@ use app\adminapi\middleware\AdminCheckRole;
 use app\adminapi\middleware\AdminCheckToken;
 use app\adminapi\middleware\AdminLog;
 
+
+
 // USER_CODE_BEGIN -- venue
 
 Route::group('venue', function () {
diff --git a/niucloud/app/validate/venue/Venue.php b/niucloud/app/validate/venue/Venue.php
index d4e25396..01b6d678 100644
--- a/niucloud/app/validate/venue/Venue.php
+++ b/niucloud/app/validate/venue/Venue.php
@@ -37,8 +37,8 @@ class Venue extends BaseValidate
         ];
 
        protected $scene = [
-            "add" => ['campus_id', 'venue_name', 'capacity', 'availability_status', 'time_range_type', 'time_range_start', 'time_range_end', 'fixed_time_ranges'],
-            "edit" => ['campus_id', 'venue_name', 'capacity', 'availability_status', 'time_range_type', 'time_range_start', 'time_range_end', 'fixed_time_ranges']
+            "add" => ['campus_id', 'venue_name', 'capacity', 'availability_status', 'time_range_type', 'fixed_time_ranges'],
+            "edit" => ['campus_id', 'venue_name', 'capacity', 'availability_status', 'time_range_type', 'fixed_time_ranges']
         ];
 
 }