diff --git a/src/api/system/equipment/Category/index.ts b/src/api/system/equipment/Category/index.ts
new file mode 100644
index 0000000..d04c612
--- /dev/null
+++ b/src/api/system/equipment/Category/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceCategoryVO, DeviceCategoryForm, DeviceCategoryQuery } from './type';
+
+/**
+ * 查询设备分类列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceCategory = (query?: DeviceCategoryQuery): AxiosPromise<DeviceCategoryVO[]> => {
+  return request({
+    url: '/system/deviceCategory/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备分类详细
+ * @param id
+ */
+export const getDeviceCategory = (id: string | number): AxiosPromise<DeviceCategoryVO> => {
+  return request({
+    url: '/system/deviceCategory/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备分类
+ * @param data
+ */
+export const addDeviceCategory = (data: DeviceCategoryForm) => {
+  return request({
+    url: '/system/deviceCategory',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备分类
+ * @param data
+ */
+export const updateDeviceCategory = (data: DeviceCategoryForm) => {
+  return request({
+    url: '/system/deviceCategory',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备分类
+ * @param id
+ */
+export const delDeviceCategory = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/deviceCategory/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/system/equipment/Category/type.ts b/src/api/system/equipment/Category/type.ts
new file mode 100644
index 0000000..83cc39f
--- /dev/null
+++ b/src/api/system/equipment/Category/type.ts
@@ -0,0 +1,60 @@
+export interface DeviceCategoryVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 设备分类名称
+   */
+  categoryName: string;
+
+  /**
+   * 状态 0正常 1停用
+   */
+  status: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface DeviceCategoryForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 设备分类名称
+   */
+  categoryName?: string;
+
+  /**
+   * 状态 0正常 1停用
+   */
+  status?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface DeviceCategoryQuery extends PageQuery {
+  /**
+   * 设备分类名称
+   */
+  categoryName?: string;
+
+  /**
+   * 状态 0正常 1停用
+   */
+  status?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/system/equipment/Repair/index.ts b/src/api/system/equipment/Repair/index.ts
new file mode 100644
index 0000000..8a92a68
--- /dev/null
+++ b/src/api/system/equipment/Repair/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceRepairVO, DeviceRepairForm, DeviceRepairQuery } from './type';
+
+/**
+ * 查询维修工单列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceRepair = (query?: DeviceRepairQuery): AxiosPromise<DeviceRepairVO[]> => {
+  return request({
+    url: '/system/deviceRepair/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询维修工单详细
+ * @param id
+ */
+export const getDeviceRepair = (id: string | number): AxiosPromise<DeviceRepairVO> => {
+  return request({
+    url: '/system/deviceRepair/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增维修工单
+ * @param data
+ */
+export const addDeviceRepair = (data: DeviceRepairForm) => {
+  return request({
+    url: '/system/deviceRepair',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改维修工单
+ * @param data
+ */
+export const updateDeviceRepair = (data: DeviceRepairForm) => {
+  return request({
+    url: '/system/deviceRepair',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除维修工单
+ * @param id
+ */
+export const delDeviceRepair = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/deviceRepair/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/system/equipment/Repair/type.ts b/src/api/system/equipment/Repair/type.ts
new file mode 100644
index 0000000..3ae79ad
--- /dev/null
+++ b/src/api/system/equipment/Repair/type.ts
@@ -0,0 +1,165 @@
+export interface DeviceRepairVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 维修设备ID
+   */
+  deviceId: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName: string;
+
+  /**
+   * 设备编号
+   */
+  deviceCode: string;
+
+  /**
+   * 设备型号
+   */
+  deviceModel: string;
+
+  /**
+   * 位置区域
+   */
+  area: string;
+
+  /**
+   * 维护人员ID，多个用,分隔
+   */
+  maintainUserIds: string | number;
+
+  /**
+   * 故障描述
+   */
+  faultDesc: string;
+
+  /**
+   * 维修结果 0已修复 1未修复
+   */
+  repairResult: number;
+
+  /**
+   * 维修时间
+   */
+  repairTime: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface DeviceRepairForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 维修设备ID
+   */
+  deviceId?: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 设备编号
+   */
+  deviceCode?: string;
+
+  /**
+   * 设备型号
+   */
+  deviceModel?: string;
+
+  /**
+   * 位置区域
+   */
+  area?: string;
+
+  /**
+   * 维护人员ID，多个用,分隔
+   */
+  maintainUserIds?: string | number;
+
+  /**
+   * 故障描述
+   */
+  faultDesc?: string;
+
+  /**
+   * 维修结果 0已修复 1未修复
+   */
+  repairResult?: number;
+
+  /**
+   * 维修时间
+   */
+  repairTime?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface DeviceRepairQuery extends PageQuery {
+  /**
+   * 维修设备ID
+   */
+  deviceId?: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 设备编号
+   */
+  deviceCode?: string;
+
+  /**
+   * 设备型号
+   */
+  deviceModel?: string;
+
+  /**
+   * 位置区域
+   */
+  area?: string;
+
+  /**
+   * 维护人员ID，多个用,分隔
+   */
+  maintainUserIds?: string | number;
+
+  /**
+   * 故障描述
+   */
+  faultDesc?: string;
+
+  /**
+   * 维修结果 0已修复 1未修复
+   */
+  repairResult?: number;
+
+  /**
+   * 维修时间
+   */
+  repairTime?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/system/equipment/archive/index.ts b/src/api/system/equipment/archive/index.ts
new file mode 100644
index 0000000..26377a2
--- /dev/null
+++ b/src/api/system/equipment/archive/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceVO, DeviceForm, DeviceQuery } from './type';
+
+/**
+ * 查询设备列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDevice = (query?: DeviceQuery): AxiosPromise<DeviceVO[]> => {
+  return request({
+    url: '/warehouse/device/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备详细
+ * @param id
+ */
+export const getDevice = (id: string | number): AxiosPromise<DeviceVO> => {
+  return request({
+    url: '/warehouse/device/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备
+ * @param data
+ */
+export const addDevice = (data: DeviceForm) => {
+  return request({
+    url: '/warehouse/device',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备
+ * @param data
+ */
+export const updateDevice = (data: DeviceForm) => {
+  return request({
+    url: '/warehouse/device',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备
+ * @param id
+ */
+export const delDevice = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/warehouse/device/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/system/equipment/archive/type.ts b/src/api/system/equipment/archive/type.ts
new file mode 100644
index 0000000..e326e54
--- /dev/null
+++ b/src/api/system/equipment/archive/type.ts
@@ -0,0 +1,135 @@
+export interface DeviceVO {
+  /**
+   * 主键ID
+   */
+  id: string | number;
+
+  /**
+   * 设备分类ID
+   */
+  categoryId: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName: string;
+
+  /**
+   * 设备编号
+   */
+  deviceCode: string;
+
+  /**
+   * 设备型号
+   */
+  deviceModel: string;
+
+  /**
+   * 位置区域
+   */
+  area: string;
+
+  /**
+   * 维护人员ID，多个用,分隔
+   */
+  maintainUserIds: string | number;
+
+  /**
+   * 设备状态 0正常 1异常
+   */
+  status: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+}
+
+export interface DeviceForm extends BaseEntity {
+  /**
+   * 主键ID
+   */
+  id?: string | number;
+
+  /**
+   * 设备分类ID
+   */
+  categoryId?: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 设备编号
+   */
+  deviceCode?: string;
+
+  /**
+   * 设备型号
+   */
+  deviceModel?: string;
+
+  /**
+   * 位置区域
+   */
+  area?: string;
+
+  /**
+   * 维护人员ID，多个用,分隔
+   */
+  maintainUserIds?: string | number;
+
+  /**
+   * 设备状态 0正常 1异常
+   */
+  status?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+export interface DeviceQuery extends PageQuery {
+  /**
+   * 设备分类ID
+   */
+  categoryId?: string | number;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 设备编号
+   */
+  deviceCode?: string;
+
+  /**
+   * 设备型号
+   */
+  deviceModel?: string;
+
+  /**
+   * 位置区域
+   */
+  area?: string;
+
+  /**
+   * 维护人员ID，多个用,分隔
+   */
+  maintainUserIds?: string | number;
+
+  /**
+   * 设备状态 0正常 1异常
+   */
+  status?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/views/system/Sdb/ChargeItem/add.vue b/src/views/system/Sdb/ChargeItem/add.vue
index 43f60f8..68b9448 100644
--- a/src/views/system/Sdb/ChargeItem/add.vue
+++ b/src/views/system/Sdb/ChargeItem/add.vue
@@ -5,25 +5,49 @@
       <div class="title">基本信息</div>
       <div class="addBuildingFormBody">
         <el-form class="formBody" label-position="right" ref="formRef" :model="form" :rules="rules" label-width="130px">
-          <el-form-item label="项目名称" prop="materialName">
-            <span>{{ form.materialName }}</span>
+          <el-form-item label="项目名称" prop="name">
+            <el-input v-model.trim="form.name" placeholder="请输入项目名称" />
           </el-form-item>
-          <el-form-item label="品牌" prop="brand">
-            <span>{{ form.brand }}</span>
+          <el-form-item label="计费方式" prop="billingMethod">
+            <el-select v-model="form.billingMethod">
+              <el-option v-for="(item, index) in com_charge_item_method" :key="index" :value="item.value" :label="item.label"></el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="规格型号" prop="model">
-            <span>{{ form.model }}</span>
+          <el-form-item label="费用单价" prop="price">
+            <el-input v-model.trim="form.price" placeholder="请输入费用单价" />
+          </el-form-item>
+          <el-form-item label="计算公式" prop="materialName">
+            <el-select v-model="form.formula">
+              <el-option v-for="(item, index) in com_charge_item_formula" :key="index" :value="item.value" :label="item.label"></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="计量单位" prop="unit">
-            <span>{{ form.unit }}</span>
+            <el-select v-model="form.unit">
+              <el-option v-for="(item, index) in com_charge_item_unit" :key="index" :value="item.value" :label="item.label"></el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="成本" prop="unit">
-            <span>{{ form.unit }}</span>
-            <el-input v-model.trim="form.remark" placeholder="请输入成本" />
+          <el-form-item label="计算精度" prop="precision">
+            <el-select v-model="form.precision">
+              <el-option v-for="(item, index) in com_charge_item_precision" :key="index" :value="item.value" :label="item.label"></el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item label="当前库存" prop="unit">
-            <span>{{ form.unit }}</span>
-            <el-input v-model.trim="form.remark" placeholder="请输入当前库存" />
+          <el-form-item label="进位方式" prop="carryMethod">
+            <el-select v-model="form.carryMethod">
+              <el-option v-for="(item, index) in com_charge_item_carry_method" :key="index" :value="item.value" :label="item.label"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="滞纳金比例" prop="lateFee">
+            <el-input v-model.trim="form.lateFee" placeholder="请输入滞纳金比例">
+              <template #suffix>%</template>
+            </el-input>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="form.status">
+              <el-radio v-for="(item, index) in com_charge_item_status" :key="index" :value="item.value">{{ item.label }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="备注" prop="unit">
+            <el-input type="textarea" :rows="5" v-model.trim="form.remark" placeholder="请输入当前库存" />
           </el-form-item>
 
           <el-form-item style="margin-top: 30px">
@@ -39,39 +63,51 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import PageHeader from '@/components/Pageheader/index.vue';
-import { getMaterial, updateMaterial, addMaterial } from '@/api/system/Tmaterial';
+import { getChargeItem, updateChargeItem, addChargeItem } from '@/api/system/SdbChargeItem';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { com_charge_item_method } = toRefs<any>(proxy?.useDict('com_charge_item_method'));
+const { com_charge_item_unit } = toRefs<any>(proxy?.useDict('com_charge_item_unit'));
+const { com_charge_item_precision } = toRefs<any>(proxy?.useDict('com_charge_item_precision'));
+const { com_charge_item_carry_method } = toRefs<any>(proxy?.useDict('com_charge_item_carry_method'));
+const { com_charge_item_status } = toRefs<any>(proxy?.useDict('com_charge_item_status'));
+const { com_charge_item_formula } = toRefs<any>(proxy?.useDict('com_charge_item_formula'));
 
 const router = useRouter();
 const route = useRoute();
 
 const formRef = ref();
 const form = ref({
-  id: null,
-  materialName: '', // 物料名称
-  brand: '', // 联系电话
-  model: '', // 邮箱
-  unit: '', // 地址
-  remark: '' // 备注
+  'id': null,
+  'name': '',
+  'billingMethod': '',
+  'price': null,
+  'unit': '',
+  'precision': '',
+  'carryMethod': '',
+  'lateFee': null,
+  'remark': '',
+  'formula': '',
+  'status': '0'
 });
 const rules = ref({
-  materialName: [{ required: true, message: '请输入 物料名称', trigger: 'blur' }],
-  brand: [{ required: true, message: '请输入 品牌', trigger: 'blur' }],
-  model: [{ required: true, message: '请输入 规格型号', trigger: 'blur' }],
-  unit: [{ required: true, message: '请输入 计量单位', trigger: 'blur' }]
+  name: [{ required: true, message: '请输入 项目名称', trigger: 'blur' }],
+  billingMethod: [{ required: true, message: '请输入 计费方式', trigger: 'blur' }],
+  price: [{ required: true, message: '请输入 费用单价', trigger: 'blur' }],
+  formula: [{ required: true, message: '请选择 计费公式', trigger: 'blur' }],
+  unit: [{ required: true, message: '请选择 计费单位', trigger: 'blur' }],
+  precision: [{ required: true, message: '选择 计算精度', trigger: 'blur' }],
+  carryMethod: [{ required: true, message: '请选择 进位方式', trigger: 'blur' }],
+  lateFee: [{ required: true, message: '请输入 滞纳金比例', trigger: 'blur' }],
+  status: [{ required: true, message: '请选择 状态', trigger: 'blur' }]
 });
 const userid = ref(null);
 if (route.query.id) {
   userid.value = route.query.id;
-  getMaterial(userid.value).then((res) => {
+  getChargeItem(userid.value).then((res) => {
     form.value = {
-      id: res.data.id,
-      materialName: res.data.materialName,
-      brand: res.data.brand,
-      model: res.data.model,
-      unit: res.data.unit,
-      remark: res.data.remark
+      ...form.value,
+      ...res.data
     };
   });
 }
@@ -81,12 +117,12 @@ const submitForm = () => {
   formRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       if (userid.value) {
-        updateMaterial(form.value).then((res) => {
+        updateChargeItem(form.value).then((res) => {
           ElMessage.success('编辑成功');
           cancelForm();
         });
       } else {
-        addMaterial(form.value).then((res) => {
+        addChargeItem(form.value).then((res) => {
           ElMessage.success('添加成功');
           cancelForm();
         });
diff --git a/src/views/system/equipment/Archive/index.vue b/src/views/system/equipment/Archive/index.vue
index ae6056c..6af8cf6 100644
--- a/src/views/system/equipment/Archive/index.vue
+++ b/src/views/system/equipment/Archive/index.vue
@@ -1,12 +1,226 @@
 <template>
-  <div class="p-2 h-full flex flex-col">
-    <Pageheader></Pageheader>
-    <div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中，敬请期待...</div>
+  <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">
+            <el-form-item label="设备分类ID" prop="categoryId">
+              <el-input v-model="queryParams.categoryId" placeholder="请输入设备分类ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备编号" prop="deviceCode">
+              <el-input v-model="queryParams.deviceCode" 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>
+            </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="['system:device:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:device:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:device:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="设备分类" align="center" prop="categoryId" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备编号" align="center" prop="deviceCode" />
+        <el-table-column label="设备型号" align="center" prop="deviceModel" />
+        <el-table-column label="位置区域" align="center" prop="area" />
+        <el-table-column label="维护人员" align="center" prop="maintainUserIds" />
+        <el-table-column label="设备状态 0正常 1异常" align="center" prop="status" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" fixed="right" 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="['system:device:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:device: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>
   </div>
 </template>
 
-<script setup lang="ts">
-import { ref } from 'vue';
-</script>
+<script setup name="Device" lang="ts">
+import { listDevice, getDevice, delDevice, addDevice, updateDevice } from '@/api/system/equipment/archive';
+import { DeviceVO, DeviceQuery, DeviceForm } from '@/api/system/equipment/archive/type';
 
-<style scoped lang="scss"></style>
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const deviceList = ref<DeviceVO[]>([]);
+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 deviceFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceForm = {
+  id: undefined,
+  categoryId: undefined,
+  deviceName: undefined,
+  deviceCode: undefined,
+  deviceModel: undefined,
+  area: undefined,
+  maintainUserIds: undefined,
+  status: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<DeviceForm, DeviceQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    categoryId: undefined,
+    deviceName: undefined,
+    deviceCode: undefined,
+    deviceModel: undefined,
+    area: undefined,
+    maintainUserIds: undefined,
+    status: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    categoryId: [{ required: true, message: '设备分类ID不能为空', trigger: 'blur' }],
+    deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDevice(queryParams.value);
+  deviceList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  deviceFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加设备';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DeviceVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getDevice(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改设备';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDevice(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addDevice(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delDevice(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/device/export',
+    {
+      ...queryParams.value
+    },
+    `device_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/system/equipment/Category/index.vue b/src/views/system/equipment/Category/index.vue
index ae6056c..0f5bc51 100644
--- a/src/views/system/equipment/Category/index.vue
+++ b/src/views/system/equipment/Category/index.vue
@@ -1,12 +1,225 @@
 <template>
-  <div class="p-2 h-full flex flex-col">
-    <Pageheader></Pageheader>
-    <div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中，敬请期待...</div>
+  <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" label-width="100" :model="queryParams" :inline="true">
+            <el-form-item label="设备分类名称" prop="categoryName">
+              <el-input v-model="queryParams.categoryName" 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>
+            </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="['system:deviceCategory:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:deviceCategory:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:deviceCategory:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:deviceCategory:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="deviceCategoryList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" v-if="true" />
+        <el-table-column label="设备分类名称" align="center" prop="categoryName" />
+        <el-table-column label="状态 0正常 1停用" align="center" prop="status" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" fixed="right" 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="['system:deviceCategory:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:deviceCategory: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>
+    <!-- 添加或修改设备分类对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="deviceCategoryFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备分类名称" prop="categoryName">
+          <el-input v-model="form.categoryName" placeholder="请输入设备分类名称" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" 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 lang="ts">
-import { ref } from 'vue';
-</script>
+<script setup name="DeviceCategory" lang="ts">
+import { listDeviceCategory, getDeviceCategory, delDeviceCategory, addDeviceCategory, updateDeviceCategory } from '@/api/system/equipment/Category';
+import { DeviceCategoryVO, DeviceCategoryQuery, DeviceCategoryForm } from '@/api/system/equipment/Category/type';
 
-<style scoped lang="scss"></style>
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const deviceCategoryList = ref<DeviceCategoryVO[]>([]);
+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 deviceCategoryFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceCategoryForm = {
+  id: undefined,
+  categoryName: undefined,
+  status: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<DeviceCategoryForm, DeviceCategoryQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    categoryName: undefined,
+    status: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    categoryName: [{ required: true, message: '设备分类名称不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备分类列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceCategory(queryParams.value);
+  deviceCategoryList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  deviceCategoryFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceCategoryVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加设备分类';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DeviceCategoryVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getDeviceCategory(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改设备分类';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceCategoryFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceCategory(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addDeviceCategory(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceCategoryVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备分类编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delDeviceCategory(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/deviceCategory/export',
+    {
+      ...queryParams.value
+    },
+    `deviceCategory_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/system/equipment/Repair/index.vue b/src/views/system/equipment/Repair/index.vue
index ae6056c..4fb47cd 100644
--- a/src/views/system/equipment/Repair/index.vue
+++ b/src/views/system/equipment/Repair/index.vue
@@ -1,12 +1,279 @@
 <template>
-  <div class="p-2 h-full flex flex-col">
-    <Pageheader></Pageheader>
-    <div class="flex-1 color-gray flex h-full font-size-6 flex-center">系统还在维护中，敬请期待...</div>
+  <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" label-width="100" :model="queryParams" :inline="true">
+            <el-form-item label="设备名称" prop="deviceName">
+              <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备编号" prop="deviceCode">
+              <el-input v-model="queryParams.deviceCode" 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>
+            </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="['system:deviceRepair:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:deviceRepair:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:deviceRepair:remove']"
+              >删除</el-button
+            >
+          </el-col>
+
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="deviceRepairList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键ID" align="center" prop="id" v-if="true" />
+        <el-table-column label="维修设备ID" align="center" prop="deviceId" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备编号" align="center" prop="deviceCode" />
+        <el-table-column label="设备型号" align="center" prop="deviceModel" />
+        <el-table-column label="位置区域" align="center" prop="area" />
+        <el-table-column label="维护人员ID，多个用,分隔" align="center" prop="maintainUserIds" />
+        <el-table-column label="故障描述" align="center" prop="faultDesc" />
+        <el-table-column label="维修结果 0已修复 1未修复" align="center" prop="repairResult" />
+        <el-table-column label="维修时间" align="center" prop="repairTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.repairTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" fixed="right" 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="['system:deviceRepair:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:deviceRepair: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>
+    <!-- 添加或修改维修工单对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="deviceRepairFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="维修设备ID" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入维修设备ID" />
+        </el-form-item>
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="设备编号" prop="deviceCode">
+          <el-input v-model="form.deviceCode" placeholder="请输入设备编号" />
+        </el-form-item>
+        <el-form-item label="设备型号" prop="deviceModel">
+          <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
+        </el-form-item>
+        <el-form-item label="位置区域" prop="area">
+          <el-input v-model="form.area" placeholder="请输入位置区域" />
+        </el-form-item>
+        <el-form-item label="维护人员ID，多个用,分隔" prop="maintainUserIds">
+          <el-input v-model="form.maintainUserIds" placeholder="请输入维护人员ID，多个用,分隔" />
+        </el-form-item>
+        <el-form-item label="故障描述" prop="faultDesc">
+          <el-input v-model="form.faultDesc" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="维修结果 0已修复 1未修复" prop="repairResult">
+          <el-input v-model="form.repairResult" placeholder="请输入维修结果 0已修复 1未修复" />
+        </el-form-item>
+        <el-form-item label="维修时间" prop="repairTime">
+          <el-date-picker clearable v-model="form.repairTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择维修时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" 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 lang="ts">
-import { ref } from 'vue';
-</script>
+<script setup name="DeviceRepair" lang="ts">
+import { listDeviceRepair, getDeviceRepair, delDeviceRepair, addDeviceRepair, updateDeviceRepair } from '@/api/system/equipment/Repair';
+import { DeviceRepairVO, DeviceRepairQuery, DeviceRepairForm } from '@/api/system/equipment/Repair/type';
 
-<style scoped lang="scss"></style>
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const deviceRepairList = ref<DeviceRepairVO[]>([]);
+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 deviceRepairFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceRepairForm = {
+  id: undefined,
+  deviceId: undefined,
+  deviceName: undefined,
+  deviceCode: undefined,
+  deviceModel: undefined,
+  area: undefined,
+  maintainUserIds: undefined,
+  faultDesc: undefined,
+  repairResult: undefined,
+  repairTime: undefined,
+  remark: undefined
+};
+const data = reactive<PageData<DeviceRepairForm, DeviceRepairQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceId: undefined,
+    deviceName: undefined,
+    deviceCode: undefined,
+    deviceModel: undefined,
+    area: undefined,
+    maintainUserIds: undefined,
+    faultDesc: undefined,
+    repairResult: undefined,
+    repairTime: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
+    deviceId: [{ required: true, message: '维修设备ID不能为空', trigger: 'blur' }],
+    deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
+    maintainUserIds: [{ required: true, message: '维护人员ID，多个用,分隔不能为空', trigger: 'blur' }],
+    faultDesc: [{ required: true, message: '故障描述不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询维修工单列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceRepair(queryParams.value);
+  deviceRepairList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  deviceRepairFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceRepairVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加维修工单';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DeviceRepairVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getDeviceRepair(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改维修工单';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceRepairFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceRepair(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addDeviceRepair(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceRepairVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除维修工单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delDeviceRepair(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/deviceRepair/export',
+    {
+      ...queryParams.value
+    },
+    `deviceRepair_${new Date().getTime()}.xlsx`
+  );
+};
+
+onMounted(() => {
+  getList();
+});
+</script>