diff --git a/src/api/user-boot/dept.ts b/src/api/user-boot/dept.ts
new file mode 100644
index 00000000..52fb4743
--- /dev/null
+++ b/src/api/user-boot/dept.ts
@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+export function getAreaTree(data: any) {
+    return request({
+        url: '/user-boot/dept/getAreaTree',
+        method: 'post',
+        params: data
+    })
+}
+
+export function getPidAreaByAreaId(data: any) {
+    return request({
+        url: '/user-boot/dept/getPidAreaByAreaId',
+        method: 'post',
+        params: data
+    })
+}
diff --git a/src/components/table/fieldRender/index.vue b/src/components/table/fieldRender/index.vue
index d705be1b..5d60c120 100644
--- a/src/components/table/fieldRender/index.vue
+++ b/src/components/table/fieldRender/index.vue
@@ -1,4 +1,8 @@
 <template>
+    <!-- text -->
+    <div v-if="field.render == 'renderFormatter'">
+        {{ fieldValue }}
+    </div>
     <!-- Icon -->
     <Icon class="ba-icon-dark" v-if="field.render == 'icon'" :name="fieldValue ? fieldValue : field.default ?? ''" />
 
diff --git a/src/template/dialog.vue b/src/template/dialog.vue
index 5bb8a643..35827f26 100644
--- a/src/template/dialog.vue
+++ b/src/template/dialog.vue
@@ -1,39 +1,38 @@
 <template>
-    <el-dialog class='cn-operate-dialog' v-model='dialogVisible' :title='title'>
+    <el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
         <el-scrollbar>
-            <el-form :inline='false' :model='form' label-width='120px' :rules='rules' ref='formRef'>
-                <el-form-item label='角色名称'>
-                    <el-input v-model='form.name' placeholder='请输入菜单名称' />
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <el-form-item label="角色名称">
+                    <el-input v-model="form.name" placeholder="请输入菜单名称" />
                 </el-form-item>
-                <el-form-item label='角色编码'>
-                    <el-input v-model='form.code' placeholder='请输入菜单名称' />
+                <el-form-item label="角色编码">
+                    <el-input v-model="form.code" placeholder="请输入菜单名称" />
                 </el-form-item>
-                <el-form-item label='角色描述'>
-                    <el-input v-model='form.remark' :rows='2' type='textarea' placeholder='请输入描述' />
+                <el-form-item label="角色描述">
+                    <el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入描述" />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
         <template #footer>
-            <span class='dialog-footer'>
-                <el-button @click='dialogVisible = false'>取消</el-button>
-                <el-button type='primary' @click='submit'>确认</el-button>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
             </span>
         </template>
     </el-dialog>
 </template>
-<script lang='ts' setup>
+<script lang="ts" setup>
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import { ElMessage } from 'element-plus'
 import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
 
-
 const dialogVisible = ref(false)
 const title = ref('')
 const tableStore = inject('tableStore') as TableStore
 const formRef = ref()
 // 注意不要和表单ref的命名冲突
-const form = reactive({
+const form = reactive<anyObj>({
     code: '',
     name: '',
     remark: '',
@@ -60,7 +59,7 @@ const open = (text: string, data?: anyObj) => {
     }
 }
 const submit = () => {
-    formRef.value.validate(async (valid) => {
+    formRef.value.validate(async (valid: boolean) => {
         if (valid) {
             if (form.id) {
                 // await update(form)
diff --git a/src/views/auth/department/index.vue b/src/views/auth/department/index.vue
new file mode 100644
index 00000000..191ac510
--- /dev/null
+++ b/src/views/auth/department/index.vue
@@ -0,0 +1,174 @@
+<template>
+    <div class="default-main">
+        <div class="custom-table-header">
+            <div class="title">部门列表</div>
+            <el-input
+                v-model="tableStore.table.params.searchValue"
+                style="width: 240px"
+                placeholder="请输入部门名称"
+                class="ml10"
+                clearable
+                @input="search"
+            />
+        </div>
+        <Table />
+        <PopupForm ref="popupFormRef" @init="tableStore.index()"></PopupForm>
+        <PopupPoint ref="popupPointRef"></PopupPoint>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, nextTick, inject, provide, watch, onMounted } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import PopupForm from './popupForm.vue'
+import PopupPoint from './popupPoint.vue'
+
+defineOptions({
+    name: 'auth/department'
+})
+
+const popupFormRef = ref()
+const popupPointRef = ref()
+let originData: any[]
+const tableStore = new TableStore({
+    publicHeight: 60,
+    showPage: false,
+    url: '/user-boot/dept/deptTree',
+    method: 'POST',
+    column: [
+        {
+            title: '名称',
+            field: 'name',
+            align: 'left',
+            treeNode: true
+        },
+        { title: '区域', field: 'areaName', align: 'center' },
+        {
+            title: '类型',
+            field: 'type',
+            align: 'center',
+            render: 'renderFormatter',
+            renderFormatter: data => {
+                const typeArr = ['非自定义', 'web自定义', 'App自定义', 'Web测试']
+                return typeArr[data.type] || '/'
+            }
+        },
+        {
+            title: '描述',
+            field: 'remark',
+            align: 'center',
+            render: 'renderFormatter',
+            renderFormatter: data => {
+                return data.remark || '/'
+            }
+        },
+        {
+            title: '状态',
+            field: 'state',
+            align: 'center',
+            render: 'renderFormatter',
+            renderFormatter: data => {
+                return data.state === 1 ? '正常' : '删除'
+            }
+        },
+        {
+            title: '操作',
+            align: 'center',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    text: '新增',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        popupFormRef.value.open('新增部门', {
+                            pid: row.id,
+                            pArea: row.area
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    text: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        popupFormRef.value.open('编辑部门', {
+                            ...row,
+                        })
+                    }
+                },
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除该菜单吗？'
+                    },
+                    click: row => {}
+                },
+                {
+                    name: 'edit',
+                    text: '绑定监测点',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    disabled: (row: any) => {
+                        return row.children.length > 0
+                    },
+                    click: row => {
+                        popupPointRef.value.open('绑定监测点', row)
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => {
+        originData = JSON.parse(JSON.stringify(tableStore.table.data))
+        tableStore.table.data.forEach((item: any) => {
+            item.stateName = item.state === 1 ? '正常' : '删除'
+            item.remark = item.remark || '/'
+        })
+        nextTick(() => {
+            tableStore.table.ref?.setAllTreeExpand(true)
+        })
+    }
+})
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+const addMenu = () => {}
+const search = () => {
+    tableStore.table.data = filterData(JSON.parse(JSON.stringify(originData)))
+    nextTick(() => {
+        tableStore.table.ref?.setAllTreeExpand(true)
+    })
+}
+
+// 过滤
+const filterData = (arr: treeData[]): treeData[] => {
+    if (!tableStore.table.params.searchValue) {
+        return arr
+    }
+    return arr.filter((item: treeData) => {
+        if (item.name!.includes(tableStore.table.params.searchValue)) {
+            return true
+        } else if (item.children?.length > 0) {
+            item.children = filterData(item.children)
+            return item.children.length > 0
+        } else {
+            return false
+        }
+    })
+}
+</script>
diff --git a/src/views/auth/department/popupForm.vue b/src/views/auth/department/popupForm.vue
new file mode 100644
index 00000000..972dfe72
--- /dev/null
+++ b/src/views/auth/department/popupForm.vue
@@ -0,0 +1,147 @@
+<template>
+    <el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <el-form-item label="部门编号:" prop="code">
+                    <el-input v-model="form.code" placeholder="请输入部门编号"></el-input>
+                </el-form-item>
+                <el-form-item class="top" label="部门名称:" prop="name">
+                    <el-input v-model="form.name" placeholder="请输入部门名称"></el-input>
+                </el-form-item>
+                <el-form-item class="top" label="部门类型:" prop="type">
+                    <el-select v-model="form.type" placeholder="选择部门类型" style="width: 100%">
+                        <el-option
+                            v-for="item in customDeptOption"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="top" label="子类型:" prop="specialType">
+                    <el-select v-model="form.specialType" placeholder="选择子类型" style="width: 100%">
+                        <el-option
+                            v-for="item in ziDeptOption"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="top" label="部门区域:" prop="deptName">
+                    <el-select v-model="form.area" placeholder="选择子类型" style="width: 100%">
+                        <el-option
+                            v-for="item in areaOption"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item class="top" label="部门排序:" prop="sort">
+                    <el-input v-model="form.sort" placeholder="请输入部门排序"></el-input>
+                </el-form-item>
+                <el-form-item class="top" label="部门描述:">
+                    <el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入部门描述"></el-input>
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
+import { getAreaTree, getPidAreaByAreaId } from '@/api/user-boot/dept'
+
+const dialogVisible = ref(false)
+const title = ref('')
+const tableStore = inject('tableStore') as TableStore
+const formRef = ref()
+// 注意不要和表单ref的命名冲突
+const form = reactive<anyObj>({
+    area: '',
+    name: '',
+    pid: -1,
+    remark: '',
+    sort: 100,
+    type: 0,
+    code: '',
+    specialType: 0
+})
+const originForm = { ...form }
+const rules = {
+    parentName: [{ required: true, message: '请选择父节点', trigger: 'blur' }],
+    code: [{ required: true, message: '请输入部门编号', trigger: 'blur' }],
+    name: [{ required: true, message: '请输选择部门名称', trigger: 'blur' }],
+    type: [{ required: true, message: '请输选择部门类型', trigger: 'blur' }],
+    specialType: [{ required: true, message: '请输选择部门子类型', trigger: 'blur' }],
+    sort: [{ required: true, message: '请输入部门排序', trigger: 'blur' }],
+    deptName: [{ required: true, message: '请选择部门区域', trigger: 'blur' }]
+}
+const customDeptOption = [
+    { value: 0, label: '非自定义' },
+    { value: 1, label: 'web自定义' },
+    { value: 2, label: 'App自定义' },
+    { value: 3, label: 'web测试' }
+]
+const ziDeptOption = [
+    { label: '非本部', value: 0 },
+    { label: '本部', value: 1 }
+]
+const areaOption = ref<any>([])
+const open = (text: string, data: anyObj) => {
+    console.log(data)
+    title.value = text
+    dialogVisible.value = true
+    if (data.id) {
+        // 表单赋值
+        for (let key in form) {
+            form[key] = data[key]
+        }
+        getPidAreaByAreaId({
+            id: data.area,
+            type: 0
+        }).then((res: any) => {
+            areaOption.value = res.data
+        })
+    } else {
+        // 在此处恢复默认表单
+        for (let key in form) {
+            form[key] = originForm[key]
+            if (data[key]) {
+                form[key] = data[key]
+            }
+        }
+        getAreaTree({
+            id: data.pArea,
+            type: 0
+        }).then((res: any) => {
+            areaOption.value = res.data
+        })
+    }
+}
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            if (form.id) {
+                // await update(form)
+            } else {
+                // await create(form)
+            }
+            ElMessage.success('保存成功')
+            tableStore.index()
+            dialogVisible.value = false
+        }
+    })
+}
+
+defineExpose({ open })
+</script>
diff --git a/src/views/auth/department/popupPoint.vue b/src/views/auth/department/popupPoint.vue
new file mode 100644
index 00000000..fab5896d
--- /dev/null
+++ b/src/views/auth/department/popupPoint.vue
@@ -0,0 +1,77 @@
+<template>
+    <el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
+        <el-scrollbar>
+            <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
+                <el-form-item label="角色名称">
+                    <el-input v-model="form.name" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="角色编码">
+                    <el-input v-model="form.code" placeholder="请输入菜单名称" />
+                </el-form-item>
+                <el-form-item label="角色描述">
+                    <el-input v-model="form.remark" :rows="2" type="textarea" placeholder="请输入描述" />
+                </el-form-item>
+            </el-form>
+        </el-scrollbar>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
+
+const dialogVisible = ref(false)
+const title = ref('')
+const tableStore = inject('tableStore') as TableStore
+const formRef = ref()
+// 注意不要和表单ref的命名冲突
+const form = reactive({
+    code: '',
+    name: '',
+    remark: '',
+    id: ''
+})
+const rules = {
+    name: [{ required: true, message: '角色名称不能为空', trigger: 'blur' }],
+    code: [{ required: true, message: '角色编码不能为空', trigger: 'blur' }]
+}
+
+const open = (text: string, data?: anyObj) => {
+    title.value = text
+    dialogVisible.value = true
+    if (data) {
+        // 表单赋值
+        for (let key in form) {
+            form[key as keyof typeof form] = data[key]
+        }
+    } else {
+        // 在此处恢复默认表单
+        for (let key in form) {
+            form[key as keyof typeof form] = ''
+        }
+    }
+}
+const submit = () => {
+    formRef.value.validate(async (valid: boolean) => {
+        if (valid) {
+            if (form.id) {
+                // await update(form)
+            } else {
+                // await create(form)
+            }
+            ElMessage.success('保存成功')
+            tableStore.index()
+            dialogVisible.value = false
+        }
+    })
+}
+
+defineExpose({ open })
+</script>
diff --git a/types/table.d.ts b/types/table.d.ts
index f86be46a..8b0e2128 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -47,6 +47,7 @@ declare global {
             | 'buttons'
             | 'slot'
             | 'customTemplate'
+            | 'renderFormatter'
             | 'customRender'
         // 默认值
         default?: any