diff --git a/src/api/dms/baseDeviceCategory/index.ts b/src/api/dms/baseDeviceCategory/index.ts
index 5bdcd64..362a6a4 100644
--- a/src/api/dms/baseDeviceCategory/index.ts
+++ b/src/api/dms/baseDeviceCategory/index.ts
@@ -1,77 +1,77 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { BaseDeviceCategoryVO, BaseDeviceCategoryForm, BaseDeviceCategoryQuery } from '@/api/dms/baseDeviceCategory/types';
-
-/**
- * 查询设备大类信息列表
- * @param query
- * @returns {*}
- */
-
-export const listBaseDeviceCategoryInDMS = (query?: BaseDeviceCategoryQuery): AxiosPromise<BaseDeviceCategoryVO[]> => {
-  return request({
-    url: '/dms/baseDeviceCategory/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询设备大类信息详细
- * @param deviceCategoryId
- */
-export const getBaseDeviceCategoryInDMS = (deviceCategoryId: string | number): AxiosPromise<BaseDeviceCategoryVO> => {
-  return request({
-    url: '/dms/baseDeviceCategory/' + deviceCategoryId,
-    method: 'get'
-  });
-};
-
-/**
- * 新增设备大类信息
- * @param data
- */
-/*export const addBaseDeviceCategoryInDMS = (data: BaseDeviceCategoryForm) => {
-  return request({
-    url: '/dms/baseDeviceCategory',
-    method: 'post',
-    data: data
-  });
-};*/
-
-/**
- * 修改设备大类信息
- * @param data
- */
-/*export const updateBaseDeviceCategoryInDMS = (data: BaseDeviceCategoryForm) => {
-  return request({
-    url: '/dms/baseDeviceCategory',
-    method: 'put',
-    data: data
-  });
-};*/
-
-/**
- * 删除设备大类信息
- * @param deviceCategoryId
- */
-/*export const delBaseDeviceCategoryInDMS = (deviceCategoryId: string | number | Array<string | number>) => {
-  return request({
-    url: '/dms/baseDeviceCategory/' + deviceCategoryId,
-    method: 'delete'
-  });
-};*/
-
-
-/**
- * 下拉框查询设备大类信息列表
- * @param query
- * @returns {*}
- */
-export function getBaseDeviceCategoryListInDMS (query) {
-    return request({
-        url: '/dms/baseDeviceCategory/getBaseDeviceCategoryList',
-        method: 'get',
-        params: query
-    });
-};
+// import request from '@/utils/request';
+// import { AxiosPromise } from 'axios';
+// import { BaseDeviceCategoryVO, BaseDeviceCategoryForm, BaseDeviceCategoryQuery } from '@/api/dms/baseDeviceCategory/types';
+//
+// /**
+//  * 查询设备大类信息列表
+//  * @param query
+//  * @returns {*}
+//  */
+//
+// export const listBaseDeviceCategoryInDMS = (query?: BaseDeviceCategoryQuery): AxiosPromise<BaseDeviceCategoryVO[]> => {
+//   return request({
+//     url: '/dms/baseDeviceCategory/list',
+//     method: 'get',
+//     params: query
+//   });
+// };
+//
+// /**
+//  * 查询设备大类信息详细
+//  * @param deviceCategoryId
+//  */
+// export const getBaseDeviceCategoryInDMS = (deviceCategoryId: string | number): AxiosPromise<BaseDeviceCategoryVO> => {
+//   return request({
+//     url: '/dms/baseDeviceCategory/' + deviceCategoryId,
+//     method: 'get'
+//   });
+// };
+//
+// /**
+//  * 新增设备大类信息
+//  * @param data
+//  */
+// export const addBaseDeviceCategoryInDMS = (data: BaseDeviceCategoryForm) => {
+//   return request({
+//     url: '/dms/baseDeviceCategory',
+//     method: 'post',
+//     data: data
+//   });
+// };
+//
+// /**
+//  * 修改设备大类信息
+//  * @param data
+//  */
+// export const updateBaseDeviceCategoryInDMS = (data: BaseDeviceCategoryForm) => {
+//   return request({
+//     url: '/dms/baseDeviceCategory',
+//     method: 'put',
+//     data: data
+//   });
+// };
+//
+// /**
+//  * 删除设备大类信息
+//  * @param deviceCategoryId
+//  */
+// export const delBaseDeviceCategoryInDMS = (deviceCategoryId: string | number | Array<string | number>) => {
+//   return request({
+//     url: '/dms/baseDeviceCategory/' + deviceCategoryId,
+//     method: 'delete'
+//   });
+// };
+//
+//
+// /**
+//  * 下拉框查询设备大类信息列表
+//  * @param query
+//  * @returns {*}
+//  */
+// export function getBaseDeviceCategoryListInDMS (query) {
+//     return request({
+//         url: '/dms/baseDeviceCategory/getBaseDeviceCategoryList',
+//         method: 'get',
+//         params: query
+//     });
+// };
diff --git a/src/api/dms/baseDeviceType/index.ts b/src/api/dms/baseDeviceType/index.ts
index c70f0db..039383e 100644
--- a/src/api/dms/baseDeviceType/index.ts
+++ b/src/api/dms/baseDeviceType/index.ts
@@ -1,87 +1,87 @@
-import request from '@/utils/request';
-import { AxiosPromise } from 'axios';
-import { BaseDeviceTypeVO, BaseDeviceTypeForm, BaseDeviceTypeQuery } from '@/api/dms/baseDeviceType/types';
-
-/**
- * 查询设备类型信息列表
- * @param query
- * @returns {*}
- */
-
-export const listBaseDeviceTypeInDMS = (query?: BaseDeviceTypeQuery): AxiosPromise<BaseDeviceTypeVO[]> => {
-  return request({
-    url: '/dms/baseDeviceType/list',
-    method: 'get',
-    params: query
-  });
-};
-
-/**
- * 查询设备类型信息详细
- * @param deviceTypeId
- */
-export const getBaseDeviceTypeInDMS = (deviceTypeId: string | number): AxiosPromise<BaseDeviceTypeVO> => {
-  return request({
-    url: '/dms/baseDeviceType/' + deviceTypeId,
-    method: 'get'
-  });
-};
-
-/**
- * 新增设备类型信息
- * @param data
- */
-/*export const addBaseDeviceTypeInDMS = (data: BaseDeviceTypeForm) => {
-  return request({
-    url: '/dms/baseDeviceType',
-    method: 'post',
-    data: data
-  });
-};*/
-
-/**
- * 修改设备类型信息
- * @param data
- */
-/*export const updateBaseDeviceTypeInDMS = (data: BaseDeviceTypeForm) => {
-  return request({
-    url: '/dms/baseDeviceType',
-    method: 'put',
-    data: data
-  });
-};*/
-
-/**
- * 删除设备类型信息
- * @param deviceTypeId
- */
-/*export const delBaseDeviceTypeInDMS = (deviceTypeId: string | number | Array<string | number>) => {
-  return request({
-    url: '/dms/baseDeviceType/' + deviceTypeId,
-    method: 'delete'
-  });
-};*/
-
-
-/**
- * 下拉框查询设备类型信息列表
- * @param query
- * @returns {*}
- */
-export function getBaseDeviceTypeListInDMS (query) {
-    return request({
-        url: '/dms/baseDeviceType/getBaseDeviceTypeList',
-        method: 'get',
-        params: query
-    });
-};
-
-
-//根据设备id查询设备类型信息
-export function selectDevicetypeByDeviceId(query) {
-  return request({
-    url: '/dms/baseDeviceType/selectDevicetypeByDeviceId',
-    method: 'get',
-    params: query
-  })
-};
+// import request from '@/utils/request';
+// import { AxiosPromise } from 'axios';
+// import { BaseDeviceTypeVO, BaseDeviceTypeForm, BaseDeviceTypeQuery } from '@/api/dms/baseDeviceType/types';
+//
+// /**
+//  * 查询设备类型信息列表
+//  * @param query
+//  * @returns {*}
+//  */
+//
+// export const listBaseDeviceTypeInDMS = (query?: BaseDeviceTypeQuery): AxiosPromise<BaseDeviceTypeVO[]> => {
+//   return request({
+//     url: '/dms/baseDeviceType/list',
+//     method: 'get',
+//     params: query
+//   });
+// };
+//
+// /**
+//  * 查询设备类型信息详细
+//  * @param deviceTypeId
+//  */
+// export const getBaseDeviceTypeInDMS = (deviceTypeId: string | number): AxiosPromise<BaseDeviceTypeVO> => {
+//   return request({
+//     url: '/dms/baseDeviceType/' + deviceTypeId,
+//     method: 'get'
+//   });
+// };
+//
+// /**
+//  * 新增设备类型信息
+//  * @param data
+//  */
+// export const addBaseDeviceTypeInDMS = (data: BaseDeviceTypeForm) => {
+//   return request({
+//     url: '/dms/baseDeviceType',
+//     method: 'post',
+//     data: data
+//   });
+// };
+//
+// /**
+//  * 修改设备类型信息
+//  * @param data
+//  */
+// export const updateBaseDeviceTypeInDMS = (data: BaseDeviceTypeForm) => {
+//   return request({
+//     url: '/dms/baseDeviceType',
+//     method: 'put',
+//     data: data
+//   });
+// };
+//
+// /**
+//  * 删除设备类型信息
+//  * @param deviceTypeId
+//  */
+// export const delBaseDeviceTypeInDMS = (deviceTypeId: string | number | Array<string | number>) => {
+//   return request({
+//     url: '/dms/baseDeviceType/' + deviceTypeId,
+//     method: 'delete'
+//   });
+// };
+//
+//
+// /**
+//  * 下拉框查询设备类型信息列表
+//  * @param query
+//  * @returns {*}
+//  */
+// export function getBaseDeviceTypeListInDMS (query) {
+//     return request({
+//         url: '/dms/baseDeviceType/getBaseDeviceTypeList',
+//         method: 'get',
+//         params: query
+//     });
+// };
+//
+//
+// //根据设备id查询设备类型信息
+// export function selectDevicetypeByDeviceId(query) {
+//   return request({
+//     url: '/dms/baseDeviceType/selectDevicetypeByDeviceId',
+//     method: 'get',
+//     params: query
+//   })
+// };
diff --git a/src/api/dms/dmsBaseMachineInfo/index.ts b/src/api/dms/dmsBaseMachineInfo/index.ts
index cbe2be7..ac7012d 100644
--- a/src/api/dms/dmsBaseMachineInfo/index.ts
+++ b/src/api/dms/dmsBaseMachineInfo/index.ts
@@ -31,36 +31,36 @@ export const getDmsBaseMachineInfo  = (machineId: string | number): AxiosPromise
  * 新增设备信息
  * @param data
  */
-/*export const addProdBaseMachineInfo  = (data: ProdBaseMachineInfoForm) => {
+export const addProdBaseMachineInfo  = (data: ProdBaseMachineInfoForm) => {
   return request({
     url: '/dms/dmsBaseMachineInfo',
     method: 'post',
     data: data
   });
-};*/
+};
 
 /**
  * 修改设备信息
  * @param data
  */
-/*export const updateProdBaseMachineInfo  = (data: ProdBaseMachineInfoForm) => {
+export const updateProdBaseMachineInfo  = (data: ProdBaseMachineInfoForm) => {
   return request({
     url: '/dms/dmsBaseMachineInfo',
     method: 'put',
     data: data
   });
-};*/
+};
 
 /**
  * 删除设备信息
  * @param machineId
  */
-/*export const delDmsBaseMachineInfo  = (machineId: string | number | Array<string | number>) => {
+export const delDmsBaseMachineInfo  = (machineId: string | number | Array<string | number>) => {
   return request({
     url: '/dms/dmsBaseMachineInfo/' + machineId,
     method: 'delete'
   });
-};*/
+};
 
 
 /**
diff --git a/src/api/dms/dmsBaseMaintStation/types.ts b/src/api/dms/dmsBaseMaintStation/types.ts
index b98f163..b29eace 100644
--- a/src/api/dms/dmsBaseMaintStation/types.ts
+++ b/src/api/dms/dmsBaseMaintStation/types.ts
@@ -39,6 +39,11 @@ export interface DmsBaseMaintStationVO {
    */
   maintProjectIds: (string | number)[] | null;
 
+  /**
+   * 保养标准编号
+   */
+  maintStandardCode: string | number;
+
 }
 
 export interface DmsBaseMaintStationForm extends BaseEntity {
@@ -82,6 +87,12 @@ export interface DmsBaseMaintStationForm extends BaseEntity {
    */
   maintProjectIds?: (string | number)[] | null;
 
+
+  /**
+   * 保养标准编号
+   */
+  maintStandardCode?: string | number;
+
 }
 
 export interface DmsBaseMaintStationQuery extends PageQuery {
@@ -125,6 +136,11 @@ export interface DmsBaseMaintStationQuery extends PageQuery {
    * 保养项目ID数组
    */
   maintProjectIds?: (string | number)[] | null;
+
+  /**
+   * 保养标准编号
+   */
+  maintStandardCode?: string | number;
 }
 
 
diff --git a/src/views/dms/baseDeviceCategory/index.vue b/src/views/dms/baseDeviceCategory/index.vue
new file mode 100644
index 0000000..7f32d05
--- /dev/null
+++ b/src/views/dms/baseDeviceCategory/index.vue
@@ -0,0 +1,283 @@
+<!--<template>-->
+<!--  <div class="p-2">-->
+<!--    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :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">-->
+<!--            &lt;!&ndash;            <el-form-item label="大类ID" prop="deviceCategoryId">-->
+<!--                          <el-input v-model="queryParams.deviceCategoryId" placeholder="请输入大类ID" clearable @keyup.enter="handleQuery" />-->
+<!--                        </el-form-item>&ndash;&gt;-->
+<!--            &lt;!&ndash;            <el-form-item label="大类编号" prop="deviceCategoryCode">-->
+<!--                          <el-input v-model="queryParams.deviceCategoryCode" placeholder="请输入大类编号" clearable @keyup.enter="handleQuery" />-->
+<!--                        </el-form-item>&ndash;&gt;-->
+<!--            <el-form-item label="大类名称" prop="deviceCategoryName">-->
+<!--              <el-input v-model="queryParams.deviceCategoryName" placeholder="请输入大类名称" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            &lt;!&ndash;            <el-form-item label="激活标识" prop="activeFlag">-->
+<!--                          <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />-->
+<!--                        </el-form-item>&ndash;&gt;-->
+<!--            <el-form-item label="激活标识" prop="activeFlag">-->
+<!--              <el-select v-model="queryParams.activeFlag" placeholder="请选择激活标识" clearable >-->
+<!--                <el-option v-for="dict in active_flag" :key="dict.value" :label="dict.label" :value="dict.value"/>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item>-->
+<!--              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>-->
+<!--              <el-button icon="Refresh" @click="resetQuery">重置</el-button>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </el-card>-->
+<!--      </div>-->
+<!--    </transition>-->
+
+<!--    <el-card shadow="never">-->
+<!--      <template #header>-->
+<!--        <el-row :gutter="10" class="mb8">-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:baseDeviceCategory:add']">新增</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:baseDeviceCategory:edit']">修改</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:baseDeviceCategory:remove']">删除</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:baseDeviceCategory:export']">导出</el-button>-->
+<!--          </el-col>-->
+<!--          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>-->
+<!--        </el-row>-->
+<!--      </template>-->
+
+<!--      <el-table v-loading="loading" :data="baseDeviceCategoryList" @selection-change="handleSelectionChange">-->
+<!--        <el-table-column type="selection" width="55" align="center" />-->
+<!--        <el-table-column label="大类ID" align="center" prop="deviceCategoryId" v-if="columns[0].visible"/>-->
+<!--        <el-table-column label="大类编号" align="center" prop="deviceCategoryCode" v-if="columns[2].visible"/>-->
+<!--        <el-table-column label="大类名称" align="center" prop="deviceCategoryName" v-if="columns[3].visible"/>-->
+<!--        &lt;!&ndash;        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[4].visible"/>&ndash;&gt;-->
+<!--        <el-table-column label="激活标识" align="center" prop="activeFlag">-->
+<!--          <template #default="scope">-->
+<!--            <dict-tag :options="active_flag" :value="scope.row.activeFlag"/>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="备注" align="center" prop="remark" v-if="columns[5].visible"/>-->
+<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--          <template #default="scope">-->
+<!--            <el-tooltip content="修改" placement="top">-->
+<!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:baseDeviceCategory:edit']"></el-button>-->
+<!--            </el-tooltip>-->
+<!--            <el-tooltip content="删除" placement="top">-->
+<!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:baseDeviceCategory:remove']"></el-button>-->
+<!--            </el-tooltip>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
+
+<!--      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />-->
+<!--    </el-card>-->
+
+<!--    &lt;!&ndash; 添加或修改设备大类信息对话框 &ndash;&gt;-->
+<!--    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>-->
+<!--      <el-form ref="baseDeviceCategoryFormRef" :model="form" :rules="rules" label-width="80px">-->
+<!--        <el-form-item label="大类编号" prop="deviceCategoryCode">-->
+<!--          <el-input v-model="form.deviceCategoryCode" placeholder="请输入大类编号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="大类名称" prop="deviceCategoryName">-->
+<!--          <el-input v-model="form.deviceCategoryName" placeholder="请输入大类名称" />-->
+<!--        </el-form-item>-->
+<!--        &lt;!&ndash;        <el-form-item label="激活标识" prop="activeFlag">-->
+<!--                  <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />-->
+<!--                </el-form-item>&ndash;&gt;-->
+<!--        <el-form-item label="激活标识" prop="activeFlag">-->
+<!--          <el-radio-group v-model="form.activeFlag">-->
+<!--            <el-radio-->
+<!--              v-for="dict in active_flag"-->
+<!--              :key="dict.value"-->
+<!--              :value="dict.value"-->
+<!--            >{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备注" prop="remark">-->
+<!--          <el-input v-model="form.remark" placeholder="请输入备注" />-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--      <template #footer>-->
+<!--        <div class="dialog-footer">-->
+<!--          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>-->
+<!--          <el-button @click="cancel">取 消</el-button>-->
+<!--        </div>-->
+<!--      </template>-->
+<!--    </el-dialog>-->
+<!--  </div>-->
+<!--</template>-->
+
+<!--<script setup name="BaseDeviceCategory" lang="ts">-->
+<!--import { listBaseDeviceCategory, getBaseDeviceCategory, delBaseDeviceCategory, addBaseDeviceCategory, updateBaseDeviceCategory } from '@/api/dms/baseDeviceCategory';-->
+<!--import { BaseDeviceCategoryVO, BaseDeviceCategoryQuery, BaseDeviceCategoryForm } from '@/api/dms/baseDeviceCategory/types';-->
+
+<!--const { proxy } = getCurrentInstance() as ComponentInternalInstance;-->
+<!--const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));-->
+
+<!--const baseDeviceCategoryList = ref<BaseDeviceCategoryVO[]>([]);-->
+<!--const buttonLoading = ref(false);-->
+<!--const loading = ref(true);-->
+<!--const showSearch = ref(true);-->
+<!--const ids = ref<Array<string | number>>([]);-->
+<!--const single = ref(true);-->
+<!--const multiple = ref(true);-->
+<!--const total = ref(0);-->
+
+<!--const queryFormRef = ref<ElFormInstance>();-->
+<!--const baseDeviceCategoryFormRef = ref<ElFormInstance>();-->
+
+<!--const dialog = reactive<DialogOption>({-->
+<!--  visible: false,-->
+<!--  title: ''-->
+<!--});-->
+
+<!--// 列显隐信息-->
+<!--const columns = ref<FieldOption[]>([-->
+<!--  { key: 0, label: `大类ID`, visible: false },-->
+<!--  { key: 1, label: `租户编号`, visible: false },-->
+<!--  { key: 2, label: `大类编号`, visible: true },-->
+<!--  { key: 3, label: `大类名称`, visible: true },-->
+<!--  { key: 4, label: `激活标识`, visible: true },-->
+<!--  { key: 5, label: `备注`, visible: true },-->
+<!--  { key: 6, label: `创建部门`, visible: false },-->
+<!--  { key: 7, label: `创建人`, visible: false },-->
+<!--  { key: 8, label: `创建时间`, visible: false },-->
+<!--  { key: 9, label: `更新人`, visible: false },-->
+<!--  { key: 10, label: `更新时间`, visible: false },-->
+<!--]);-->
+
+<!--const initFormData: BaseDeviceCategoryForm = {-->
+<!--  deviceCategoryId: undefined,-->
+<!--  deviceCategoryCode: undefined,-->
+<!--  deviceCategoryName: undefined,-->
+<!--  activeFlag: '1',-->
+<!--  remark: undefined,-->
+<!--}-->
+<!--const data = reactive<PageData<BaseDeviceCategoryForm, BaseDeviceCategoryQuery>>({-->
+<!--  form: {...initFormData},-->
+<!--  queryParams: {-->
+<!--    pageNum: 1,-->
+<!--    pageSize: 10,-->
+<!--    deviceCategoryId: undefined,-->
+<!--    deviceCategoryCode: undefined,-->
+<!--    deviceCategoryName: undefined,-->
+<!--    activeFlag: undefined,-->
+<!--    params: {-->
+<!--    }-->
+<!--  },-->
+<!--  rules: {-->
+<!--    deviceCategoryId: [-->
+<!--      { required: true, message: "大类ID不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--    deviceCategoryCode: [-->
+<!--      { required: true, message: "大类编号不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--    deviceCategoryName: [-->
+<!--      { required: true, message: "大类名称不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--    activeFlag: [-->
+<!--      { required: true, message: "激活标识不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--  }-->
+<!--});-->
+
+<!--const { queryParams, form, rules } = toRefs(data);-->
+
+<!--/** 查询设备大类信息列表 */-->
+<!--const getList = async () => {-->
+<!--  loading.value = true;-->
+<!--  const res = await listBaseDeviceCategory(queryParams.value);-->
+<!--  baseDeviceCategoryList.value = res.rows;-->
+<!--  total.value = res.total;-->
+<!--  loading.value = false;-->
+<!--}-->
+
+<!--/** 取消按钮 */-->
+<!--const cancel = () => {-->
+<!--  reset();-->
+<!--  dialog.visible = false;-->
+<!--}-->
+
+<!--/** 表单重置 */-->
+<!--const reset = () => {-->
+<!--  form.value = {...initFormData};-->
+<!--  baseDeviceCategoryFormRef.value?.resetFields();-->
+<!--}-->
+
+<!--/** 搜索按钮操作 */-->
+<!--const handleQuery = () => {-->
+<!--  queryParams.value.pageNum = 1;-->
+<!--  getList();-->
+<!--}-->
+
+<!--/** 重置按钮操作 */-->
+<!--const resetQuery = () => {-->
+<!--  queryFormRef.value?.resetFields();-->
+<!--  handleQuery();-->
+<!--}-->
+
+<!--/** 多选框选中数据 */-->
+<!--const handleSelectionChange = (selection: BaseDeviceCategoryVO[]) => {-->
+<!--  ids.value = selection.map(item => item.deviceCategoryId);-->
+<!--  single.value = selection.length != 1;-->
+<!--  multiple.value = !selection.length;-->
+<!--}-->
+
+<!--/** 新增按钮操作 */-->
+<!--const handleAdd = () => {-->
+<!--  reset();-->
+<!--  dialog.visible = true;-->
+<!--  dialog.title = "添加设备大类信息";-->
+<!--}-->
+
+<!--/** 修改按钮操作 */-->
+<!--const handleUpdate = async (row?: BaseDeviceCategoryVO) => {-->
+<!--  reset();-->
+<!--  const _deviceCategoryId = row?.deviceCategoryId || ids.value[0]-->
+<!--  const res = await getBaseDeviceCategory(_deviceCategoryId);-->
+<!--  Object.assign(form.value, res.data);-->
+<!--  dialog.visible = true;-->
+<!--  dialog.title = "修改设备大类信息";-->
+<!--}-->
+
+<!--/** 提交按钮 */-->
+<!--const submitForm = () => {-->
+<!--  baseDeviceCategoryFormRef.value?.validate(async (valid: boolean) => {-->
+<!--    if (valid) {-->
+<!--      buttonLoading.value = true;-->
+<!--      if (form.value.deviceCategoryId) {-->
+<!--        await updateBaseDeviceCategory(form.value).finally(() =>  buttonLoading.value = false);-->
+<!--      } else {-->
+<!--        await addBaseDeviceCategory(form.value).finally(() =>  buttonLoading.value = false);-->
+<!--      }-->
+<!--      proxy?.$modal.msgSuccess("操作成功");-->
+<!--      dialog.visible = false;-->
+<!--      await getList();-->
+<!--    }-->
+<!--  });-->
+<!--}-->
+
+<!--/** 删除按钮操作 */-->
+<!--const handleDelete = async (row?: BaseDeviceCategoryVO) => {-->
+<!--  const _deviceCategoryIds = row?.deviceCategoryId || ids.value;-->
+<!--  await proxy?.$modal.confirm('是否确认删除设备大类信息编号为"' + _deviceCategoryIds + '"的数据项？').finally(() => loading.value = false);-->
+<!--  await delBaseDeviceCategory(_deviceCategoryIds);-->
+<!--  proxy?.$modal.msgSuccess("删除成功");-->
+<!--  await getList();-->
+<!--}-->
+
+<!--/** 导出按钮操作 */-->
+<!--const handleExport = () => {-->
+<!--  proxy?.download('dms/baseDeviceCategory/export', {-->
+<!--    ...queryParams.value-->
+<!--  }, `baseDeviceCategory_${new Date().getTime()}.xlsx`)-->
+<!--}-->
+
+<!--onMounted(() => {-->
+<!--  getList();-->
+<!--});-->
+<!--</script>-->
diff --git a/src/views/dms/baseDeviceType/index.vue b/src/views/dms/baseDeviceType/index.vue
new file mode 100644
index 0000000..951fe4d
--- /dev/null
+++ b/src/views/dms/baseDeviceType/index.vue
@@ -0,0 +1,377 @@
+<!--<template>-->
+<!--  <div class="p-2">-->
+<!--    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :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">-->
+<!--&lt;!&ndash;            <el-form-item label="物料类型ID" prop="deviceTypeId">-->
+<!--              <el-input v-model="queryParams.deviceTypeId" placeholder="请输入物料类型ID" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="父级标识" prop="parentId">-->
+<!--              <el-input v-model="queryParams.parentId" placeholder="请输入父级标识" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="设备类型编号" prop="deviceTypeCode">-->
+<!--              <el-input v-model="queryParams.deviceTypeCode" placeholder="请输入设备类型编号" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>&ndash;&gt;-->
+<!--            <el-form-item label="设备类型名称" prop="deviceTypeName" label-width="100px">-->
+<!--              <el-input v-model="queryParams.deviceTypeName" placeholder="请输入设备类型名称" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--&lt;!&ndash;            <el-form-item label="祖级列表" prop="ancestors">-->
+<!--              <el-input v-model="queryParams.ancestors" placeholder="请输入祖级列表" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="设备大类ID" prop="categoryId">-->
+<!--              <el-input v-model="queryParams.categoryId" placeholder="请输入设备大类ID" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-form-item label="激活标识" prop="activeFlag">-->
+<!--              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />-->
+<!--            </el-form-item>&ndash;&gt;-->
+<!--            <el-form-item>-->
+<!--              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>-->
+<!--              <el-button icon="Refresh" @click="resetQuery">重置</el-button>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </el-card>-->
+<!--      </div>-->
+<!--    </transition>-->
+
+<!--    <el-card shadow="never">-->
+<!--      <template #header>-->
+<!--        <el-row :gutter="10" class="mb8">-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['dms:baseDeviceType:add']">新增</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['dms:baseDeviceType:edit']">修改</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['dms:baseDeviceType:remove']">删除</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['dms:baseDeviceType:export']">导出</el-button>-->
+<!--          </el-col>-->
+<!--          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>-->
+<!--        </el-row>-->
+<!--      </template>-->
+
+<!--      <el-table v-loading="loading" :data="baseDeviceTypeList" @selection-change="handleSelectionChange">-->
+<!--        <el-table-column type="selection" width="55" align="center" />-->
+<!--        <el-table-column label="设备类型" align="center" prop="deviceTypeId" v-if="columns[0].visible"/>-->
+<!--        <el-table-column label="父级标识" align="center" prop="parentId" v-if="columns[2].visible"/>-->
+<!--        <el-table-column label="设备类型编号" align="center" prop="deviceTypeCode" v-if="columns[3].visible"/>-->
+<!--        <el-table-column label="设备类型名称" align="center" prop="deviceTypeName" v-if="columns[4].visible"/>-->
+<!--        <el-table-column label="祖级列表" align="center" prop="ancestors" v-if="columns[5].visible"/>-->
+<!--        <el-table-column label="设备大类" align="center" prop="deviceCategoryName" v-if="columns[6].visible"/>-->
+<!--        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[7].visible">-->
+<!--          <template #default='scope'>-->
+<!--            <dict-tag :options='active_flag' :value='scope.row.activeFlag' />-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="备注" align="center" prop="remark" v-if="columns[8].visible"/>-->
+<!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--          <template #default="scope">-->
+<!--            <el-tooltip content="修改" placement="top">-->
+<!--              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dms:baseDeviceType:edit']"></el-button>-->
+<!--            </el-tooltip>-->
+<!--            <el-tooltip content="删除" placement="top">-->
+<!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['dms:baseDeviceType:remove']"></el-button>-->
+<!--            </el-tooltip>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--      </el-table>-->
+
+<!--      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />-->
+<!--    </el-card>-->
+
+<!--    &lt;!&ndash; 添加或修改设备类型信息对话框 &ndash;&gt;-->
+<!--    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>-->
+<!--      <el-form ref="baseDeviceTypeFormRef" :model="form" :rules="rules" label-width="120px">-->
+<!--&lt;!&ndash;        <el-form-item label="设备类型" prop="deviceTypeId">-->
+<!--          <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型ID" />-->
+<!--        </el-form-item>&ndash;&gt;-->
+<!--&lt;!&ndash;        <el-form-item label="父级标识" prop="parentId">-->
+<!--          <el-tree-select-->
+<!--            v-model="form.parentId"-->
+<!--            :data="baseOptions"-->
+<!--            :props="{ value: 'deviceTypeId', label: 'deviceTypeName', children: 'children' }"-->
+<!--            value-key="deviceTypeId"-->
+<!--            placeholder="请选择父级标识"-->
+<!--            check-strictly-->
+<!--          />-->
+<!--        </el-form-item>&ndash;&gt;-->
+<!--        <el-form-item label="设备类型编号" prop="deviceTypeCode">-->
+<!--          <el-input v-model="form.deviceTypeCode" placeholder="请输入设备类型编号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="设备类型名称" prop="deviceTypeName">-->
+<!--          <el-input v-model="form.deviceTypeName" placeholder="请输入设备类型名称" />-->
+<!--        </el-form-item>-->
+<!--&lt;!&ndash;        <el-form-item label="祖级列表" prop="ancestors">-->
+<!--          <el-input v-model="form.ancestors" placeholder="请输入祖级列表" />-->
+<!--        </el-form-item>&ndash;&gt;-->
+<!--        <el-form-item label="设备大类" prop="deviceCategoryId">-->
+<!--&lt;!&ndash;          <el-input v-model="form.categoryId" placeholder="请输入设备大类ID" />&ndash;&gt;-->
+<!--          <el-select v-model="form.deviceCategoryId" placeholder="请选择设备大类" filterable>-->
+<!--            <el-option v-for="item in categoryOptions"-->
+<!--                       :key="item.deviceCategoryId"-->
+<!--                       :label="item.deviceCategoryName"-->
+<!--                       :value="item.deviceCategoryId">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--&lt;!&ndash;        <el-form-item label="激活标识" prop="activeFlag">-->
+<!--          <el-input v-model="form.activeFlag" placeholder="请输入激活标识" />-->
+<!--        </el-form-item>&ndash;&gt;-->
+<!--        <el-form-item label="激活标识" prop="activeFlag">-->
+<!--          <el-radio-group v-model="form.activeFlag">-->
+<!--            <el-radio-->
+<!--              v-for="dict in active_flag"-->
+<!--              :key="dict.value"-->
+<!--              :value="dict.value"-->
+<!--            >{{dict.label}}</el-radio>-->
+<!--          </el-radio-group>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备注" prop="remark">-->
+<!--          <el-input v-model="form.remark" placeholder="请输入备注" />-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--      <template #footer>-->
+<!--        <div class="dialog-footer">-->
+<!--          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>-->
+<!--          <el-button @click="cancel">取 消</el-button>-->
+<!--        </div>-->
+<!--      </template>-->
+<!--    </el-dialog>-->
+
+<!--  </div>-->
+<!--</template>-->
+
+<!--<script setup name="BaseDeviceType" lang="ts">-->
+<!--import {-->
+<!--  listBaseDeviceType,-->
+<!--  getBaseDeviceType,-->
+<!--  delBaseDeviceType,-->
+<!--  addBaseDeviceType,-->
+<!--  updateBaseDeviceType,-->
+<!--  getBaseDeviceTypeList-->
+<!--} from '@/api/dms/baseDeviceType';-->
+<!--import { BaseDeviceTypeVO, BaseDeviceTypeQuery, BaseDeviceTypeForm } from '@/api/dms/baseDeviceType/types';-->
+<!--import {getBaseDeviceCategoryList} from "@/api/dms/baseDeviceCategory";-->
+
+<!--const { proxy } = getCurrentInstance() as ComponentInternalInstance;-->
+
+<!--const { active_flag } = toRefs<any>(proxy?.useDict( 'active_flag'));-->
+
+<!--const baseDeviceTypeList = ref<BaseDeviceTypeVO[]>([]);-->
+<!--const buttonLoading = ref(false);-->
+<!--const loading = ref(true);-->
+<!--const showSearch = ref(true);-->
+<!--const ids = ref<Array<string | number>>([]);-->
+<!--const single = ref(true);-->
+<!--const multiple = ref(true);-->
+<!--const total = ref(0);-->
+
+<!--const queryFormRef = ref<ElFormInstance>();-->
+<!--const baseDeviceTypeFormRef = ref<ElFormInstance>();-->
+
+<!--const dialog = reactive<DialogOption>({-->
+<!--  visible: false,-->
+<!--  title: ''-->
+<!--});-->
+
+<!--// 列显隐信息-->
+<!--const columns = ref<FieldOption[]>([-->
+<!--        { key: 0, label: `设备类型ID`, visible: false },-->
+<!--        { key: 1, label: `租户编号`, visible: false },-->
+<!--        { key: 2, label: `父级标识`, visible: false },-->
+<!--        { key: 3, label: `设备类型编号`, visible: true },-->
+<!--        { key: 4, label: `设备类型名称`, visible: true },-->
+<!--        { key: 5, label: `祖级列表`, visible: false },-->
+<!--        { key: 6, label: `设备大类ID`, visible: true },-->
+<!--        { key: 7, label: `激活标识`, visible: true },-->
+<!--        { key: 8, label: `备注`, visible: true },-->
+<!--        { key: 9, label: `创建部门`, visible: false },-->
+<!--        { key: 10, label: `创建人`, visible: false },-->
+<!--        { key: 11, label: `创建时间`, visible: false },-->
+<!--        { key: 12, label: `更新人`, visible: false },-->
+<!--        { key: 13, label: `更新时间`, visible: false },-->
+<!--]);-->
+
+<!--const initFormData: BaseDeviceTypeForm = {-->
+<!--  deviceTypeId: undefined,-->
+<!--  parentId: undefined,-->
+<!--  deviceTypeCode: undefined,-->
+<!--  deviceTypeName: undefined,-->
+<!--  ancestors: undefined,-->
+<!--  deviceCategoryId: undefined,-->
+<!--  deviceCategoryName: undefined,-->
+<!--  activeFlag: '1',-->
+<!--  remark: undefined,-->
+<!--}-->
+<!--const data = reactive<PageData<BaseDeviceTypeForm, BaseDeviceTypeQuery>>({-->
+<!--  form: {...initFormData},-->
+<!--  queryParams: {-->
+<!--    pageNum: 1,-->
+<!--    pageSize: 10,-->
+<!--    deviceTypeId: undefined,-->
+<!--    parentId: undefined,-->
+<!--    deviceTypeCode: undefined,-->
+<!--    deviceTypeName: undefined,-->
+<!--    ancestors: undefined,-->
+<!--    deviceCategoryId: undefined,-->
+<!--    deviceCategoryName: undefined,-->
+<!--    activeFlag: undefined,-->
+<!--    params: {-->
+<!--    }-->
+<!--  },-->
+<!--  rules: {-->
+<!--/*    deviceTypeId: [-->
+<!--      { required: true, message: "设备类型不能为空", trigger: "blur" }-->
+<!--    ],*/-->
+<!--    parentId: [-->
+<!--      { required: true, message: "父级标识不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--    deviceTypeCode: [-->
+<!--      { required: true, message: "设备类型编号不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--    deviceTypeName: [-->
+<!--      { required: true, message: "设备类型名称不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--/*    ancestors: [-->
+<!--      { required: true, message: "祖级列表不能为空", trigger: "blur" }-->
+<!--    ],*/-->
+<!--    // categoryId: [-->
+<!--    //   { required: true, message: "设备大类不能为空", trigger: "blur" }-->
+<!--    // ],-->
+<!--    deviceCategoryId:[-->
+<!--      { required: true, message: "设备大类不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--    activeFlag: [-->
+<!--      { required: true, message: "激活标识不能为空", trigger: "blur" }-->
+<!--    ],-->
+<!--/*    remark: [-->
+<!--      { required: true, message: "备注不能为空", trigger: "blur" }-->
+<!--    ],*/-->
+<!--  }-->
+<!--});-->
+
+<!--const { queryParams, form, rules } = toRefs(data);-->
+
+<!--/** 查询设备类型信息列表 */-->
+<!--const getList = async () => {-->
+<!--  loading.value = true;-->
+<!--  const res = await listBaseDeviceType(queryParams.value);-->
+<!--  baseDeviceTypeList.value = res.rows;-->
+<!--  total.value = res.total;-->
+<!--  loading.value = false;-->
+<!--}-->
+
+<!--/** 取消按钮 */-->
+<!--const cancel = () => {-->
+<!--  reset();-->
+<!--  dialog.visible = false;-->
+<!--}-->
+
+<!--/** 表单重置 */-->
+<!--const reset = () => {-->
+<!--  form.value = {...initFormData};-->
+<!--  baseDeviceTypeFormRef.value?.resetFields();-->
+<!--}-->
+
+<!--/** 搜索按钮操作 */-->
+<!--const handleQuery = () => {-->
+<!--  queryParams.value.pageNum = 1;-->
+<!--  getList();-->
+<!--}-->
+
+<!--/** 重置按钮操作 */-->
+<!--const resetQuery = () => {-->
+<!--  queryFormRef.value?.resetFields();-->
+<!--  handleQuery();-->
+<!--}-->
+
+<!--/** 多选框选中数据 */-->
+<!--const handleSelectionChange = (selection: BaseDeviceTypeVO[]) => {-->
+<!--  ids.value = selection.map(item => item.deviceTypeId);-->
+<!--  single.value = selection.length != 1;-->
+<!--  multiple.value = !selection.length;-->
+<!--}-->
+
+<!--/** 新增按钮操作 */-->
+<!--const handleAdd = async() => {-->
+<!--  reset();-->
+<!--  await getTreeselect();-->
+<!--  dialog.visible = true;-->
+<!--  dialog.title = "添加设备类型信息";-->
+<!--}-->
+
+<!--/** 修改按钮操作 */-->
+<!--const handleUpdate = async (row?: BaseDeviceTypeVO) => {-->
+<!--  reset();-->
+<!--  await getTreeselect();-->
+<!--  const _deviceTypeId = row?.deviceTypeId || ids.value[0]-->
+<!--  const res = await getBaseDeviceType(_deviceTypeId);-->
+<!--  Object.assign(form.value, res.data);-->
+<!--  dialog.visible = true;-->
+<!--  dialog.title = "修改设备类型信息";-->
+<!--}-->
+
+<!--/** 提交按钮 */-->
+<!--const submitForm = () => {-->
+<!--  baseDeviceTypeFormRef.value?.validate(async (valid: boolean) => {-->
+<!--    if (valid) {-->
+<!--      buttonLoading.value = true;-->
+<!--      if (form.value.deviceTypeId) {-->
+<!--        await updateBaseDeviceType(form.value).finally(() =>  buttonLoading.value = false);-->
+<!--      } else {-->
+<!--        await addBaseDeviceType(form.value).finally(() =>  buttonLoading.value = false);-->
+<!--      }-->
+<!--      proxy?.$modal.msgSuccess("操作成功");-->
+<!--      dialog.visible = false;-->
+<!--      await getList();-->
+<!--    }-->
+<!--  });-->
+<!--}-->
+
+<!--/** 删除按钮操作 */-->
+<!--const handleDelete = async (row?: BaseDeviceTypeVO) => {-->
+<!--  const _deviceTypeIds = row?.deviceTypeId || ids.value;-->
+<!--  await proxy?.$modal.confirm('是否确认删除设备类型信息编号为"' + _deviceTypeIds + '"的数据项？').finally(() => loading.value = false);-->
+<!--  await delBaseDeviceType(_deviceTypeIds);-->
+<!--  proxy?.$modal.msgSuccess("删除成功");-->
+<!--  await getList();-->
+<!--}-->
+
+<!--/** 导出按钮操作 */-->
+<!--const handleExport = () => {-->
+<!--  proxy?.download('dms/baseDeviceType/export', {-->
+<!--    ...queryParams.value-->
+<!--  }, `baseDeviceType_${new Date().getTime()}.xlsx`)-->
+<!--}-->
+
+<!--let categoryOptions = ref([]);-->
+<!--const getCategorySelect = async () => {-->
+<!--  const res = await getBaseDeviceCategoryList(null);-->
+<!--  categoryOptions.value = res.data;-->
+<!--}-->
+
+
+<!--/** 查询计量单位信息下拉树结构 */-->
+<!--type BaseOption = {-->
+<!--  deviceTypeId: number;-->
+<!--  deviceTypeName: string;-->
+<!--  children?: BaseOption[];-->
+<!--}-->
+
+<!--const baseOptions = ref<BaseDeviceTypeVO[]>([]);-->
+<!--const getTreeselect = async () => {-->
+<!--  const res = await getBaseDeviceTypeList(null);-->
+<!--  baseOptions.value = [];-->
+<!--  const data: BaseOption = { deviceTypeId: 0, deviceTypeName: '顶级节点', children: [] };-->
+<!--  data.children = proxy?.handleTree<BaseOption>(res.data, "deviceTypeId", "parentId");-->
+<!--  baseOptions.value.push(data);-->
+<!--}-->
+
+<!--onMounted(() => {-->
+<!--  getCategorySelect();-->
+<!--  getList();-->
+<!--});-->
+<!--</script>-->
diff --git a/src/views/mes/prodBaseMachineInfo/index.vue b/src/views/mes/prodBaseMachineInfo/index.vue
index fe357cd..7c5dbab 100644
--- a/src/views/mes/prodBaseMachineInfo/index.vue
+++ b/src/views/mes/prodBaseMachineInfo/index.vue
@@ -164,7 +164,15 @@
           <el-input v-model='form.machineLocation' placeholder='请输入机台位置' />
         </el-form-item>
         <el-form-item label='机台类型' prop='machineType'>
-          <el-input v-model='form.machineType' placeholder='请输入机台类型' />
+<!--          <el-input v-model='form.machineType' placeholder='请输入机台类型' />-->
+          <el-select v-model='form.machineType' placeholder='请选择机台类型'>
+            <el-option
+              v-for='item in baseDeviceTypeList'
+              :key='item.deviceTypeId'
+              :label='item.deviceTypeName'
+              :value='item.deviceTypeId'
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label='机台规格' prop='machineSpec'>
           <el-input v-model='form.machineSpec' placeholder='请输入机台规格' />
@@ -331,6 +339,7 @@ import {
 import { getWorkshopList } from '@/api/mes/baseWorkshopInfo';
 import { getProcessInfoList } from '@/api/mes/baseProcessInfo';
 import { getDmsDeviceModeList } from '@/api/dms/deviceMode';
+import {getBaseDeviceTypeList} from "@/api/mes/baseDeviceType";
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const {
@@ -605,7 +614,14 @@ const handleExport = () => {
   }, `prodBaseMachineInfo_${new Date().getTime()}.xlsx`);
 };
 
+let baseDeviceTypeList = ref([]);
+const getDeviceTypeList = async () => {
+  const res = await getBaseDeviceTypeList(null);
+  baseDeviceTypeList.value = res.data;
+};
+
 onMounted(() => {
+  getDeviceTypeList();
   getProcessInfoListSelect();
   getWorkshopListSelect();
   getDmsDeviceModeListSelect();