diff --git a/src/api/eam/basic/classType/index.ts b/src/api/eam/basic/classType/index.ts
new file mode 100644
index 0000000..89d153f
--- /dev/null
+++ b/src/api/eam/basic/classType/index.ts
@@ -0,0 +1,54 @@
+import request from '@/config/axios'
+
+export interface ClassTypeVO {
+  workerRoleId: string
+  engineerRoleId: string
+  type: string
+  describes: string
+  factoryAreaNumber: string
+  siteId: string
+  available: string
+  deptId: number
+  concurrencyStamp: number
+}
+
+// 查询厂区班组角色数据维护列表
+export const getClassTypePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/eam/class-type/senior', data })
+  } else {
+    return await request.get({ url: `/eam/class-type/page`, params })
+  }
+}
+
+// 查询厂区班组角色数据维护详情
+export const getClassType = async (id: number) => {
+  return await request.get({ url: `/eam/class-type/get?id=` + id })
+}
+
+// 新增厂区班组角色数据维护
+export const createClassType = async (data: ClassTypeVO) => {
+  return await request.post({ url: `/eam/class-type/create`, data })
+}
+
+// 修改厂区班组角色数据维护
+export const updateClassType = async (data: ClassTypeVO) => {
+  return await request.put({ url: `/eam/class-type/update`, data })
+}
+
+// 删除厂区班组角色数据维护
+export const deleteClassType = async (id: number) => {
+  return await request.delete({ url: `/eam/class-type/delete?id=` + id })
+}
+
+// 导出厂区班组角色数据维护 Excel
+export const exportClassType = async (params) => {
+  return await request.download({ url: `/eam/class-type/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/eam/class-type/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/api/system/dept/index.ts b/src/api/system/dept/index.ts
index 3d902d7..b028457 100644
--- a/src/api/system/dept/index.ts
+++ b/src/api/system/dept/index.ts
@@ -22,6 +22,18 @@ export const getDeptPage = async (params: PageParam) => {
   return await request.get({ url: '/system/dept/list', params })
 }
 
+// 查询部门分页
+export const getDeptPages = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/system/dept/senior', data })
+  } else {
+    return await request.get({ url: `/system/dept/page`, params })
+  }
+}
+
+
 // 查询部门详情
 export const getDept = async (id: number) => {
   return await request.get({ url: '/system/dept/get?id=' + id })
diff --git a/src/api/system/role/index.ts b/src/api/system/role/index.ts
index 93636ff..d174e95 100644
--- a/src/api/system/role/index.ts
+++ b/src/api/system/role/index.ts
@@ -22,6 +22,17 @@ export const getRolePage = async (params: PageParam) => {
   return await request.get({ url: '/system/role/page', params })
 }
 
+// 查询角色分页
+export const getRolePages = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/system/role/senior', data })
+  } else {
+    return await request.get({ url: `/system/role/page`, params })
+  }
+}
+
 // 查询角色（精简)列表
 export const getSimpleRoleList = async (): Promise<RoleVO[]> => {
   return await request.get({ url: '/system/role/list-all-simple' })
diff --git a/src/views/eam/basic/classType/classType.data.ts b/src/views/eam/basic/classType/classType.data.ts
new file mode 100644
index 0000000..222f194
--- /dev/null
+++ b/src/views/eam/basic/classType/classType.data.ts
@@ -0,0 +1,176 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+import * as deptApi from '@/api/system/dept'
+import * as roleApi from '@/api/system/role'
+import { Role } from '@/views/system/role/role.data'
+// 表单校验
+export const ClassTypeRules = reactive({
+  workerRoleId: [required],
+  engineerRoleId: [required],
+  type: [required],
+  factoryAreaNumber: [required],
+})
+const FactoryAreaNoPage = await deptApi.getDeptPage({'deptGroup':'factory'})
+const roleList = await roleApi.getSimpleRoleList({})
+console.log('FactoryAreaNoPage',FactoryAreaNoPage);
+console.log('roleList',roleList);
+
+ const FactoryAreaNumbers = useCrudSchemas(reactive<CrudSchema[]>([
+
+  {
+ 
+   label: '编号',
+ 
+   field: 'id',
+ 
+   sort: 'custom',
+ 
+   isSearch: true,
+   isForm: true,
+ 
+   table: {
+ 
+    width: 180,
+ 
+    fixed: 'left'
+ 
+   },
+ 
+  },
+ 
+  {
+ 
+   label: '名称',
+ 
+   field: 'name',
+ 
+   sort: 'custom',
+ 
+  }
+ 
+ ]))
+export const ClassType = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '维修工角色id',
+    field: 'workerRoleId',
+    sort: 'custom',
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择单号', // 输入框占位文本
+        searchField: 'id', // 查询弹窗赋值字段
+        searchTitle: '维修工角色', // 查询弹窗标题
+        searchAllSchemas: Role.allSchemas, // 查询弹窗所需类
+        searchPage: roleApi.getRolePages, // 查询弹窗所需分页方法
+        searchCondition: [
+          //  {
+          //   key: 'deptGroup',
+          //   value: 'factory',
+          //   isMainValue: false
+          // }
+        ]
+      }
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return roleList.find((item) => item.id == cellValue)?.name
+    },
+  },
+  {
+    label: '工程师角色id',
+    field: 'engineerRoleId',
+    sort: 'custom',
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择单号', // 输入框占位文本
+        searchField: 'id', // 查询弹窗赋值字段
+        searchTitle: '工程师角色', // 查询弹窗标题
+        searchAllSchemas: Role.allSchemas, // 查询弹窗所需类
+        searchPage: roleApi.getRolePage, // 查询弹窗所需分页方法
+        searchCondition: [
+          // {
+          //   key: 'deptGroup',
+          //   value: 'factory',
+          //   isMainValue: false
+          // }
+        ]
+      }
+    },
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return roleList.find((account) => account.id == cellValue)?.name
+    },
+  },
+  {
+    label: '设备类型',
+    field: 'type',
+    dictType: DICT_TYPE.CLASS_TYPE,
+    isSearch: false,
+    dictClass: 'string',
+    sort: 'custom',
+                form: {
+                  component: 'Select'
+                },
+  },
+  {
+    label: '描述',
+    field: 'describes',
+    sort: 'custom',
+  },
+  {
+    label: '所属厂区编号',
+    field: 'factoryAreaNumber',
+    isSearch: false,
+    sort: 'custom',
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择单号', // 输入框占位文本
+        searchField: 'id', // 查询弹窗赋值字段
+        searchTitle: '厂区信息', // 查询弹窗标题
+        searchAllSchemas: FactoryAreaNumbers.allSchemas, // 查询弹窗所需类
+        searchPage: deptApi.getDeptPages, // 查询弹窗所需分页方法
+        searchCondition: [
+           {
+            key: 'deptGroup',
+            value: 'factory',
+            isMainValue: false
+          }
+        ]
+      }
+    },
+    //给列表用的
+    formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
+      return FactoryAreaNoPage.find((account) => account.id == cellValue)?.name
+    },
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  // {
+  //   label: '地点ID',
+  //   field: 'siteId',
+  //   sort: 'custom',
+  // },
+  // {
+  //   label: '是否可用',
+  //   field: 'available',
+  //   sort: 'custom',
+  // },
+
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))
diff --git a/src/views/eam/basic/classType/index.vue b/src/views/eam/basic/classType/index.vue
new file mode 100644
index 0000000..f1fb288
--- /dev/null
+++ b/src/views/eam/basic/classType/index.vue
@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ClassType.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ClassType.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ClassTypeRules"
+    :formAllSchemas="ClassType.allSchemas"
+    :apiUpdate="ClassTypeApi.updateClassType"
+    :apiCreate="ClassTypeApi.createClassType"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <!-- <Detail ref="detailRef" :isBasic="true" :allSchemas="ClassType.allSchemas" /> -->
+
+  <!-- 导入 -->
+  <!-- <ImportForm ref="importFormRef" url="/eam/class-type/import" :importTemplateData="importTemplateData" @success="importSuccess" /> -->
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ClassType,ClassTypeRules } from './classType.data'
+import * as ClassTypeApi from '@/api/eam/basic/classType'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+// import TableHead from '@/components/TableHead/src/TableHead.vue'
+// import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+// import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'ClassType' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ClassType.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ClassTypeApi.getClassTypePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'eam:classType:create'}), 
+  // defaultButtons.defaultImportBtn({hasPermi:'eam:classType:import'}), // 导入
+  // defaultButtons.defaultExportBtn({hasPermi:'eam:classType:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  // defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'eam:classType:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'eam:classType:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ClassType.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ClassTypeApi.createClassType(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ClassTypeApi.updateClassType(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicClassType')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ClassTypeApi.deleteClassType(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ClassTypeApi.exportClassType(tableObject.params)
+    download.excel(data, '厂区班组角色数据维护.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '厂区班组角色数据维护导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ClassTypeApi.importTemplate()
+})
+
+</script>
diff --git a/src/views/system/role/role.data.ts b/src/views/system/role/role.data.ts
new file mode 100644
index 0000000..bd080c3
--- /dev/null
+++ b/src/views/system/role/role.data.ts
@@ -0,0 +1,83 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const RoleRules = reactive({
+  name: [required],
+  code: [required],
+})
+
+export const Role = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '角色ID',
+    field: 'id',
+    sort: 'custom',
+    isForm: false,
+  },
+  {
+    label: '角色名称',
+    field: 'name',
+    sort: 'custom',
+  },
+  {
+    label: '角色权限字符串',
+    field: 'code',
+    sort: 'custom',
+  },
+  {
+    label: '显示顺序',
+    field: 'sort',
+    sort: 'custom',
+    form: {
+      component: 'InputNumber',
+      value: 0
+    },
+  },
+  {
+    label: '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）',
+    field: 'dataScope',
+    sort: 'custom',
+  },
+  {
+    label: '数据范围(指定部门数组)',
+    field: 'dataScopeDeptIds',
+    sort: 'custom',
+  },
+  {
+    label: '角色状态（0正常 1停用）',
+    field: 'status',
+    sort: 'custom',
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '角色类型',
+    field: 'type',
+    sort: 'custom',
+                form: {
+                  component: 'Select'
+                },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isForm: false,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))