diff --git a/src/router/static.ts b/src/router/static.ts
index 53848094..21243120 100644
--- a/src/router/static.ts
+++ b/src/router/static.ts
@@ -120,12 +120,19 @@ export const adminBaseRoute = {
                     }
                 },
                 {
-                    path: 'programReview',
+                    path: 'ProgramReviewInter',
                     component: () => import('@/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue'),
-                    name: 'programReview',
+                    name: 'ProgramReview',
                     meta: {
                         title: pageTitle('router.programReview')
                     }
+                },{
+                    path: 'projectTreatInter',
+                    component: () => import('@/views/pqs/supervise/interfere/components/normalizationManager/projectTreat.vue'),
+                    name: 'projectTreat',
+                    meta: {
+                        title: pageTitle('router.projectTreat')
+                    }
                 },
                 // {
                 //     path: 'manager/model/edit',
@@ -153,7 +160,32 @@ export const adminBaseRoute = {
                 // },
 
             ]
-        },
+        },    /*{
+            path: '/bpm',
+            name: 'bpm',
+            meta: {
+                hidden: true
+            },
+            children: [
+                {
+                    path: 'programReview',
+                    component: () => import('@/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue'),
+                    name: 'programReview',
+                    meta: {
+                        title: pageTitle('router.programReview')
+                    }
+                },{
+                    path: 'projectTreat',
+                    component: () => import('@/views/pqs/supervise/interfere/components/normalizationManager/projectTreat.vue'),
+                    name: 'projectTreat',
+                    meta: {
+                        title: pageTitle('router.projectTreat')
+                    }
+                },
+
+
+            ]
+        },*/
 
     ]
 }
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index a7c00079..da5b8ee6 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -1,35 +1,36 @@
 <template>
     <div>
-            <TableHeader  ref="TableHeaderRef">
-                <template #select>
-                <el-form-item label="工程名称">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable></el-input>
+        <TableHeader ref='TableHeaderRef'>
+            <template #select>
+                <el-form-item label='工程名称'>
+                    <el-input v-model='tableStore.table.params.searchValue' clearable></el-input>
                 </el-form-item>
-                <el-form-item label="所属地市">
-                    <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择所属地市">
+                <el-form-item label='所属地市'>
+                    <el-select v-model='tableStore.table.params.loadType' clearable placeholder='请选择所属地市'>
                         <el-option
-                            v-for="item in areaOptionList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id"
+                            v-for='item in areaOptionList'
+                            :key='item.id'
+                            :label='item.name'
+                            :value='item.id'
                         ></el-option>
                     </el-select>
                 </el-form-item>
             </template>
-                <template #operation>
-                    <el-button icon="el-icon-Download" type="primary">导出</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-        </div>
+            <template #operation>
+                <el-button icon='el-icon-Download' type='primary'>导出</el-button>
+            </template>
+        </TableHeader>
+        <Table ref='tableRef' />
+    </div>
 
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
 import { ref, onMounted, provide, nextTick } from 'vue'
 import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { useDictData } from '@/stores/dictData'
+
 const dictData = useDictData()
 const areaOptionList = dictData.getBasicData('jibei_area')
 
@@ -87,7 +88,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        toFangAn(row.id,"3")
+                        toFangAn(row.id,1)
                     }
                 },
                 {
@@ -97,7 +98,8 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        toZhiLi(row.id)
+                        toFangAn(row.id,2)
+
                     }
                 }
             ]
@@ -120,25 +122,26 @@ onMounted(() => {
 })
 
 /** 方案审查 */
-const toFangAn = (id: any,activeName:String) => {
-    push({
-        name: 'programReview',
-        query: {
-            id: id,
-            activeName:"3"
-        }
-    })
+const toFangAn = (id: any,type:Number) => {
+    if(type == 1){
+        push({
+            name: 'ProgramReview',
+            query: {
+                id: id
+            }
+        })
+    }else{
+        push({
+            name: 'projectTreat',
+            query: {
+                id: id
+            }
+        })
+    }
+
 }
 
-/** 治理工程 */
-const toZhiLi = (instanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        query: {
-            id: instanceId
-        }
-    })
-}
+
 
 /**获取用户性质*/
 const getUserTypeName = (userType: any) => {
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue
index 80a79fe4..580324bd 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue
@@ -1,21 +1,152 @@
 <template>
-    <div class='default-main'>
-    <back-component style='margin: 8px;position: absolute;z-index: 10;top: -3px;right: 2px' />
-    </div>
-</template>
+    <div>
+        <TableHeader ref='TableHeaderRef'>
+            <template #select>
+                <el-form-item label='工程名称'>
+                    <el-input v-model='tableStore.table.params.searchValue' clearable></el-input>
+                </el-form-item>
+                <el-form-item label='所属地市'>
+                    <el-select v-model='tableStore.table.params.loadType' clearable placeholder='请选择所属地市'>
+                        <el-option
+                            v-for='item in areaOptionList'
+                            :key='item.id'
+                            :label='item.name'
+                            :value='item.id'
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon='el-icon-Download' type='primary'>导出</el-button>
 
-<script lang='ts' setup>
+                <el-button style='margin-left: 50px' :icon='Back'  @click='go(-1)'>返回</el-button>
+            </template>
+        </TableHeader>
+        <Table ref='tableRef' />
+    </div>
+
+</template>
+<script setup lang='ts'>
+defineOptions({
+    name: 'ProgramReview'
+})
 import BackComponent from '@/components/icon/back/index.vue'
 
-defineOptions({ name: 'programReview' })
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
 
-import { onMounted, provide, ref, getCurrentInstance, reactive, watch, unref, nextTick } from 'vue'
+import { useRouter } from 'vue-router'
+import { Back } from '@element-plus/icons-vue'
+const { go } = useRouter()
 
-const { query } = useRoute() // 查询参数
+const dictData = useDictData()
+const areaOptionList = dictData.getBasicData('jibei_area')
 
+const { push } = useRouter()
+const TableHeaderRef = ref()
+const tableStore = new TableStore({
+    url: '/supervision-boot/userReport/getInterferenceUserPage',
+
+    method: 'POST',
+    column: [
+        { title: '序号', type: 'seq', width: 80 },
+        { field: 'projectName', title: '工程名称', minWidth: 170 },
+        {
+            field: 'userType',
+            title: '用户性质',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                const userType = obj.row.userType
+                return getUserTypeName(userType)
+            }
+        },
+        { field: 'city', title: '所属地市', minWidth: 80 },
+        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+        {
+            field: 'userStatus',
+            title: '用户状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'primary',
+                1: 'primary',
+                2: 'success',
+                3: 'warning'
+            },
+            replaceValue: {
+                0: '可研',
+                1: '建设',
+                2: '运行',
+                3: '退运'
+            }
+        },
+        { field: 'substation', title: '变电站', minWidth: 100 },
+
+
+        {
+            title: '操作',
+            minWidth: 180,
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.city = tableStore.table.params.deptIndex
+    }
+})
+
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.relationUserName = ''
+tableStore.table.params.aisFileUpload = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+
+/** 方案审查 */
+const toFangAn = (id: any) => {
+    push({
+        name: 'ProgramReview',
+        query: {
+            id: id
+        }
+    })
+}
+
+
+
+/**获取用户性质*/
+const getUserTypeName = (userType: any) => {
+    if (userType === 0) {
+        return '新建电网工程'
+    }
+    if (userType === 1) {
+        return '扩建电网工程'
+    }
+    if (userType === 2) {
+        return '新建非线性负荷用户'
+    }
+    if (userType === 3) {
+        return '扩建非线性负荷用户'
+    }
+    if (userType === 4) {
+        return '新建新能源发电站'
+    }
+    if (userType === 5) {
+        return '扩建新能源发电站'
+    }
+    if (userType === 6) {
+        return '敏感及重要用户'
+    }
+    return '新建电网工程'
+}
 </script>
-
-
-<style scoped lang='scss'>
-
-</style>
\ No newline at end of file
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/projectTreat.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/projectTreat.vue
new file mode 100644
index 00000000..6298d2aa
--- /dev/null
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/projectTreat.vue
@@ -0,0 +1,143 @@
+<template>
+    <div>
+        <TableHeader ref='TableHeaderRef'>
+            <template #select>
+                <el-form-item label='工程名称'>
+                    <el-input v-model='tableStore.table.params.searchValue' clearable></el-input>
+                </el-form-item>
+                <el-form-item label='所属地市'>
+                    <el-select v-model='tableStore.table.params.loadType' clearable placeholder='请选择所属地市'>
+                        <el-option
+                            v-for='item in areaOptionList'
+                            :key='item.id'
+                            :label='item.name'
+                            :value='item.id'
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon='el-icon-Download' type='primary'>导出</el-button>
+
+                <el-button style='margin-left: 50px' :icon='Back'  @click='go(-1)'>返回</el-button>
+            </template>
+        </TableHeader>
+        <Table ref='tableRef' />
+    </div>
+
+</template>
+<script setup lang='ts'>
+defineOptions({
+    name: 'projectTreat'
+})
+
+import { ref, onMounted, provide, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useDictData } from '@/stores/dictData'
+
+import { useRouter } from 'vue-router'
+import { Back } from '@element-plus/icons-vue'
+const { go } = useRouter()
+
+const dictData = useDictData()
+const areaOptionList = dictData.getBasicData('jibei_area')
+
+const { push } = useRouter()
+const TableHeaderRef = ref()
+const tableStore = new TableStore({
+    url: '/supervision-boot/userReport/getInterferenceUserPage',
+
+    method: 'POST',
+    column: [
+        { title: '序号', type: 'seq', width: 80 },
+        { field: 'projectName', title: '工程名称', minWidth: 170 },
+        {
+            field: 'userType',
+            title: '用户性质',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                const userType = obj.row.userType
+                return getUserTypeName(userType)
+            }
+        },
+        { field: 'city', title: '所属地市', minWidth: 80 },
+        { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+        {
+            field: 'userStatus',
+            title: '用户状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'primary',
+                1: 'primary',
+                2: 'success',
+                3: 'warning'
+            },
+            replaceValue: {
+                0: '可研',
+                1: '建设',
+                2: '运行',
+                3: '退运'
+            }
+        },
+        { field: 'substation', title: '变电站', minWidth: 100 },
+
+
+        {
+            title: '操作',
+            minWidth: 180,
+            fixed: 'right',
+            render: 'buttons',
+            buttons: [
+
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.city = tableStore.table.params.deptIndex
+    }
+})
+
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.relationUserName = ''
+tableStore.table.params.aisFileUpload = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+
+
+
+
+
+/**获取用户性质*/
+const getUserTypeName = (userType: any) => {
+    if (userType === 0) {
+        return '新建电网工程'
+    }
+    if (userType === 1) {
+        return '扩建电网工程'
+    }
+    if (userType === 2) {
+        return '新建非线性负荷用户'
+    }
+    if (userType === 3) {
+        return '扩建非线性负荷用户'
+    }
+    if (userType === 4) {
+        return '新建新能源发电站'
+    }
+    if (userType === 5) {
+        return '扩建新能源发电站'
+    }
+    if (userType === 6) {
+        return '敏感及重要用户'
+    }
+    return '新建电网工程'
+}
+</script>