diff --git a/src/api/integrated/meetingEquipment.ts b/src/api/integrated/meetingEquipment.ts
new file mode 100644
index 0000000..daba4e6
--- /dev/null
+++ b/src/api/integrated/meetingEquipment.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/integrated/meetingEquipment/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/integrated/meetingEquipment',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/integrated/meetingEquipment/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/integrated/meetingEquipment',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/integrated/meetingEquipment',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/api/integrated/meetingRoom.ts b/src/api/integrated/meetingRoom.ts
new file mode 100644
index 0000000..6b80046
--- /dev/null
+++ b/src/api/integrated/meetingRoom.ts
@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/integrated/meetingRoom/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/integrated/meetingRoom',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/integrated/meetingRoom/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/integrated/meetingRoom',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/integrated/meetingRoom',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/views/integrated/meetingEquipment/form.vue b/src/views/integrated/meetingEquipment/form.vue
new file mode 100644
index 0000000..991f3ec
--- /dev/null
+++ b/src/views/integrated/meetingEquipment/form.vue
@@ -0,0 +1,137 @@
+<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="name">
+        <el-input v-model="form.name" 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="12" class="mb20">
+      <el-form-item label="排序" prop="sort">
+        <el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入排序"></el-input-number>
+      </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-select v-model="form.status" placeholder="请选择反馈类型">-->
+<!--          <el-option :label="item.label" :value="item.value" v-for="(item, index) in meeting_status" :key="index"></el-option>-->
+<!--        </el-select>-->
+        </el-form-item>
+      </el-col>
+
+
+    <el-col :span="24" class="mb20">
+      <el-form-item label="备注" prop="remark">
+        <el-input type="textarea" v-model="form.remark" 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="MeetingEquipmentDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/meetingEquipment'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { meeting_status } = useDict('meeting_status')
+
+// 提交表单数据
+const form = reactive({
+		id:'',
+	  name: '',
+	  picUrl: '',
+		sort: 0,
+	  status: '0',
+	  deptId: '',
+	  remark: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+        name: [{required: true, message: '设备名称不能为空', trigger: 'blur'}],
+        sort: [{ validator: rule.number, trigger: 'blur' }],
+        status: [{ validator: rule.number, trigger: 'blur' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取meetingEquipment信息
+  if (id) {
+    form.id = id
+    getmeetingEquipmentData(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 getmeetingEquipmentData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
diff --git a/src/views/integrated/meetingEquipment/index.vue b/src/views/integrated/meetingEquipment/index.vue
new file mode 100644
index 0000000..1a8a837
--- /dev/null
+++ b/src/views/integrated/meetingEquipment/index.vue
@@ -0,0 +1,140 @@
+<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="name" >
+        <el-input placeholder="请输入设备名称" v-model="state.queryForm.name" />
+      </el-form-item>
+      <el-form-item label="设备状态" prop="status">
+            <el-select v-model="state.queryForm.status" placeholder="请选择状态">
+              <el-option :label="item.label" :value="item.value" v-for="(item, index) in meeting_status" :key="index"></el-option>
+            </el-select>
+      </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_meetingEquipment_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'integrated_meetingEquipment_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_meetingEquipment_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="name" label="设备名称"  show-overflow-tooltip/>
+          <el-table-column prop="picUrl" label="图片"  show-overflow-tooltip/>
+          <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>
+          <el-table-column prop="status" label="状态" show-overflow-tooltip>
+      <template #default="scope">
+                <dict-tag :options="meeting_status" :value="scope.row.status"></dict-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="remark" label="备注"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_meetingEquipment_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_meetingEquipment_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="systemMeetingEquipment">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/meetingEquipment";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { meeting_status } = useDict('meeting_status')
+// 定义变量内容
+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/meetingEquipment/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingEquipment.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>
diff --git a/src/views/integrated/meetingRoom/form.vue b/src/views/integrated/meetingRoom/form.vue
new file mode 100644
index 0000000..f645f55
--- /dev/null
+++ b/src/views/integrated/meetingRoom/form.vue
@@ -0,0 +1,160 @@
+<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-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="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="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="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>
+      <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="MeetingRoomDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import { getObj, addObj, putObj } from '/@/api/integrated/meetingRoom'
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const { meeting_status } = useDict('meeting_status')
+
+// 提交表单数据
+const form = reactive({
+		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' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+	nextTick(() => {
+		dataFormRef.value?.resetFields();
+	});
+
+  // 获取meetingRoom信息
+  if (id) {
+    form.id = id
+    getmeetingRoomData(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 getmeetingRoomData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
diff --git a/src/views/integrated/meetingRoom/index.vue b/src/views/integrated/meetingRoom/index.vue
new file mode 100644
index 0000000..e5ed1a0
--- /dev/null
+++ b/src/views/integrated/meetingRoom/index.vue
@@ -0,0 +1,126 @@
+<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_meetingRoom_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'integrated_meetingRoom_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_meetingRoom_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="roomName" label="会议室名称"  show-overflow-tooltip/>
+          <el-table-column prop="picUrl" label="图片"  show-overflow-tooltip/>
+          <el-table-column prop="sort" label="排序"  show-overflow-tooltip/>
+          <el-table-column prop="status" label="状态" show-overflow-tooltip>
+      <template #default="scope">
+                <dict-tag :options="meeting_status" :value="scope.row.status"></dict-tag>
+            </template>
+          </el-table-column>
+<!--          <el-table-column prop="deptId" label="部门id"  show-overflow-tooltip/>-->
+          <el-table-column prop="adminId" label="默认管理员"  show-overflow-tooltip/>
+          <el-table-column prop="location" label="位置"  show-overflow-tooltip/>
+          <el-table-column prop="capacity" label="容纳人数"  show-overflow-tooltip/>
+          <el-table-column prop="availableTime" label="可用时间段"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_meetingRoom_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_meetingRoom_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="systemMeetingRoom">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/meetingRoom";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { meeting_status } = useDict('meeting_status')
+// 定义变量内容
+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/meetingRoom/export', Object.assign(state.queryForm, { ids: selectObjs }), 'meetingRoom.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>