From 887a65dee0cc29f2d8df0c2cc04bdaf54218d5a8 Mon Sep 17 00:00:00 2001
From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com>
Date: Wed, 13 Nov 2024 17:22:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/hysgl/HysglForm.vue | 102 +++++++++++++++++------------
 src/views/Home/hysgl/index.vue     |  74 +--------------------
 2 files changed, 63 insertions(+), 113 deletions(-)

diff --git a/src/views/Home/hysgl/HysglForm.vue b/src/views/Home/hysgl/HysglForm.vue
index 39055e5..4765fe9 100644
--- a/src/views/Home/hysgl/HysglForm.vue
+++ b/src/views/Home/hysgl/HysglForm.vue
@@ -1,58 +1,76 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 80%">
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="120px"
       v-loading="formLoading"
     >
       <el-form-item label="标题" prop="title">
         <el-input v-model="formData.title" placeholder="请输入标题" />
       </el-form-item>
-      <el-form-item label="会议室名" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入会议室名" />
-      </el-form-item>
-      <el-form-item label="会议室地址" prop="location">
-        <el-input v-model="formData.location" type="textarea" placeholder="请输入会议室地址" />
-      </el-form-item>
-      <el-form-item label="会议室类型" prop="roomType">
-        <el-select v-model="formData.roomType" placeholder="请选择会议室类型">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HSGL_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="会议室管理员" prop="manager">
-        <el-input v-model="formData.manager" placeholder="请输入会议室管理员" />
-      </el-form-item>
-      <el-form-item label="会议室大小" prop="roomMax">
-        <el-input v-model="formData.roomMax" placeholder="请输入会议室大小" />
-      </el-form-item>
-      <el-form-item label="容纳人数" prop="capacity">
-        <el-input v-model="formData.capacity" placeholder="请输入容纳人数" />
-      </el-form-item>
-      <el-form-item label="会议室设备" prop="facilities">
-        <el-input v-model="formData.facilities" type="textarea" placeholder="请输入会议室设备" />
-      </el-form-item>
-      <el-form-item label="使用状态" prop="roomStatus">
-        <el-select v-model="formData.roomStatus" placeholder="请选择使用状态">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.HSGL_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="会议室名" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入会议室名" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="会议室管理员" prop="manager">
+            <el-input v-model="formData.manager" placeholder="请输入会议室管理员" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="会议室大小" prop="roomMax">
+            <el-input v-model="formData.roomMax" placeholder="请输入会议室大小" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="会议室类型" prop="roomType">
+            <el-select v-model="formData.roomType" placeholder="请选择会议室类型">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.HSGL_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="容纳人数" prop="capacity">
+            <el-input v-model="formData.capacity" placeholder="请输入容纳人数" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="使用状态" prop="roomStatus">
+            <el-select v-model="formData.roomStatus" placeholder="请选择使用状态">
+              <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.HSGL_STATUS)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="会议室照片" prop="photo">
         <UploadImg v-model="formData.photo" />
       </el-form-item>
+      <el-form-item label="会议室地址" prop="location">
+        <el-input autosize v-model="formData.location" type="textarea" placeholder="请输入会议室地址" />
+      </el-form-item>
+      <el-form-item label="会议室设备" prop="facilities">
+        <el-input autosize v-model="formData.facilities" type="textarea" placeholder="请输入会议室设备" />
+      </el-form-item>
       <el-form-item label="备注" prop="remark">
-        <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+        <el-input autosize v-model="formData.remark" type="textarea" placeholder="请输入备注" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -159,4 +177,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/Home/hysgl/index.vue b/src/views/Home/hysgl/index.vue
index 0df7039..ce3a716 100644
--- a/src/views/Home/hysgl/index.vue
+++ b/src/views/Home/hysgl/index.vue
@@ -6,35 +6,8 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="100px"
     >
-      <el-form-item label="会议室管理id" prop="id">
-        <el-input
-          v-model="queryParams.id"
-          placeholder="请输入会议室管理id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入标题"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="会议室名" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入会议室名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="会议室类型" prop="roomType">
         <el-select
           v-model="queryParams.roomType"
@@ -59,24 +32,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="会议室大小" prop="roomMax">
-        <el-input
-          v-model="queryParams.roomMax"
-          placeholder="请输入会议室大小"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="容纳人数" prop="capacity">
-        <el-input
-          v-model="queryParams.capacity"
-          placeholder="请输入容纳人数"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="使用状态" prop="roomStatus">
         <el-select
           v-model="queryParams.roomStatus"
@@ -92,17 +47,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -130,37 +74,25 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="会议室管理id" align="center" prop="id" />
+      <el-table-column label="序号" align="center" type="index" width="70" />
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="会议室名" align="center" prop="name" />
-      <el-table-column label="会议室地址" align="center" prop="location" />
       <el-table-column label="会议室类型" align="center" prop="roomType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.HSGL_TYPE" :value="scope.row.roomType" />
         </template>
       </el-table-column>
       <el-table-column label="会议室管理员" align="center" prop="manager" />
-      <el-table-column label="会议室大小" align="center" prop="roomMax" />
-      <el-table-column label="容纳人数" align="center" prop="capacity" />
-      <el-table-column label="会议室设备" align="center" prop="facilities" />
       <el-table-column label="使用状态" align="center" prop="roomStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.HSGL_STATUS" :value="scope.row.roomStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="会议室照片" align="center" prop="photo" >
+      <el-table-column label="会议室照片" align="center" prop="photo" width="100" >
         <template #default="scope">
           <el-image :src="scope.row.photo"/>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button