diff --git a/src/views/device/config/DeviceConfigList.vue b/src/views/device/config/DeviceConfigList.vue
new file mode 100644
index 0000000..e9dfa0e
--- /dev/null
+++ b/src/views/device/config/DeviceConfigList.vue
@@ -0,0 +1,122 @@
+<template>
+  <div>
+    <!--引用表格-->
+    <BasicTable @register="registerTable">
+      <!--插槽:table标题-->
+      <template #tableTitle>
+        <a-button type="primary" preIcon="ant-design:plus-outlined" @click="handleAdd"> 添加</a-button>
+      </template>
+      <template #bodyCell="{ column, record, index, text }">
+      </template>
+      <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)"/>
+      </template>
+    </BasicTable>
+    <DeviceConfigModal ref="registerDrawer" @success="handleSuccess" />
+  </div>
+</template>
+
+<script lang="ts" name="iot-nuIotElectricitynInfo" setup>
+  import {reactive, ref,h} from 'vue';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useListPage } from '/@/hooks/system/useListPage';
+  import { useUserStore } from '/@/store/modules/user';
+  import {Modal} from "ant-design-vue";
+  import {list, save} from './config.api';
+  import { columns, searchFormSchema } from './config.data';
+  import {useModal} from "@/components/Modal";
+  import DeviceConfigModal from "./components/DeviceConfigModal.vue";
+  import { defHttp } from '/@/utils/http/axios';
+
+  const queryParam = reactive<any>({});
+  const registerDrawer = ref();
+  const tipVisible = ref(false);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+    tableProps:{
+      title: '物联设备配置',
+      api: list,
+      columns,
+      canResize:false,
+      showIndexColumn: true,
+      formConfig: {
+        //labelWidth: 120,
+        schemas: searchFormSchema,
+        autoSubmitOnEnter:true,
+        showAdvancedButton:false,
+        fieldMapToNumber: [
+        ],
+        fieldMapToTime: [
+        ],
+      },
+      pagination: {
+        current: 1,
+        pageSize: 15,
+        pageSizeOptions: ['15', '50', '70', '100'],
+      },
+      actionColumn: {
+        width: 290,
+        fixed:'right'
+      },
+      beforeFetch: (params) => {
+        return Object.assign(params, queryParam);
+      },
+    },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+  /**
+   * 编辑
+   */
+  function handleAdd() {
+    registerDrawer.value.disableSubmit = false;
+    registerDrawer.value.add();
+  }
+
+  /**
+   * 编辑事件
+   */
+  function handleEdit(record: Recordable) {
+    registerDrawer.value.disableSubmit = false;
+    registerDrawer.value.edit(record);
+  }
+
+  /**
+   * 详情
+   */
+  function handleDetail(record: Recordable) {
+    registerDrawer.value.disableSubmit = true;
+    registerDrawer.value.edit(record);
+  }
+
+  function handleCancel() {
+    tipVisible.value = false;
+  }
+  /**
+   * 成功回调
+   */
+  function handleSuccess() {
+    (selectedRowKeys.value = []) && reload();
+  }
+
+  /**
+   * 操作栏
+   */
+  function getTableAction(record){
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      },
+      {
+        label: '编辑',
+        onClick: handleEdit.bind(null, record),
+      }
+    ]
+  }
+
+</script>
diff --git a/src/views/device/config/components/DeviceConfigForm.vue b/src/views/device/config/components/DeviceConfigForm.vue
new file mode 100644
index 0000000..45b0d68
--- /dev/null
+++ b/src/views/device/config/components/DeviceConfigForm.vue
@@ -0,0 +1,179 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <JFormContainer :disabled="disabled">
+      <template #detail>
+        <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-row >
+            <a-col :span="24">
+              <a-form-item label="设备类型" v-bind="validateInfos.deviceType" id="DeviceConfigForm-deviceType" name="deviceType">
+                <j-dict-select-tag v-model:value="formData.deviceType" :showLabel="false" dictCode="tplink_device_type" placeholder="请选择设备类型"/>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row >
+            <a-col :span="24">
+              <a-form-item label="规格型号" v-bind="validateInfos.deviceModel" id="DeviceConfigForm-deviceModel" name="deviceModel">
+                <a-input v-model:value="formData.deviceModel"></a-input>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row >
+            <a-col :span="24">
+              <a-form-item label="生产厂家" v-bind="validateInfos.factory" id="DeviceConfigForm-factory" name="factory">
+                <a-input v-model:value="formData.factory"></a-input>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <a-row >
+            <a-col :span="24">
+              <a-form-item label="设备维度" v-bind="validateInfos.dimension" id="DeviceConfigForm-dimension" name="dimension">
+                <a-select v-model:value="formData.dimension" placeholder="请选择设备维度" allow-clear>
+                  <a-select-option value="机构维度">机构维度</a-select-option>
+                  <a-select-option value="区域维度">区域维度</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </template>
+    </JFormContainer>
+  </a-spin>
+</template>
+
+<script lang="ts" setup>
+import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
+import { defHttp } from '/@/utils/http/axios';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { getValueType } from '/@/utils';
+import { save } from '../config.api';
+import { Form } from 'ant-design-vue';
+import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
+import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
+
+const props = defineProps({
+  formDisabled: { type: Boolean, default: false },
+  formData: { type: Object, default: ()=>{} },
+  formBpm: { type: Boolean, default: true }
+});
+const formRef = ref();
+const useForm = Form.useForm;
+const emit = defineEmits(['register', 'ok']);
+const formData = reactive<Record<string, any>>({
+  id: '',
+  deviceType: '',
+  deviceModel: '',
+  factory: '',
+  dimension: ''
+});
+const { createMessage } = useMessage();
+const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
+const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
+const confirmLoading = ref<boolean>(false);
+
+//表单验证
+const validatorRules = reactive({
+  deviceType: [{ required: true, message: '请选择设备类型' }],
+  deviceModel: [{ required: true, message: '请输入规格型号' }],
+  factory: [{ required: true, message: '请输入生产厂家' }],
+  dimension: [{ required: true, message: '请选择设备维度' }],
+});
+const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
+
+// 表单禁用
+const disabled = computed(()=>{
+  if(props.formBpm === true){
+    if(props.formData.disabled === false){
+      return false;
+    }else{
+      return true;
+    }
+  }
+  return props.formDisabled;
+});
+
+
+/**
+ * 新增
+ */
+function add() {
+  edit({});
+}
+
+/**
+ * 编辑
+ */
+function edit(record) {
+  nextTick(() => {
+    resetFields();
+    //赋值
+    const tmpData = {};
+    Object.keys(formData).forEach((key) => {
+      if(record.hasOwnProperty(key)){
+        tmpData[key] = record[key]
+      }
+    })
+    //赋值
+    Object.assign(formData, tmpData);
+  });
+}
+
+/**
+ * 提交数据
+ */
+async function submitForm() {
+  try {
+    // 触发表单验证
+    await validate();
+  } catch ({ errorFields }) {
+    if (errorFields) {
+      const firstField = errorFields[0];
+      if (firstField) {
+        formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
+      }
+    }
+    return Promise.reject(errorFields);
+  }
+  confirmLoading.value = true;
+  const isUpdate = ref<boolean>(false);
+  //时间格式化
+  let model = formData;
+  if (model.id) {
+    isUpdate.value = true;
+  }
+  //循环数据
+  for (let data in model) {
+    //如果该数据是数组并且是字符串类型
+    if (model[data] instanceof Array) {
+      let valueType = getValueType(formRef.value.getProps, data);
+      //如果是字符串类型的需要变成以逗号分割的字符串
+      if (valueType === 'string') {
+        model[data] = model[data].join(',');
+      }
+    }
+  }
+  await save(model)
+    .then((res) => {
+        emit('ok');
+    }).catch(() =>{})
+    .finally(() => {
+      confirmLoading.value = false;
+    });
+}
+
+defineExpose({
+  add,
+  edit,
+  submitForm,
+});
+</script>
+
+<style lang="less" scoped>
+.tbClass {
+  background: #fff;
+  padding: 80px;
+  border-radius: 5px;
+  display: flex;
+  justify-content: space-evenly;
+  border: 1px solid #d9d9d9;
+}
+</style>
diff --git a/src/views/device/config/components/DeviceConfigModal.vue b/src/views/device/config/components/DeviceConfigModal.vue
new file mode 100644
index 0000000..1cbb687
--- /dev/null
+++ b/src/views/device/config/components/DeviceConfigModal.vue
@@ -0,0 +1,84 @@
+<template>
+  <a-drawer :title="title" :width="width" :visible="visible" :closable="true" :footer-style="{ textAlign: 'right' }"
+   :bodyStyle="{ padding: '14px' }" @close="handleCancel">
+    <template #footer>
+      <a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
+      <a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
+    </template>
+    <DeviceConfigForm v-if="visible" ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit"
+      :formBpm="false">
+    </DeviceConfigForm>
+  </a-drawer>
+</template>
+
+<script lang="ts" setup>
+import { ref, nextTick, defineExpose } from 'vue';
+import DeviceConfigForm from './DeviceConfigForm.vue'
+import JModal from '/@/components/Modal/src/JModal/JModal.vue';
+
+const title = ref<string>('');
+const width = ref<number>(800);
+const visible = ref<boolean>(false);
+const disableSubmit = ref<boolean>(false);
+const registerForm = ref();
+const emit = defineEmits(['register', 'success']);
+/**
+ * 新增
+ */
+function add() {
+  title.value = '新增';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.add();
+  });
+}
+
+/**
+ * 编辑
+ * @param record
+ */
+function edit(record) {
+  title.value = disableSubmit.value ? '详情' : '编辑';
+  visible.value = true;
+  nextTick(() => {
+    registerForm.value.edit(record);
+  });
+}
+
+
+/**
+ * 确定按钮点击事件
+ */
+function handleOk() {
+  registerForm.value.submitForm();
+}
+
+/**
+ * form保存回调事件
+ */
+function submitCallback() {
+  handleCancel();
+  emit('success');
+}
+
+/**
+ * 取消按钮回调事件
+ */
+function handleCancel() {
+  visible.value = false;
+}
+
+defineExpose({
+  add,
+  edit,
+  disableSubmit,
+});
+</script>
+
+<style lang="less">
+/**隐藏样式-modal确定按钮 */
+.jee-hidden {
+  display: none !important;
+}
+</style>
+<style lang="less" scoped></style>
diff --git a/src/views/device/config/config.api.ts b/src/views/device/config/config.api.ts
new file mode 100644
index 0000000..ef0f1ec
--- /dev/null
+++ b/src/views/device/config/config.api.ts
@@ -0,0 +1,20 @@
+import { defHttp } from '/@/utils/http/axios';
+
+enum Api {
+  list = '/iot/device/config/list',
+  save = '/iot/device/config/add',
+  delete = '/iot/device/config/delete'
+}
+
+/**
+ * 电表列表接口
+ * @param params
+ */
+export const list = (params) => defHttp.get({ url: Api.list, params });
+
+/**
+ * 添加
+ * @param params
+ */
+export const save = (params) => defHttp.post({ url: Api.save, params }, { joinParamsToUrl: true });
+
diff --git a/src/views/device/config/config.data.ts b/src/views/device/config/config.data.ts
new file mode 100644
index 0000000..3b0c177
--- /dev/null
+++ b/src/views/device/config/config.data.ts
@@ -0,0 +1,28 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+
+//列表数据
+export const columns: BasicColumn[] = [
+  {
+    title: '设备类型',
+    align: "center",
+    dataIndex: 'deviceType_dictText'
+  },
+  {
+    title: '规格型号',
+    align: "center",
+    dataIndex: 'deviceModel'
+  },
+  {
+    title: '生产厂家',
+    align: "center",
+    dataIndex: 'factory'
+  },
+  {
+    title: '设备维度',
+    align: "center",
+    dataIndex: 'dimension'
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [];