diff --git a/src/views/dms/alarmType/index.vue b/src/views/dms/alarmType/index.vue
index 1992731..6c03607 100644
--- a/src/views/dms/alarmType/index.vue
+++ b/src/views/dms/alarmType/index.vue
@@ -4,32 +4,19 @@
                 :leave-active-class='proxy?.animate.searchAnimate.leave'>
       <div v-show='showSearch' class='mb-[10px]'>
         <el-card shadow='hover'>
-          <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
-            <el-form-item label='报警类型ID' prop='alarmTypeId'>
-              <el-input v-model='queryParams.alarmTypeId' placeholder='请输入报警类型ID' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
-            <el-form-item label='报警类型编号' prop='alarmTypeCode'>
-              <el-input v-model='queryParams.alarmTypeCode' placeholder='请输入报警类型编号' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true' label-width='100px'>
             <el-form-item label='报警类型名称' prop='alarmTypeName'>
               <el-input v-model='queryParams.alarmTypeName' placeholder='请输入报警类型名称' clearable
                         @keyup.enter='handleQuery' />
             </el-form-item>
-            <el-form-item label='设备大类ID' prop='deviceCategoryId'>
-              <el-input v-model='queryParams.deviceCategoryId' placeholder='请输入设备大类ID' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
-            <el-form-item label='设备类型ID' prop='deviceTypeId'>
-              <el-input v-model='queryParams.deviceTypeId' placeholder='请输入设备类型ID' clearable
-                        @keyup.enter='handleQuery' />
-            </el-form-item>
-            <el-form-item label='状态' prop='typeStatus'>
-              <el-select v-model='queryParams.typeStatus' placeholder='请选择状态' clearable>
-                <el-option v-for='dict in dms_level_status' :key='dict.value' :label='dict.label' :value='dict.value' />
-              </el-select>
-            </el-form-item>
+            <!--            <el-form-item label='设备大类' prop='deviceCategoryId'>-->
+            <!--              <el-input v-model='queryParams.deviceCategoryId' placeholder='请输入设备大类' clearable-->
+            <!--                        @keyup.enter='handleQuery' />-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label='设备类型' prop='deviceTypeId'>-->
+            <!--              <el-input v-model='queryParams.deviceTypeId' placeholder='请输入设备类型' clearable-->
+            <!--                        @keyup.enter='handleQuery' />-->
+            <!--            </el-form-item>-->
             <el-form-item>
               <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
               <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
@@ -71,8 +58,8 @@
         <el-table-column label='报警类型ID' align='center' prop='alarmTypeId' v-if='columns[0].visible' />
         <el-table-column label='报警类型编号' align='center' prop='alarmTypeCode' v-if='columns[1].visible' />
         <el-table-column label='报警类型名称' align='center' prop='alarmTypeName' v-if='columns[2].visible' />
-        <el-table-column label='设备大类ID' align='center' prop='deviceCategoryId' v-if='columns[4].visible' />
-        <el-table-column label='设备类型ID' align='center' prop='deviceTypeId' v-if='columns[5].visible' />
+        <el-table-column label='设备大类' align='center' prop='deviceCategoryName' v-if='columns[4].visible' />
+        <el-table-column label='设备类型' align='center' prop='deviceTypeName' v-if='columns[5].visible' />
         <el-table-column label='状态' align='center' prop='typeStatus' v-if='columns[6].visible'>
           <template #default='scope'>
             <dict-tag :options='dms_level_status' :value='scope.row.typeStatus' />
@@ -98,31 +85,32 @@
     </el-card>
     <!-- 添加或修改报警类型对话框 -->
     <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
-      <el-form ref='alarmTypeFormRef' :model='form' :rules='rules' label-width='80px'>
-        <el-form-item label='报警类型ID' prop='alarmTypeId'>
-          <el-input v-model='form.alarmTypeId' placeholder='请输入报警类型ID' />
-        </el-form-item>
+      <el-form ref='alarmTypeFormRef' :model='form' :rules='rules' label-width='110px'>
         <el-form-item label='报警类型编号' prop='alarmTypeCode'>
           <el-input v-model='form.alarmTypeCode' placeholder='请输入报警类型编号' />
         </el-form-item>
         <el-form-item label='报警类型名称' prop='alarmTypeName'>
           <el-input v-model='form.alarmTypeName' placeholder='请输入报警类型名称' />
         </el-form-item>
-        <el-form-item label='设备大类ID' prop='deviceCategoryId'>
-          <el-input v-model='form.deviceCategoryId' placeholder='请输入设备大类ID' />
+        <el-form-item label='设备大类' prop='deviceCategoryId'>
+          <el-select v-model='form.deviceCategoryId' placeholder='请选择设备大类'>
+            <el-option
+              v-for='item in deviceCategoryList'
+              :key='item.deviceCategoryId'
+              :label='item.deviceCategoryName'
+              :value='item.deviceCategoryId'
+            />
+          </el-select>
         </el-form-item>
-        <el-form-item label='设备类型ID' prop='deviceTypeId'>
-          <el-input v-model='form.deviceTypeId' placeholder='请输入设备类型ID' />
-        </el-form-item>
-        <el-form-item label='状态' prop='typeStatus'>
-          <el-radio-group v-model='form.typeStatus'>
-            <el-radio
-              v-for='dict in dms_level_status'
-              :key='dict.value'
-              :value='dict.value'
-            >{{ dict.label }}
-            </el-radio>
-          </el-radio-group>
+        <el-form-item label='设备类型' prop='deviceTypeId'>
+          <el-select v-model='form.deviceCategoryId' placeholder='请选择设备类型'>
+            <el-option
+              v-for='item in deviceTypeList'
+              :key='item.deviceTypeId'
+              :label='item.deviceTypeName'
+              :value='item.deviceTypeId'
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label='备注' prop='remark'>
           <el-input v-model='form.remark' placeholder='请输入备注' />
@@ -141,6 +129,8 @@
 <script setup name='AlarmType' lang='ts'>
 import { listAlarmType, getAlarmType, delAlarmType, addAlarmType, updateAlarmType } from '@/api/dms/alarmType';
 import { AlarmTypeVO, AlarmTypeQuery, AlarmTypeForm } from '@/api/dms/alarmType/types';
+import { getBaseDeviceCategoryList } from '@/api/mes/baseDeviceCategory';
+import { getBaseDeviceTypeList } from '@/api/mes/baseDeviceType';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { dms_level_status } = toRefs<any>(proxy?.useDict('dms_level_status'));
@@ -162,21 +152,36 @@ const dialog = reactive<DialogOption>({
   title: ''
 });
 
+/** 获取设备大类下拉框 */
+const deviceCategoryList = ref([]);
+const getBaseDeviceCategoryListSelect = async () => {
+  let res = await getBaseDeviceCategoryList(null);
+  deviceCategoryList.value = res.data;
+};
+
+/** 获取设备类型下拉框 */
+const deviceTypeList = ref([]);
+const getBaseDeviceTypeListSelect = async () => {
+  let res = await getBaseDeviceTypeList(null);
+  deviceTypeList.value = res.data;
+};
+
+
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-  { key: 0, label: `报警类型ID`, visible: true },
+  { key: 0, label: `报警类型ID`, visible: false },
   { key: 1, label: `报警类型编号`, visible: true },
   { key: 2, label: `报警类型名称`, visible: true },
-  { key: 3, label: `租户编号`, visible: true },
-  { key: 4, label: `设备大类ID`, visible: true },
-  { key: 5, label: `设备类型ID`, visible: true },
+  { key: 3, label: `租户编号`, visible: false },
+  { key: 4, label: `设备大类`, visible: true },
+  { key: 5, label: `设备类型`, visible: true },
   { key: 6, label: `状态`, visible: true },
   { key: 7, label: `备注`, visible: true },
-  { key: 8, label: `创建部门`, visible: true },
-  { key: 9, label: `创建人`, visible: true },
-  { key: 10, label: `创建时间`, visible: true },
-  { key: 11, label: `更新人`, visible: true },
-  { key: 12, label: `更新时间`, visible: true }
+  { key: 8, label: `创建部门`, visible: false },
+  { key: 9, label: `创建人`, visible: false },
+  { key: 10, label: `创建时间`, visible: false },
+  { key: 11, label: `更新人`, visible: false },
+  { key: 12, label: `更新时间`, visible: false }
 ]);
 
 const initFormData: AlarmTypeForm = {
@@ -185,7 +190,7 @@ const initFormData: AlarmTypeForm = {
   alarmTypeName: undefined,
   deviceCategoryId: undefined,
   deviceTypeId: undefined,
-  typeStatus: undefined,
+  typeStatus: '1',
   remark: undefined
 };
 const data = reactive<PageData<AlarmTypeForm, AlarmTypeQuery>>({
@@ -304,6 +309,8 @@ const handleExport = () => {
 };
 
 onMounted(() => {
+  getBaseDeviceCategoryListSelect();
+  getBaseDeviceTypeListSelect();
   getList();
 });
 </script>