From 44dcebfe3640ebdfd340809ce181a4443e74a6de Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 20 May 2025 15:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/integrated/meetingBooking.ts          |  41 ++
 src/api/integrated/meetingRoomEquipment.ts    |  41 ++
 src/views/integrated/meetingBooking/form.vue  | 155 ++++++++
 src/views/integrated/meetingBooking/index.vue | 134 +++++++
 src/views/integrated/meetingRoom/form.vue     | 355 ++++++++++++++----
 .../integrated/meetingRoomEquipment/form.vue  | 111 ++++++
 .../integrated/meetingRoomEquipment/index.vue | 115 ++++++
 7 files changed, 872 insertions(+), 80 deletions(-)
 create mode 100644 src/api/integrated/meetingBooking.ts
 create mode 100644 src/api/integrated/meetingRoomEquipment.ts
 create mode 100644 src/views/integrated/meetingBooking/form.vue
 create mode 100644 src/views/integrated/meetingBooking/index.vue
 create mode 100644 src/views/integrated/meetingRoomEquipment/form.vue
 create mode 100644 src/views/integrated/meetingRoomEquipment/index.vue

diff --git a/src/api/integrated/meetingBooking.ts b/src/api/integrated/meetingBooking.ts
new file mode 100644
index 0000000..759b69f
--- /dev/null
+++ b/src/api/integrated/meetingBooking.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/integrated/meetingBooking/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/integrated/meetingBooking',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/integrated/meetingBooking/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/integrated/meetingBooking',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/integrated/meetingBooking',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/api/integrated/meetingRoomEquipment.ts b/src/api/integrated/meetingRoomEquipment.ts
new file mode 100644
index 0000000..b591a93
--- /dev/null
+++ b/src/api/integrated/meetingRoomEquipment.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/integrated/meetingRoomEquipment/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/integrated/meetingRoomEquipment',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/integrated/meetingRoomEquipment/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/integrated/meetingRoomEquipment',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/integrated/meetingRoomEquipment',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/views/integrated/meetingBooking/form.vue b/src/views/integrated/meetingBooking/form.vue
new file mode 100644
index 0000000..135f22e
--- /dev/null
+++ b/src/views/integrated/meetingBooking/form.vue
@@ -0,0 +1,155 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="12" class="mb20">
+      <el-form-item label="会议主题" prop="title">
+        <el-input v-model="form.title" placeholder="请输入会议主题"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="会议室id" prop="roomId">
+        <el-input v-model="form.roomId" placeholder="请输入会议室id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="会议说明" prop="description">
+        <el-input v-model="form.description" placeholder="请输入会议说明"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="审批状态" prop="meetingStatus">
+        <el-input v-model="form.meetingStatus" placeholder="请输入审批状态"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="部门id" prop="deptId">
+        <el-input v-model="form.deptId" placeholder="请输入部门id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="申请人id" prop="applicantId">
+        <el-input v-model="form.applicantId" placeholder="请输入申请人id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="会议负责人id" prop="assigneeId">
+        <el-input v-model="form.assigneeId" placeholder="请输入会议负责人id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="开始时间" prop="startTime">
+        <el-input v-model="form.startTime" placeholder="请输入开始时间"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="结束时间" prop="endTime">
+        <el-input v-model="form.endTime" placeholder="请输入结束时间"/>
+      </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="MeetingBookingDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/meetingBooking'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  title: '',
+	  roomId: '',
+	  description: '',
+	  meetingStatus: '',
+	  deptId: '',
+	  applicantId: '',
+	  assigneeId: '',
+	  startTime: '',
+	  endTime: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+        title: [{required: true, message: '会议主题不能为空', trigger: 'blur'}],
+        roomId: [{required: true, message: '会议室id不能为空', trigger: 'blur'}],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取meetingBooking信息
+  if (id) {
+    form.id = id
+    getmeetingBookingData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getmeetingBookingData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/integrated/meetingBooking/index.vue b/src/views/integrated/meetingBooking/index.vue
new file mode 100644
index 0000000..8241efb
--- /dev/null
+++ b/src/views/integrated/meetingBooking/index.vue
@@ -0,0 +1,134 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row v-show="showSearch">
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+      <el-form-item label="会议主题" prop="title" >
+        <el-input placeholder="请输入会议主题" v-model="state.queryForm.title" />
+      </el-form-item>
+          <el-form-item>
+            <el-button icon="search" type="primary" @click="getDataList">
+              查询
+            </el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'integrated_meetingBooking_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'integrated_meetingBooking_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_meetingBooking_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border 
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="title" label="会议主题"  show-overflow-tooltip/>
+          <el-table-column prop="roomId" label="会议室id"  show-overflow-tooltip/>
+          <el-table-column prop="description" label="会议说明"  show-overflow-tooltip/>
+          <el-table-column prop="meetingStatus" label="审批状态"  show-overflow-tooltip/>
+          <el-table-column prop="deptId" label="部门id"  show-overflow-tooltip/>
+          <el-table-column prop="applicantId" label="申请人id"  show-overflow-tooltip/>
+          <el-table-column prop="assigneeId" label="会议负责人id"  show-overflow-tooltip/>
+          <el-table-column prop="startTime" label="开始时间"  show-overflow-tooltip/>
+          <el-table-column prop="endTime" label="结束时间"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_meetingBooking_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_meetingBooking_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemMeetingBooking">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/meetingBooking";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/integrated/meetingBooking/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingBooking.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/views/integrated/meetingRoom/form.vue b/src/views/integrated/meetingRoom/form.vue
index f645f55..fa78d2d 100644
--- a/src/views/integrated/meetingRoom/form.vue
+++ b/src/views/integrated/meetingRoom/form.vue
@@ -1,68 +1,94 @@
 <template>
     <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
       :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="24" class="mb20">
-      <el-form-item label="会议室名称" prop="roomName">
-        <el-input v-model="form.roomName" placeholder="请输入会议室名称"/>
-      </el-form-item>
-      </el-col>
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="基本信息" name="basic">
+          <el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px" v-loading="loading">
+            <el-row :gutter="24">
+              <el-col :span="24" class="mb20">
+                <el-form-item label="会议室名称" prop="roomName">
+                  <el-input v-model="form.roomName" placeholder="请输入会议室名称"/>
+                </el-form-item>
+              </el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="图片" prop="picUrl">
-        <upload-img v-model="form.picUrl"></upload-img>
-      </el-form-item>
-      </el-col>
+              <el-col :span="24" class="mb20">
+                <el-form-item label="图片" prop="picUrl">
+                  <upload-img v-model="form.picUrl"></upload-img>
+                </el-form-item>
+              </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="排序" prop="sort">
-        <el-input-number v-model="form.sort" placeholder="请输入排序"/>
-      </el-form-item>
-      </el-col>
+              <el-col :span="12" class="mb20">
+                <el-form-item label="排序" prop="sort">
+                  <el-input-number v-model="form.sort" placeholder="请输入排序"/>
+                </el-form-item>
+              </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="状态" prop="status">
-            <el-radio-group v-model="form.status">
-             <el-radio :label="item.value" v-for="(item, index) in meeting_status" border :key="index">{{ item.label }}
-            </el-radio>
-            </el-radio-group>
-        </el-form-item>
-      </el-col>
+              <el-col :span="12" class="mb20">
+                <el-form-item label="状态" prop="status">
+                  <el-radio-group v-model="form.status">
+                    <el-radio :label="item.value" v-for="(item, index) in meeting_status" border :key="index">{{ item.label }}
+                    </el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="默认管理员" prop="adminId">
-          <el-select v-model="form.adminId" placeholder="请选择默认管理员">
-            <el-option label="请选择">0</el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
+              <el-col :span="12" class="mb20">
+                <el-form-item label="默认管理员" prop="adminId">
+                  <el-select v-model="form.adminId" placeholder="请选择默认管理员">
+                    <el-option label="请选择">0</el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
 
+              <el-col :span="12" class="mb20">
+                <el-form-item label="容纳人数" prop="capacity">
+                  <el-input-number :min="1" :max="1000" v-model="form.capacity" placeholder="请输入容纳人数"></el-input-number>
+                </el-form-item>
+              </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="容纳人数" prop="capacity">
-        <el-input-number :min="1" :max="1000" v-model="form.capacity" placeholder="请输入容纳人数"></el-input-number>
-      </el-form-item>
-    </el-col>
+              <el-col :span="12" class="mb20">
+                <el-form-item label="可用时间段" prop="availableTime">
+                  <el-input v-model="form.availableTime" placeholder="请输入可用时间段"/>
+                </el-form-item>
+              </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="可用时间段" prop="availableTime">
-        <el-input v-model="form.availableTime" placeholder="请输入可用时间段"/>
-      </el-form-item>
-      </el-col>
-         <el-col :span="24" class="mb20">
-           <el-form-item label="位置" prop="location">
-             <el-input v-model="form.location" placeholder="请输入位置"/>
-           </el-form-item>
-         </el-col>
+              <el-col :span="24" class="mb20">
+                <el-form-item label="位置" prop="location">
+                  <el-input v-model="form.location" placeholder="请输入位置"/>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24" class="mb20">
+                <el-form-item label="描述" prop="description">
+                  <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </el-tab-pane>
+
+        <el-tab-pane label="设备信息" name="equipment">
+          <div class="equipment-container">
+            <div class="equipment-header">
+              <el-button type="primary" @click="openEquipmentDialog">选择设备</el-button>
+            </div>
+            <el-table :data="equipmentList" border style="width: 100%">
+              <el-table-column prop="equipmentName" label="设备名称" />
+              <el-table-column prop="quantity" label="数量">
+                <template #default="scope">
+                  <el-input-number v-model="scope.row.quantity" :min="1" :max="100" />
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="120">
+                <template #default="scope">
+                  <el-button type="danger" link @click="handleDeleteEquipment(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
 
-         <el-col :span="24" class="mb20">
-           <el-form-item label="描述" prop="description">
-             <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入描述"></editor>
-           </el-form-item>
-         </el-col>
-			</el-row>
-      </el-form>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="visible = false">取消</el-button>
@@ -70,12 +96,55 @@
         </span>
       </template>
     </el-dialog>
+
+    <!-- 设备选择弹窗 -->
+    <el-dialog v-model="equipmentDialogVisible" title="选择设备" width="50%" append-to-body>
+      <div class="equipment-select-container">
+        <el-form :model="equipmentQuery" inline>
+          <el-form-item label="设备名称">
+            <el-input v-model="equipmentQuery.equipmentName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="handleQuery">查询</el-button>
+            <el-button @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-table
+          v-loading="equipmentLoading"
+          :data="equipmentOptions"
+          @selection-change="handleSelectionChange"
+          border
+        >
+          <el-table-column type="selection" width="55" />
+          <el-table-column prop="name" label="设备名称" />
+          <el-table-column prop="remark" label="设备描述" />
+        </el-table>
+
+        <el-pagination
+          v-model:current-page="equipmentQuery.pageNum"
+          v-model:page-size="equipmentQuery.pageSize"
+          :total="total"
+          :page-sizes="[10, 20, 30, 50]"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="equipmentDialogVisible = false">取消</el-button>
+          <el-button type="primary" @click="handleEquipmentConfirm">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
 </template>
 
 <script setup lang="ts" name="MeetingRoomDialog">
 import { useDict } from '/@/hooks/dict';
 import { useMessage } from "/@/hooks/message";
 import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoom'
+import { fetchList } from '/@/api/integrated/meetingEquipment'
 import { rule } from '/@/utils/validate';
 const emit = defineEmits(['refresh']);
 
@@ -83,38 +152,140 @@ const emit = defineEmits(['refresh']);
 const dataFormRef = ref();
 const visible = ref(false)
 const loading = ref(false)
+const activeTab = ref('basic')
+
+interface Equipment {
+  id: string;
+  equipmentName: string;
+  quantity: number;
+}
+
+interface EquipmentOption {
+  id: string;
+  name: string;
+  remark: string;
+}
+
+const equipmentList = ref<Equipment[]>([])
+const equipmentOptions = ref<EquipmentOption[]>([])
+const selectedEquipment = ref<EquipmentOption[]>([])
+
+// 设备选择弹窗相关
+const equipmentDialogVisible = ref(false)
+const equipmentLoading = ref(false)
+const total = ref(0)
+
+// 查询参数
+const equipmentQuery = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  equipmentName: ''
+})
+
 // 定义字典
 const { meeting_status } = useDict('meeting_status')
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  roomName: '',
-	  picUrl: '',
-	  sort: '',
-	  description: '',
-	  status: '0',
-	  adminId: '',
-	  location: '',
-		capacity: 0,
-	  availableTime: '',
+  id:'',
+  roomName: '',
+  picUrl: '',
+  sort: '',
+  description: '',
+  status: '0',
+  adminId: '',
+  location: '',
+  capacity: 0,
+  availableTime: '',
 });
 
 // 定义校验规则
 const dataRules = ref({
-        roomName: [{required: true, message: '会议室名称不能为空', trigger: 'blur'}],
-        capacity: [{ validator: rule.number, trigger: 'blur' }],
+  roomName: [{required: true, message: '会议室名称不能为空', trigger: 'blur'}],
+  capacity: [{ validator: rule.number, trigger: 'blur' }],
 })
 
+// 打开设备选择弹窗
+const openEquipmentDialog = async () => {
+  equipmentDialogVisible.value = true
+  await getEquipmentList()
+}
+
+// 获取设备列表
+const getEquipmentList = async () => {
+  equipmentLoading.value = true
+  try {
+    const res = await fetchList(equipmentQuery)
+    equipmentOptions.value = res.data.records
+    total.value = res.data.total
+  } catch (err: any) {
+    useMessage().error(err.msg)
+  } finally {
+    equipmentLoading.value = false
+  }
+}
+
+// 查询
+const handleQuery = () => {
+  equipmentQuery.pageNum = 1
+  getEquipmentList()
+}
+
+// 重置查询
+const resetQuery = () => {
+  equipmentQuery.equipmentName = ''
+  handleQuery()
+}
+
+// 选择设备变化
+const handleSelectionChange = (selection: EquipmentOption[]) => {
+  selectedEquipment.value = selection
+}
+
+// 分页大小变化
+const handleSizeChange = (val: number) => {
+  equipmentQuery.pageSize = val
+  getEquipmentList()
+}
+
+// 页码变化
+const handleCurrentChange = (val: number) => {
+  equipmentQuery.pageNum = val
+  getEquipmentList()
+}
+
+// 确认选择设备
+const handleEquipmentConfirm = () => {
+  // 过滤掉已经存在的设备
+  const newEquipment = selectedEquipment.value.filter(selected => 
+    !equipmentList.value.some(existing => existing.id === selected.id)
+  )
+  
+  // 添加新选择的设备
+  equipmentList.value.push(...newEquipment.map(item => ({
+    id: item.id,
+    equipmentName: item.name,
+    quantity: 1
+  })))
+  
+  equipmentDialogVisible.value = false
+}
+
+// 删除设备
+const handleDeleteEquipment = (index: number) => {
+  equipmentList.value.splice(index, 1)
+}
+
 // 打开弹窗
 const openDialog = (id: string) => {
   visible.value = true
   form.id = ''
+  equipmentList.value = []
 
   // 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
 
   // 获取meetingRoom信息
   if (id) {
@@ -125,29 +296,41 @@ const openDialog = (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+  const valid = await dataFormRef.value.validate().catch(() => {});
+  if (!valid) return false;
 
-	try {
+  // 验证设备数量是否填写
+  if (equipmentList.value.some(item => !item.quantity)) {
+    useMessage().error('请填写所有设备的数量')
+    return false
+  }
+
+  try {
     loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
-	} catch (err: any) {
-		useMessage().error(err.msg);
-	} finally {
+    const submitData = {
+      ...form,
+      equipmentList: equipmentList.value
+    }
+    form.id ? await putObj(submitData) : await addObj(submitData);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
     loading.value = false;
   }
 };
 
-
 // 初始化表单数据
 const getmeetingRoomData = (id: string) => {
   // 获取数据
   loading.value = true
   getObj(id).then((res: any) => {
     Object.assign(form, res.data)
+    if (res.data.equipmentList) {
+      equipmentList.value = res.data.equipmentList
+    }
   }).finally(() => {
     loading.value = false
   })
@@ -158,3 +341,15 @@ defineExpose({
   openDialog
 });
 </script>
+
+<style scoped>
+.equipment-container {
+  padding: 20px;
+}
+.equipment-header {
+  margin-bottom: 20px;
+}
+.equipment-select-container {
+  padding: 20px;
+}
+</style>
diff --git a/src/views/integrated/meetingRoomEquipment/form.vue b/src/views/integrated/meetingRoomEquipment/form.vue
new file mode 100644
index 0000000..65747df
--- /dev/null
+++ b/src/views/integrated/meetingRoomEquipment/form.vue
@@ -0,0 +1,111 @@
+<template>
+    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+      :close-on-click-modal="false" draggable>
+      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+       <el-row :gutter="24">
+    <el-col :span="12" class="mb20">
+      <el-form-item label="会议室id" prop="roomId">
+        <el-input v-model="form.roomId" placeholder="请输入会议室id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="设备id" prop="equipId">
+        <el-input v-model="form.equipId" placeholder="请输入设备id"/>
+      </el-form-item>
+      </el-col>
+
+    <el-col :span="12" class="mb20">
+      <el-form-item label="设备数量" prop="quantity">
+        <el-input v-model="form.quantity" placeholder="请输入设备数量"/>
+      </el-form-item>
+      </el-col>
+
+			</el-row>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="MeetingRoomEquipmentDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoomEquipment'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  roomId: '',
+	  equipId: '',
+	  quantity: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取meetingRoomEquipment信息
+  if (id) {
+    form.id = id
+    getmeetingRoomEquipmentData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {});
+	if (!valid) return false;
+
+	try {
+    loading.value = true;
+		form.id ? await putObj(form) : await addObj(form);
+		useMessage().success(form.id ? '修改成功' : '添加成功');
+		visible.value = false;
+		emit('refresh');
+	} catch (err: any) {
+		useMessage().error(err.msg);
+	} finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getmeetingRoomEquipmentData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/integrated/meetingRoomEquipment/index.vue b/src/views/integrated/meetingRoomEquipment/index.vue
new file mode 100644
index 0000000..c4ee60e
--- /dev/null
+++ b/src/views/integrated/meetingRoomEquipment/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'integrated_meetingRoomEquipment_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'integrated_meetingRoomEquipment_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_meetingRoomEquipment_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border 
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+          <el-table-column prop="roomId" label="会议室id"  show-overflow-tooltip/>
+          <el-table-column prop="equipId" label="设备id"  show-overflow-tooltip/>
+          <el-table-column prop="quantity" label="设备数量"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_meetingRoomEquipment_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_meetingRoomEquipment_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemMeetingRoomEquipment">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/meetingRoomEquipment";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/integrated/meetingRoomEquipment/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingRoomEquipment.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>
\ No newline at end of file