diff --git a/src/api/process-boot/generalTest.ts b/src/api/process-boot/generalTest.ts
index 232aa300..d89effa9 100644
--- a/src/api/process-boot/generalTest.ts
+++ b/src/api/process-boot/generalTest.ts
@@ -1,7 +1,7 @@
 import createAxios from '@/utils/request'
 
 //查询普测计划-新建页面
-export function queryPlan(data:any) {
+export function queryPlan(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/queryPlan',
         method: 'post',
@@ -9,7 +9,7 @@ export function queryPlan(data:any) {
     })
 }
 //导出普测计划信息
-export function exportSurveyPlan(data:any) {
+export function exportSurveyPlan(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/exportSurveyPlan',
         method: 'post',
@@ -18,7 +18,7 @@ export function exportSurveyPlan(data:any) {
     })
 }
 //新增
-export function getGeneratrixByCondition(data:any) {
+export function getGeneratrixByCondition(data: any) {
     return createAxios({
         url: '/device-boot/pms/generatrixWire/getGeneratrixByCondition',
         method: 'post',
@@ -26,7 +26,7 @@ export function getGeneratrixByCondition(data:any) {
     })
 }
 // 获取变电站名称
-export function getstatationStatList(data:any) {
+export function getstatationStatList(data: any) {
     return createAxios({
         url: '/device-boot/pms/statationStat/getstatationStatList',
         method: 'post',
@@ -34,7 +34,7 @@ export function getstatationStatList(data:any) {
     })
 }
 // 新增-修改普测计划
-export function addPlan(data:any) {
+export function addPlan(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/addPlan',
         method: 'post',
@@ -43,7 +43,7 @@ export function addPlan(data:any) {
 }
 
 //查询普测计划-审核页面
-export function queryPlanAudit(data:any) {
+export function queryPlanAudit(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/queryPlanAudit',
         method: 'post',
@@ -51,7 +51,7 @@ export function queryPlanAudit(data:any) {
     })
 }
 //查询普测计划-结果页面
-export function queryPlanResult(data:any) {
+export function queryPlanResult(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/queryPlanResult',
         method: 'post',
@@ -59,20 +59,21 @@ export function queryPlanResult(data:any) {
     })
 }
 //下载普测结果报告
-export function surveyResultDownload(data:any) {
+export function surveyResultDownload(data: any) {
     return createAxios({
-        url: '/process-boot/rGeneralSurveyPlan/surveyResultDownload?planNo=' + data.planNo,
-        method: 'post'
+        url: '/process-boot/rGeneralSurveyPlan/surveyResultDownload',
+        method: 'post',
+        params: data
         //   responseType: 'blob',
     })
 }
 //下载
-export function downLoadData(data:any) {
+export function downLoadData(data: any) {
     return createAxios({
         url: data
     })
 }
-export function MultipartFile(data:any) {
+export function MultipartFile(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/surveyResultUpload',
         method: 'post',
@@ -80,7 +81,7 @@ export function MultipartFile(data:any) {
         data
     })
 }
-export function initDetpStataionTree(data:any) {
+export function initDetpStataionTree(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/initDetpStataionTree',
         method: 'post',
@@ -88,23 +89,22 @@ export function initDetpStataionTree(data:any) {
     })
 }
 // 普测计划-审核
-export function checkPlanAudit(data:any) {
+export function checkPlanAudit(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/checkPlanAudit',
         method: 'post',
         data
     })
 }
-// 普测计划-审核
-export function queryPlanConfig(data:any) {
+// 占比查询
+export function queryPlanConfig() {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/queryPlanConfig',
-        method: 'post',
-        data
+        method: 'post'
     })
 }
 // 增加普测计划参数
-export function addPlanConfig(data:any) {
+export function addPlanConfig(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/addPlanConfig',
         method: 'post',
@@ -112,7 +112,7 @@ export function addPlanConfig(data:any) {
     })
 }
 // 电站勾选接口
-export function querySubStatation(data:any) {
+export function querySubStatation(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/querySubStatation',
         method: 'post',
@@ -120,7 +120,7 @@ export function querySubStatation(data:any) {
     })
 }
 // 设置普测周期
-export function addPlanCycle(data:any) {
+export function addPlanCycle(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/addPlanCycle',
         method: 'post',
@@ -128,7 +128,7 @@ export function addPlanCycle(data:any) {
     })
 }
 // 批量提交审核
-export function planStatus(data:any) {
+export function planStatus(data: any) {
     return createAxios({
         url: '/process-boot/rGeneralSurveyPlan/planStatus',
         method: 'post',
diff --git a/src/api/process-boot/interference.ts b/src/api/process-boot/interference.ts
new file mode 100644
index 00000000..1d0c935d
--- /dev/null
+++ b/src/api/process-boot/interference.ts
@@ -0,0 +1,126 @@
+import createAxios from '@/utils/request'
+//获取未建档非线性用户录入及查询数据
+export function getUndocumentednonlinearData() {
+    return createAxios({
+        url: '/Process-supervision/Undocumentednonlinear/getUndocumentednonlinear',
+        method: 'get'
+    })
+}
+//获取入网评估报告审核数据
+export function getReportreviewData() {
+    return createAxios({
+        url: '/Process-supervision/Reportreview/getReportreview',
+        method: 'get'
+    })
+}
+
+//获取干扰源用户常态化管理数据
+export function getNormalizedmanagementData() {
+    return createAxios({
+        url: '/Process-supervision/Normalizedmanagement/getNormalizedmanagement',
+        method: 'get'
+    })
+}
+//获取实测报告审核数据
+export function getMeasurementreportData() {
+    return createAxios({
+        url: '/Process-supervision/Measurementreport/getMeasurementreport',
+        method: 'get'
+    })
+}
+export function addLoadTypeUser(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/addLoadTypeUser',
+        method: 'post',
+        data
+    })
+}
+export function getLoadTypeUserList(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/getLoadTypeUserList',
+        method: 'post',
+        data
+    })
+}
+export function getPowerClientList(data: any) {
+    return createAxios({
+        url: '/device-boot/pms/powerClient/getPowerClientList',
+        method: 'post',
+        data
+    })
+}
+export function getPowerGenerationUserList(data: any) {
+    return createAxios({
+        url: '/device-boot/pms/powerGenerationUser/getPowerGenerationUserList',
+        method: 'post',
+        data
+    })
+}
+export function linkUser(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/linkUser',
+        method: 'post',
+
+        data
+    })
+}
+export function uploadLoadTypeUserI(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/uploadLoadTypeUserI',
+        method: 'post',
+        headers: { 'Content-Type': 'multipart/form-data' },
+        data
+    })
+}
+export function getLoadTypeUserById(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/getLoadTypeUserById',
+        method: 'get',
+        params: data
+    })
+}
+export function exportLoadTypeUserList(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/exportLoadTypeUserList',
+        method: 'post',
+        data,
+        responseType: 'blob'
+    })
+}
+export function exportLoadTypeRelationList(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/exportLoadTypeRelationList',
+        method: 'post',
+        data,
+        responseType: 'blob'
+    })
+}
+export function getLoadTypeRelationList(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/getLoadTypeRelationList',
+        method: 'post',
+        data
+    })
+}
+export function uploadLoadTypeUserA(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/uploadLoadTypeUserA',
+        method: 'post',
+        headers: { 'Content-Type': 'multipart/form-data' },
+        data
+    })
+}
+export function checkLoadTypeUserI(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/checkLoadTypeUserI',
+        method: 'post',
+        data
+    })
+}
+export function checkLoadTypeUserA(data: any) {
+    return createAxios({
+        url: '/process-boot/loadTypeUserManage/checkLoadTypeUserA',
+        method: 'post',
+        data
+    })
+}
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/occupancy.vue b/src/views/pqs/supervise/harmonicSurvey/components/occupancy.vue
index c95a4910..2f157c85 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/occupancy.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/occupancy.vue
@@ -1,11 +1,139 @@
 <template>
+    <div>
+        <el-button icon="el-icon-Check" type="primary" @click="preserve">保存</el-button>
+        <el-button icon="el-icon-Grid" type="primary" @click="dialogVisible = true">配置保存年限</el-button>
+        <div class="mt10" :style="`height: calc(${height} - 43px)`">
+            <vxe-table
+                v-bind="defaultAttribute"
+                height="auto"
+                ref="tableRef"
+                :data="tableData"
+                :tree-config="{ children: 'children' }"
+                :edit-config="{ trigger: 'click', mode: 'cell' }"
+            >
+                <vxe-table-column field="name" align="left" title="部门" tree-node></vxe-table-column>
 
-    <div>占比 </div>
-
+                <vxe-table-column
+                    field="proportion"
+                    title="占比(%)"
+                    :edit-render="{
+                        name: '$input',
+                        props: { type: 'float', digits: 2, max: 100, min: 0 }
+                    }"
+                ></vxe-table-column>
+            </vxe-table>
+        </div>
+        <el-dialog v-model="dialogVisible" title="年限设置" width="500" :before-close="handleClose">
+            <el-input-number v-model="num" :min="0" :max="1000" />
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="define">保存</el-button>
+                    <el-button @click="handleClose">取消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
 </template>
-<script setup lang='ts'>
-import { ref, reactive } from 'vue'
-</script>
-<style lang="scss" scoped>
+<script setup lang="ts">
+import { ref, onMounted } from 'vue'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import { mainHeight } from '@/utils/layout'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getAreaList } from '@/api/common'
+import { addPlanConfig, addPlanCycle, queryPlanConfig } from '@/api/process-boot/generalTest'
+const dialogVisible = ref(false)
+const num = ref(0)
+const tableRef = ref()
+const height = mainHeight(80).height
+const tableData: any = ref([])
+const treeData = ref([])
+const treeList: any = ref([])
+const info = async () => {
+    await queryPlanConfig().then(res => {
+        treeData.value = res.data
+    })
+    await getAreaList().then((res: any) => {
+        tableData.value = circulationTreeData(res.data)
+        setTimeout(() => {
+            tableRef.value.setAllTreeExpand(true)
+        }, 0)
+    })
+}
+const circulationTreeData = (rows: any) => {
+    let children: any = []
 
-</style>
+    rows.forEach((item: any) => {
+        let proportion = 0
+        treeData.value.forEach((val: any) => {
+            if (val.orgId == item.id) {
+                proportion = val.proportion
+                return
+            }
+        })
+
+        if (item.children && item.children.length > 0) {
+            children.push({
+                name: item.name,
+                id: item.id,
+                proportion: proportion,
+                children: circulationTreeData(item.children)
+            })
+        } else {
+            children.push({
+                name: item.name,
+                id: item.id,
+                proportion: proportion
+            })
+        }
+    })
+
+    return children
+}
+const preserve = () => {
+    treeList.value = []
+    circulation(tableData.value)
+    setTimeout(() => {
+        addPlanConfig(treeList.value).then(res => {
+            ElMessage.success('保存成功!')
+            info()
+        })
+    }, 0)
+}
+// 保存配置
+const define = () => {
+    addPlanCycle({
+        cycleNum: num.value
+    }).then(res => {
+        if (res.data.flag == true) {
+            ElMessage.success('年限设置成功!')
+            handleClose()
+        } else {
+            ElMessage.warning(`本次普测计划周期还未结束,请在 ${res.data.endYear} 后设置!`)
+        }
+    })
+}
+const circulation = (rows: any) => {
+    let children: any = []
+
+    rows.forEach((item: any) => {
+        treeList.value.push({
+            orgName: item.name,
+            orgId: item.id,
+            proportion: item.proportion
+        })
+        if (item.children && item.children.length > 0) {
+            circulation(item.children)
+        }
+    })
+
+    return children
+}
+const handleClose = () => {
+    dialogVisible.value = false
+    num.value = 0
+}
+
+onMounted(() => {
+    info()
+})
+</script>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue b/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
index 73e69b80..92e6d024 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/outcome.vue
@@ -1,26 +1,56 @@
 <template>
     <div>
-        <div>
-            <TableHeader area datePicker ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="是否上传">
-                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择是否上传">
-                            <el-option
-                                v-for="item in uploadData"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                </template>
-                <template #operation>
-                    <el-button icon="el-icon-Upload" type="primary">上传</el-button>
-                    <el-button icon="el-icon-Download" type="primary">导出</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-        </div>
+        <TableHeader area datePicker ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="是否上传">
+                    <el-select v-model="tableStore.table.params.isFileUpload" placeholder="请选择是否上传">
+                        <el-option label="未上传" value="0" />
+                        <el-option label="已上传" value="1" />
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Upload" type="primary">上传</el-button>
+                <el-button icon="el-icon-Download" type="primary">导出</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <!-- 上传弹窗 -->
+        <el-dialog title="上传" v-model="addUpload" width="500px">
+            <el-upload
+                multiple
+                action=""
+                :auto-upload="false"
+                :limit="999"
+                :file-list="fileList"
+                :on-remove="handleRemove"
+                :on-change="chooseBatch"
+                ref="upload"
+            >
+                <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
+            </el-upload>
+            <template #footer>
+                <el-button type="primary" @click="BatchUpload">保存</el-button>
+                <el-button @click="handleClose">取消</el-button>
+            </template>
+        </el-dialog>
+        <!-- 文件查看 -->
+        <el-dialog title="文件查看" v-model="dataShow" width="600px">
+            <vxe-table height="400" auto-resize :data="uploadList" v-bind="defaultAttribute">
+                <vxe-column field="minFileName" title="文件名称"></vxe-column>
+
+                <vxe-column title="操作" width="100">
+                    <template #default="{ row }">
+                        <el-button type="primary" size="small" link @click="downLownFn(row)">下载</el-button>
+                        <!-- <el-popconfirm title="是否确认删除策略！" @confirm="details(row)">
+                                <template #reference>
+                                    <el-button type="danger" link>删除</el-button>
+                                </template>
+                            </el-popconfirm> -->
+                    </template>
+                </vxe-column>
+            </vxe-table>
+        </el-dialog>
     </div>
 </template>
 <script setup lang="ts">
@@ -29,61 +59,125 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { mainHeight } from '@/utils/layout'
+import { defaultAttribute } from '@/components/table/defaultAttribute'
 import { useDictData } from '@/stores/dictData'
-import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
+import { MultipartFile, surveyResultDownload } from '@/api/process-boot/generalTest'
 
 const dictData = useDictData()
-const uploadData = [
-    {
-        id: 0,
 
-        label: '未上传'
-    },
-    {
-        id: 1,
-
-        label: '已上传'
-    }
-]
-
-const dialogVisible = ref(false)
+const addUpload = ref(false)
+const dataShow = ref(false)
 const TableHeaderRef = ref()
-const title = ref('')
+const fileList: any = ref([])
+const uploadList: any = ref([])
 
-const ruleFormRef = ref()
+const planId = ref('')
 const tableStore = new TableStore({
-    url: '/system-boot/area/areaSelect',
+    url: '/process-boot/rGeneralSurveyPlan/queryPlanResult',
     publicHeight: 65,
     method: 'POST',
     column: [
-        { width: '60', type: 'checkbox' },
+        // { width: '60', type: 'checkbox' },
         { field: 'orgName', title: '责任单位' },
-        {
-            field: 'planNo',
-            title: '普测计划编号'
-        },
+        { field: 'planNo', title: '普测计划编号' },
         { field: 'planName', title: '普测计划名称' },
         { field: 'planStartTime', title: '开始时间' },
         { field: 'planEndTime', title: '结束时间' },
         { field: 'subCount', title: '普测变电站数量' },
-        { field: 'isFileUpload', title: '是否上传' },
+        {
+            field: 'isFileUpload',
+            title: '是否上传',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '否',
+                1: '是'
+            }
+        },
         { field: 'fileCount', title: '上传文件数量' },
-        { field: 'uploadTime', title: '上传时间' }
+        { field: 'uploadTime', title: '上传时间' },
+        {
+            title: '操作文件',
+            width: '180',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    title: '上传',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        planId.value = row.planNo
+                        addUpload.value = true
+                    }
+                },
+                {
+                    title: '查看',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    disabled: row => {
+                        return row.isFileUpload !== 1
+                    },
+                    render: 'basicButton',
+                    click: row => {
+                        surveyResultDownload({ planNo: row.planNo }).then(res => {
+                            uploadList.value = res.data
+                            dataShow.value = true
+                        })
+                    }
+                }
+            ]
+        }
     ],
 
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                status: 2
-            }
-        ]
+    beforeSearchFun: () => {
+        tableStore.table.params.planStartTime = tableStore.table.params.searchBeginTime
+        tableStore.table.params.planEndTime = tableStore.table.params.searchEndTime
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
     }
 })
 
-tableStore.table.params.searchState = ''
-tableStore.table.params.searchValue = ''
-tableStore.table.params.type = ''
+tableStore.table.params.isFileUpload = ''
+
+const handleRemove = (e: any) => {
+    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
+}
+const chooseBatch = (e: any) => {
+    fileList.value.push(e)
+}
+
+// 上传
+const BatchUpload = () => {
+    let form = new FormData()
+    form.append('planId', planId.value)
+    fileList.value.forEach((item: any) => {
+        form.append('file', item.raw)
+    })
+    MultipartFile(form).then((res: any) => {
+        ElMessage.success('上传成功!')
+        handleClose()
+        tableStore.index()
+    })
+}
+const handleClose = () => {
+    fileList.value = []
+    addUpload.value = false
+}
+// 下载
+const downLownFn = async (row: any) => {
+    let response = await fetch(row.minFileUrl)
+    let blob = await response.blob()
+    let a = document.createElement('a')
+    a.href = window.URL.createObjectURL(blob)
+    a.download = row.minFileName
+    a.click()
+    a.remove()
+}
 
 provide('tableStore', tableStore)
 onMounted(() => {
diff --git a/src/views/pqs/supervise/interfere/components/network.vue b/src/views/pqs/supervise/interfere/components/network.vue
deleted file mode 100644
index 880cd3ba..00000000
--- a/src/views/pqs/supervise/interfere/components/network.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
-    <div>
-        <div>
-            <TableHeader area ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="干扰源类型">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            clearable
-                            placeholder="请选择干扰源类型"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="干扰源用户名称">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            clearable
-                            placeholder="请选择干扰源用户名称"
-                        ></el-input>
-                    </el-form-item>
-                </template>
-                <template #operation>
-                    <el-button icon="el-icon-Stamp" type="primary">审核</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-        </div>
-    </div>
-    
-</template>
-<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 { ElMessage, ElMessageBox } from 'element-plus'
-import { mainHeight } from '@/utils/layout'
-import { useDictData } from '@/stores/dictData'
-import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
-
-const dictData = useDictData()
-const process = [
-    {
-        name: '是',
-        id: '1'
-    },
-    {
-        name: '否',
-        id: '0'
-    }
-]
-
-const dialogVisible = ref(false)
-const TableHeaderRef = ref()
-const title = ref('')
-
-const ruleFormRef = ref()
-const tableStore = new TableStore({
-    url: '/system-boot/area/areaSelect',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        { width: '60', type: 'checkbox' },
-        { field: 'orgName', title: '所属单位' },
-        { field: 'loadType', title: '干扰源类型' },
-        { field: 'userName', title: '干扰源用户名称' },
-        { field: 'recordTime', title: '建档时间' },
-        { field: 'iuploadTime', title: '报告提交评估时间' }
-    ],
-
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                state: 2
-            }
-        ]
-    }
-})
-
-tableStore.table.params.searchState = ''
-tableStore.table.params.searchValue = ''
-tableStore.table.params.type = ''
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-</script>
diff --git a/src/views/pqs/supervise/interfere/components/network/audit.vue b/src/views/pqs/supervise/interfere/components/network/audit.vue
new file mode 100644
index 00000000..00735e2a
--- /dev/null
+++ b/src/views/pqs/supervise/interfere/components/network/audit.vue
@@ -0,0 +1,180 @@
+<template>
+    <!-- 上传 -->
+    <el-dialog :title="title" v-model="uploadConclusions" width="800px" :before-close="cancel">
+        <el-divider content-position="left">基本信息</el-divider>
+        <el-form
+            :inline="true"
+            ref="formRef"
+            :model="addForm"
+            label-width="120px"
+            :rules="rules"
+            :disabled="title == '未建档干扰源用户详情'"
+        >
+            <el-form-item label="所属单位:">
+                <Area v-model="addForm.orgNo" disabled />
+            </el-form-item>
+            <el-form-item label="干扰源用户名称:" prop="userName">
+                <el-input v-model="addForm.userName" clearable placeholder="请输入关键字" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select v-model="addForm.loadType" clearable collapse-tags placeholder="请选择" disabled>
+                    <el-option
+                        v-for="item in interferenceType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="建档时间:">
+                <el-input v-model="addForm.recordTime" clearable placeholder="请输入关键字" disabled></el-input>
+            </el-form-item>
+
+            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">报告在线查看</el-divider>
+            <el-form-item class="item" label="报告:">
+                <el-button type="primary" link @click="download">
+                    {{ addForm.ifilePathName }}
+                </el-button>
+            </el-form-item>
+            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">
+                入网评估结论填报
+            </el-divider>
+            <el-form-item label="是否超标:" style="margin-top: 10px" prop="iIsOverLimit">
+                <el-radio v-model="addForm.iIsOverLimit" :label="1" disabled>是</el-radio>
+                <el-radio v-model="addForm.iIsOverLimit" :label="0" disabled>否</el-radio>
+            </el-form-item>
+            <br />
+            <el-form-item label="超标指标:" style="margin-top: 10px" prop="IOverLimitTarget">
+                <el-checkbox-group v-model="addForm.IOverLimitTarget" disabled>
+                    <el-checkbox v-for="(item, ind) in exceeded" :label="item.id">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="计划采取措施:" style="margin-top: 10px" prop="IPlanStep">
+                <el-select v-model="addForm.IPlanStep" placeholder="请选择" disabled>
+                    <el-option
+                        v-for="item in takeMeasures"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <br />
+            <el-form-item label="入网详情:" style="margin-top: 10px" prop="IDescription">
+                <el-input
+                    disabled
+                    v-model="addForm.IDescription"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    placeholder="请输入入网详情"
+                    type="textarea"
+                    style="width: 500px"
+                ></el-input>
+            </el-form-item>
+            <el-divider content-position="left" style="font-size: 18px; font-weight: bolder">审核意见</el-divider>
+            <el-form-item prop="checkComment">
+                <el-input
+                    type="textarea"
+                    style="width: 400px"
+                    placeholder="请输入审核意见"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    v-model="addForm.checkComment"
+                ></el-input>
+            </el-form-item>
+        </el-form>
+        <div style="display: flex; justify-content: center; margin-top: 30px" v-if="title != '未建档干扰源用户详情'">
+            <el-button type="primary" class="ml20" @click="submit(1)">通过</el-button>
+            <el-button type="primary" class="ml20" @click="submit(0)">不通过</el-button>
+            <el-button type="primary" class="ml20" @click="cancel">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import Area from '@/components/form/area/index.vue'
+import { UploadInstance, UploadProps, UploadRawFile, ElMessage, ElMessageBox } from 'element-plus'
+import { genFileId } from 'element-plus'
+import { checkLoadTypeUserI, getLoadTypeUserById } from '@/api/process-boot/interference'
+const dictData = useDictData()
+
+const exceeded = dictData.getBasicData('Steady_Statis')
+const takeMeasures = dictData.getBasicData('Plan_Take')
+const interferenceType = dictData.getBasicData('Interference_Source')
+
+const emit = defineEmits(['onSubmit'])
+const uploadConclusions = ref(false)
+
+const addForm: any = ref({})
+
+const title = ref('')
+const rules = {
+    checkComment: [{ required: true, message: '请输入入网详情', trigger: 'blur' }]
+}
+const formRef = ref()
+
+const submit = (flag: any) => {
+    formRef.value?.validate((valid: any) => {
+        if (valid) {
+            checkLoadTypeUserI({
+                checkComment: addForm.value.checkComment,
+                checkPerson: dictData.state.area[0].id,
+                checkResult: flag,
+                id: addForm.value.id
+            }).then((res: any) => {
+                ElMessage.success('操作成功')
+                cancel()
+                emit('onSubmit')
+            })
+        }
+    })
+}
+// 下载
+const download = async () => {
+    // window.open(addForm.value.ifile)
+    let response = await fetch(addForm.value.ifile)
+    let blob = await response.blob()
+    let a = document.createElement('a')
+    a.href = window.URL.createObjectURL(blob)
+    a.download = addForm.value.ifilePathName
+    a.click()
+    a.remove()
+}
+
+// 重置
+const cancel = () => {
+    addForm.value.checkComment = ''
+    uploadConclusions.value = false
+}
+
+const open = (text: string, row: any) => {
+    title.value = text
+    addForm.value = {}
+    getLoadTypeUserById({ id: row.id }).then((res: any) => {
+        addForm.value = {
+            id: res.data.id,
+            orgNo: res.data.orgNo,
+            loadType: res.data.loadType,
+            userName: res.data.userName,
+            recordTime: res.data.recordTime,
+            iIsOverLimit: res.data.iisOverLimit ? res.data.iisOverLimit : 0,
+            IDescription: res.data.idescription ? res.data.idescription : '',
+            IPlanStep: res.data.iplanStep ? res.data.iplanStep : '',
+            IOverLimitTarget: res.data.ioverLimitTarget ? res.data.ioverLimitTarget.split(',') : [],
+            ifilePathName: res.data.ifilePathName ? res.data.ifilePathName : '',
+            ifile: res.data.ifile
+        }
+    })
+
+    uploadConclusions.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>
diff --git a/src/views/pqs/supervise/interfere/components/network/index.vue b/src/views/pqs/supervise/interfere/components/network/index.vue
new file mode 100644
index 00000000..328cb0cb
--- /dev/null
+++ b/src/views/pqs/supervise/interfere/components/network/index.vue
@@ -0,0 +1,96 @@
+<template>
+    <TableHeader area ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="干扰源类型">
+                <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择干扰源类型">
+                    <el-option
+                        v-for="item in interferenceType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="干扰源用户名称">
+                <el-input
+                    v-model="tableStore.table.params.userName"
+                    clearable
+                    placeholder="请选择干扰源用户名称"
+                ></el-input>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Stamp" type="primary">审核</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- 审核 -->
+    <Audit ref="AuditRef" @onSubmit="tableStore.index()" />
+</template>
+
+<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 { ElMessage, ElMessageBox } from 'element-plus'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import Audit from './audit.vue'
+
+const dictData = useDictData()
+const interferenceType = dictData.getBasicData('Interference_Source')
+
+const TableHeaderRef = ref()
+const AuditRef = ref()
+
+const tableStore = new TableStore({
+    url: '/process-boot/loadTypeUserManage/getLoadTypeUserList',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'loadType',
+            title: '干扰源类型',
+            formatter: row => {
+                return interferenceType.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        { field: 'userName', title: '干扰源用户名称' },
+        { field: 'recordTime', title: '建档时间' },
+        { field: 'iuploadTime', title: '报告提交评估时间' },
+        {
+            title: '操作',
+            width: '120',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '审核',
+                    type: 'primary',
+
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        AuditRef.value.open('入网评估报告审核', row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.checkType = 1
+    }
+})
+
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/interfere/components/normal.vue b/src/views/pqs/supervise/interfere/components/normal.vue
index 23f519ea..a757b677 100644
--- a/src/views/pqs/supervise/interfere/components/normal.vue
+++ b/src/views/pqs/supervise/interfere/components/normal.vue
@@ -4,35 +4,38 @@
             <TableHeader area ref="TableHeaderRef">
                 <template #select>
                     <el-form-item label="干扰源类型">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            clearable
-                            placeholder="请选择干扰源类型"
-                        ></el-input>
+                        <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择干扰源类型">
+                            <el-option
+                                v-for="item in interferenceType"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
                     </el-form-item>
                     <el-form-item label="干扰源用户名称">
                         <el-input
-                            v-model="tableStore.table.params.searchValue"
+                            v-model="tableStore.table.params.userName"
                             clearable
                             placeholder="请选择干扰源用户名称"
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="关联干扰源用户">
                         <el-input
-                            v-model="tableStore.table.params.searchValue"
+                            v-model="tableStore.table.params.relationUserName"
                             clearable
                             placeholder="请选择关联干扰源用户"
                         ></el-input>
                     </el-form-item>
 
                     <el-form-item label="是否已上传实测">
-                        <el-select v-model="tableStore.table.params.searchState" placeholder="请选择是否已上传实测">
-                            <el-option
-                                v-for="item in process"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
+                        <el-select
+                            v-model="tableStore.table.params.aisFileUpload"
+                            clearable
+                            placeholder="请选择是否已上传实测"
+                        >
+                            <el-option label="否" value="0" />
+                            <el-option label="是" value="1" />
                         </el-select>
                     </el-form-item>
                 </template>
@@ -56,24 +59,12 @@ import { useDictData } from '@/stores/dictData'
 import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
 
 const dictData = useDictData()
-const process = [
-    {
-        name: '是',
-        id: '1'
-    },
-    {
-        name: '否',
-        id: '0'
-    }
-]
-
-const dialogVisible = ref(false)
+const interferenceType = dictData.getBasicData('Interference_Source')
+const istatusList = dictData.getBasicData('On-network_Status')
 const TableHeaderRef = ref()
-const title = ref('')
 
-const ruleFormRef = ref()
 const tableStore = new TableStore({
-    url: '/system-boot/area/areaSelect',
+    url: '/process-boot/loadTypeUserManage/getLoadTypeRelationList',
     publicHeight: 65,
     method: 'POST',
     column: [
@@ -81,11 +72,20 @@ const tableStore = new TableStore({
         { field: 'orgName', title: '所属单位' },
         {
             field: 'loadType',
-            title: '干扰源类型'
+            title: '干扰源类型',
+            formatter: row => {
+                return interferenceType.filter(item => item.id == row.cellValue)[0]?.name
+            }
         },
         { field: 'userName', title: '干扰源用户名称' },
         { field: 'relationUserName', title: '关联干扰源用户名称' },
-        { field: 'istatus', title: '实测报告状态' },
+        {
+            field: 'istatus',
+            title: '实测报告状态',
+            formatter: row => {
+                return istatusList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
 
         {
             title: '操作',
@@ -105,18 +105,15 @@ const tableStore = new TableStore({
         }
     ],
 
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                state: 2
-            }
-        ]
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
     }
 })
 
-tableStore.table.params.searchState = ''
-tableStore.table.params.searchValue = ''
-tableStore.table.params.type = ''
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.relationUserName = ''
+tableStore.table.params.aisFileUpload = ''
 
 provide('tableStore', tableStore)
 onMounted(() => {
diff --git a/src/views/pqs/supervise/interfere/components/undocumented.vue b/src/views/pqs/supervise/interfere/components/undocumented.vue
deleted file mode 100644
index 99c36f95..00000000
--- a/src/views/pqs/supervise/interfere/components/undocumented.vue
+++ /dev/null
@@ -1,317 +0,0 @@
-<template>
-    <TableHeader area ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="干扰源类型">
-                <el-input
-                    v-model="tableStore.table.params.searchValue"
-                    clearable
-                    placeholder="请选择干扰源类型"
-                ></el-input>
-            </el-form-item>
-            <el-form-item label="干扰源用户名称">
-                <el-input
-                    v-model="tableStore.table.params.searchValue"
-                    clearable
-                    placeholder="请选择干扰源用户名称"
-                ></el-input>
-            </el-form-item>
-
-            <el-form-item label="是否上传报告:">
-                <el-select v-model="tableStore.table.params.searchState" placeholder="请选择是否上传报告">
-                    <el-option v-for="item in process" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-            <el-button icon="el-icon-Upload" type="primary" @click="clcUpload">上传</el-button>
-            <el-button icon="el-icon-Sort" type="primary">关联</el-button>
-            <el-button icon="el-icon-Download" type="primary">导出</el-button>
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" />
-    <!-- 新增 -->
-    <el-dialog title="未建档干扰用户新增" v-model="userAdd" width="50%">
-        <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">基本信息</el-divider>
-        <el-form :inline="true" label-width="120px">
-            <el-form-item label="区域:">
-                <Area ref="areaRef" v-model="addData.orgNo" style="width: 240px" />
-            </el-form-item>
-            <el-form-item label="干扰源类型:">
-                <el-select v-model="addData.loadType" clearable collapse-tags style="width: 240px" placeholder="请选择">
-                    <el-option
-                        v-for="item in interferenceType"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="干扰源用户名称:">
-                <el-input
-                    v-model="addData.userName"
-                    clearable
-                    style="width: 240px"
-                    placeholder="请输入关键字"
-                ></el-input>
-            </el-form-item>
-
-            <el-form-item label="建档时间:">
-                <el-date-picker
-                    style="width: 240px"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    v-model="addData.recordTime"
-                    type="datetime"
-                    placeholder="选择日期时间"
-                ></el-date-picker>
-            </el-form-item>
-        </el-form>
-        <div style="display: flex; justify-content: center; margin-top: 30px">
-            <el-button type="primary" class="ml20" @click="config">确定</el-button>
-            <el-button type="primary" class="ml20" @click="userAdd = false">取消</el-button>
-        </div>
-    </el-dialog>
-    <!-- 上传 -->
-    <el-dialog title="未建档干扰源用户入网报告结论上传" v-model="uploadConclusions" width="1600px">
-        <el-divider content-position="left">基本信息</el-divider>
-        <el-form :inline="true" label-width="100px">
-            <el-form-item label="所属单位:">
-                <el-input v-model="addData.orgNo" clearable placeholder="请输入所属单位" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="干扰源类型:">
-                <el-select v-model="addData.loadType" clearable collapse-tags placeholder="请选择" disabled>
-                    <el-option
-                        v-for="item in interferenceType"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-
-            <el-form-item label="干扰源用户名称:">
-                <el-input v-model="addData.userName" clearable placeholder="请输入关键字" disabled></el-input>
-            </el-form-item>
-            <el-form-item label="建档时间:">
-                <el-date-picker
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    v-model="addData.recordTime"
-                    disabled
-                    type="datetime"
-                    placeholder="选择日期时间"
-                ></el-date-picker>
-            </el-form-item>
-
-            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">
-                入网评估报告上传
-            </el-divider>
-            <el-form-item class="item" label="上传文件:">
-                <el-upload
-                    v-model:file-list="fileList"
-                    ref="upload"
-                    action=""
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :auto-upload="false"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-            </el-form-item>
-            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">
-                入网评估结论填报
-            </el-divider>
-            <el-form-item label="是否超标:" style="margin-top: 20px">
-                <el-radio v-model="addForm.iIsOverLimit" label="0">是</el-radio>
-                <el-radio v-model="addForm.iIsOverLimit" label="1">否</el-radio>
-            </el-form-item>
-            <br />
-            <el-form-item label="超标指标:" style="margin-top: 20px">
-                <el-checkbox-group v-model="addForm.IOverLimitTarget">
-                    <el-checkbox v-for="(item, ind) in exceeded" :label="item.id">
-                        {{ item.name }}
-                    </el-checkbox>
-                </el-checkbox-group>
-            </el-form-item>
-            <br />
-            <el-form-item label="计划采取措施:" style="margin-top: 20px">
-                <el-select v-model="addForm.IPlanStep" placeholder="请选择">
-                    <el-option
-                        v-for="item in takeMeasures"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <br />
-            <el-form-item label="入网详情:" style="margin-top: 20px">
-                <el-input
-                    v-model="addForm.IDescription"
-                    :autosize="{ minRows: 2, maxRows: 4 }"
-                    placeholder="请输入入网详情"
-                    type="textarea"
-                    style="width: 500px"
-                ></el-input>
-            </el-form-item>
-        </el-form>
-        <div style="display: flex; justify-content: center; margin-top: 30px">
-            <el-button type="primary" class="ml20" @click="submit">提交</el-button>
-            <el-button type="primary" class="ml20" @click="preservation">保存</el-button>
-            <el-button type="primary" class="ml20" @click="uploadConclusions = false">取消</el-button>
-        </div>
-    </el-dialog>
-</template>
-<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 Area from '@/components/form/area/index.vue'
-import type { UploadInstance, UploadProps, UploadRawFile, ElMessage, ElMessageBox } from 'element-plus'
-import { genFileId } from 'element-plus'
-import { mainHeight } from '@/utils/layout'
-import { useDictData } from '@/stores/dictData'
-import { addUse, updateUse, removeUse } from '@/api/advance-boot/bearingCapacity'
-
-const dictData = useDictData()
-const userAdd = ref(false)
-const process = [
-    {
-        name: '是',
-        id: '1'
-    },
-    {
-        name: '否',
-        id: '0'
-    }
-]
-
-const uploadConclusions = ref(false)
-const TableHeaderRef = ref()
-const interferenceType = dictData.getBasicData('Interference_Source')
-const exceeded = dictData.getBasicData('Steady_Statis')
-const takeMeasures = dictData.getBasicData('Plan_Take')
-const addData = ref({
-    orgNo: dictData.state.area[0].id,
-    loadType: '',
-    userName: '',
-    recordTime: ''
-})
-const addForm: any = ref({
-    IDescription: '',
-    iIsOverLimit: '',
-    IPlanStep: '',
-    IOverLimitTarget: []
-})
-const upload = ref()
-const ruleFormRef = ref()
-const fileList = ref([])
-const tableStore = new TableStore({
-    url: '/system-boot/area/areaSelect',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        { width: '60', type: 'checkbox' },
-        { field: 'orgName', title: '所属单位' },
-        {
-            field: 'loadType',
-            title: '干扰源类型'
-        },
-        { field: 'userName', title: '干扰源用户名称' },
-        { field: 'recordTime', title: '建档时间' },
-        { field: 'iisFileUpload', title: '是否上传报告' },
-
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '绑定',
-                    type: 'primary',
-
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {}
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: '',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {}
-                },
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    click: row => {
-                        removeUse({ userIds: row.userId }).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        tableStore.table.data = [
-            {
-                state: 2
-            }
-        ]
-    }
-})
-
-tableStore.table.params.searchState = ''
-tableStore.table.params.searchValue = ''
-tableStore.table.params.type = ''
-
-provide('tableStore', tableStore)
-// 新增
-const add = () => {
-    userAdd.value = true
-}
-// 提交
-const submit = () => {
-    console.log(123, fileList.value)
-}
-// 保存
-const preservation = () => {}
-
-const handleExceed: UploadProps['onExceed'] = files => {
-    upload.value!.clearFiles()
-    const file = files[0] as UploadRawFile
-    file.uid = genFileId()
-    upload.value!.handleStart(file)
-}
-// 点击上传
-const clcUpload = () => {
-    uploadConclusions.value = true
-}
-
-onMounted(() => {
-    tableStore.index()
-})
-</script>
-
-<style scoped lang="scss">
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-</style>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/add.vue b/src/views/pqs/supervise/interfere/components/undocumented/add.vue
new file mode 100644
index 00000000..affcd6d2
--- /dev/null
+++ b/src/views/pqs/supervise/interfere/components/undocumented/add.vue
@@ -0,0 +1,90 @@
+<template>
+    <!-- 新增 -->
+    <el-dialog title="未建档干扰用户新增" v-model="userAdd" width="50%" :before-close="cancel">
+        <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">基本信息</el-divider>
+        <el-form :inline="true" ref="formRef" :model="addData" label-width="130px" :rules="rules">
+            <el-form-item label="区域:">
+                <Area ref="areaRef" v-model="addData.orgNo" style="width: 240px" />
+            </el-form-item>
+            <el-form-item label="干扰源类型:" prop="loadType">
+                <el-select v-model="addData.loadType" clearable collapse-tags style="width: 240px" placeholder="请选择">
+                    <el-option
+                        v-for="item in interferenceType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="干扰源用户名称:" prop="userName">
+                <el-input
+                    v-model="addData.userName"
+                    clearable
+                    style="width: 240px"
+                    placeholder="请输入关键字"
+                ></el-input>
+            </el-form-item>
+
+            <el-form-item label="建档时间:" prop="recordTime">
+                <el-date-picker
+                    style="width: 240px"
+                    value-format="YYYY-MM-DD hh:mm:ss"
+                    v-model="addData.recordTime"
+                    type="datetime"
+                    placeholder="选择日期时间"
+                ></el-date-picker>
+            </el-form-item>
+        </el-form>
+        <div style="display: flex; justify-content: center; margin-top: 30px">
+            <el-button type="primary" class="ml20" @click="config">确定</el-button>
+            <el-button type="primary" class="ml20" @click="cancel">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+import Area from '@/components/form/area/index.vue'
+import { addLoadTypeUser } from '@/api/process-boot/interference'
+const dictData = useDictData()
+const userAdd = ref(false)
+const interferenceType = dictData.getBasicData('Interference_Source')
+const emit = defineEmits(['onSubmit'])
+const rules = reactive({
+    loadType: [{ required: true, message: '请选择干扰源类型', trigger: 'change' }],
+    userName: [{ required: true, message: '请输入干扰源用户名称', trigger: 'blur' }],
+    recordTime: [{ required: true, message: '请选择建档时间', trigger: 'change' }]
+})
+const addData = ref({
+    orgNo: dictData.state.area[0].id,
+    loadType: '',
+    userName: '',
+    recordTime: ''
+})
+const formRef = ref()
+// 新增
+const config = () => {
+    formRef.value.validate((valid: any) => {
+        if (valid) {
+            addLoadTypeUser(addData.value).then((res: any) => {
+                ElMessage.success('新增成功!')
+                emit('onSubmit')
+                cancel()
+            })
+        }
+    })
+}
+// 重置
+const cancel = () => {
+    formRef.value.resetFields()
+    userAdd.value = false
+}
+const open = () => {
+    userAdd.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/audit.vue b/src/views/pqs/supervise/interfere/components/undocumented/audit.vue
new file mode 100644
index 00000000..7050a189
--- /dev/null
+++ b/src/views/pqs/supervise/interfere/components/undocumented/audit.vue
@@ -0,0 +1,220 @@
+<template>
+    <!-- 上传 -->
+    <el-dialog :title="title" v-model="uploadConclusions" width="70%" :before-close="cancel">
+        <el-divider content-position="left">基本信息</el-divider>
+        <el-form
+            :inline="true"
+            ref="formRef"
+            :model="addForm"
+            label-width="120px"
+            :rules="rules"
+            :disabled="title == '未建档干扰源用户详情'"
+        >
+            <el-form-item label="所属单位:">
+                <Area v-model="addForm.orgNo" disabled />
+            </el-form-item>
+            <el-form-item label="干扰源类型:">
+                <el-select v-model="addForm.loadType" clearable collapse-tags placeholder="请选择" disabled>
+                    <el-option
+                        v-for="item in interferenceType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item label="干扰源用户名称:" prop="userName">
+                <el-input v-model="addForm.userName" clearable placeholder="请输入关键字" disabled></el-input>
+            </el-form-item>
+            <el-form-item label="建档时间:">
+                <el-input v-model="addForm.recordTime" clearable placeholder="请输入关键字" disabled></el-input>
+            </el-form-item>
+
+            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">
+                入网评估报告上传
+            </el-divider>
+            <el-form label-width="120px">
+                <el-form-item class="item" label="上传文件:">
+                    <el-upload
+                        v-if="title == '未建档干扰源用户入网报告结论上传'"
+                        v-model:file-list="addForm.fileList"
+                        ref="upload"
+                        action=""
+                        :limit="1"
+                        :on-exceed="handleExceed"
+                        :auto-upload="false"
+                    >
+                        <template #trigger>
+                            <el-button type="primary">上传文件</el-button>
+                        </template>
+                    </el-upload>
+                    <el-button type="primary" link @click="download" v-else>
+                        {{ addForm.ifilePathName }}
+                    </el-button>
+                </el-form-item>
+            </el-form>
+
+            <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">
+                入网评估结论填报
+            </el-divider>
+            <el-form-item label="是否超标:" style="margin-top: 10px" prop="iIsOverLimit">
+                <el-radio v-model="addForm.iIsOverLimit" :label="1">是</el-radio>
+                <el-radio v-model="addForm.iIsOverLimit" :label="0">否</el-radio>
+            </el-form-item>
+            <br />
+            <el-form-item label="超标指标:" style="margin-top: 10px" prop="IOverLimitTarget">
+                <el-checkbox-group v-model="addForm.IOverLimitTarget">
+                    <el-checkbox v-for="(item, ind) in exceeded" :label="item.id">
+                        {{ item.name }}
+                    </el-checkbox>
+                </el-checkbox-group>
+            </el-form-item>
+            <br />
+            <el-form-item label="计划采取措施:" style="margin-top: 10px" prop="IPlanStep">
+                <el-select v-model="addForm.IPlanStep" placeholder="请选择">
+                    <el-option
+                        v-for="item in takeMeasures"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <br />
+            <el-form-item label="入网详情:" style="margin-top: 10px" prop="IDescription">
+                <el-input
+                    v-model="addForm.IDescription"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    placeholder="请输入入网详情"
+                    type="textarea"
+                    style="width: 500px"
+                ></el-input>
+            </el-form-item>
+        </el-form>
+        <div style="display: flex; justify-content: center; margin-top: 30px" v-if="title != '未建档干扰源用户详情'">
+            <el-button type="primary" class="ml20" @click="submit(1)">提交</el-button>
+            <el-button type="primary" class="ml20" @click="submit(2)">保存</el-button>
+            <el-button type="primary" class="ml20" @click="cancel">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, reactive } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import Area from '@/components/form/area/index.vue'
+import { UploadInstance, UploadProps, UploadRawFile, ElMessage, ElMessageBox } from 'element-plus'
+import { genFileId } from 'element-plus'
+import { uploadLoadTypeUserI, getLoadTypeUserById } from '@/api/process-boot/interference'
+const dictData = useDictData()
+
+const exceeded = dictData.getBasicData('Steady_Statis')
+const takeMeasures = dictData.getBasicData('Plan_Take')
+const interferenceType = dictData.getBasicData('Interference_Source')
+
+const emit = defineEmits(['onSubmit'])
+const uploadConclusions = ref(false)
+
+const addForm: any = ref({
+    id: '',
+    orgNo: '',
+    loadType: '',
+    userName: '',
+    recordTime: '',
+    iIsOverLimit: '',
+    IDescription: '',
+    IPlanStep: '',
+    IOverLimitTarget: [],
+    fileList: []
+})
+const upload = ref()
+const title = ref('')
+const rules = {
+    iIsOverLimit: [{ required: true, message: '请选择是否超标', trigger: 'change' }],
+    IDescription: [{ required: true, message: '请输入入网详情', trigger: 'blur' }],
+    IPlanStep: [{ required: true, message: '请选择计划采取措施', trigger: 'change' }],
+    IOverLimitTarget: [{ required: true, message: '请选择超标指标', trigger: 'change' }]
+}
+const formRef = ref()
+
+const submit = (flag: any) => {
+    formRef.value.validate((valid: any) => {
+        if (valid) {
+            const formData = new FormData()
+
+            addForm.value.fileList.forEach(item => {
+                if (item.raw == undefined) {
+                } else {
+                    formData.append('file', item.raw)
+                }
+            })
+            formData.append('id', addForm.value.id)
+            formData.append('IDescription', addForm.value.IDescription)
+            formData.append('iIsOverLimit', addForm.value.iIsOverLimit)
+            formData.append('IPlanStep', addForm.value.IPlanStep)
+            formData.append('IOverLimitTarget', addForm.value.IOverLimitTarget.toString())
+
+            formData.append('status', flag)
+            // 提交
+            uploadLoadTypeUserI(formData).then((res: any) => {
+                ElMessage.success(flag == 1 ? '提交成功!' : '保存成功!')
+                emit('onSubmit')
+                cancel()
+            })
+        }
+    })
+}
+const handleExceed: UploadProps['onExceed'] = files => {
+    upload.value!.clearFiles()
+    const file = files[0] as UploadRawFile
+    file.uid = genFileId()
+    upload.value!.handleStart(file)
+}
+// 下载
+const download = async () => {
+    // window.open(addForm.value.ifile)
+    let response = await fetch(addForm.value.ifile)
+    let blob = await response.blob()
+    let a = document.createElement('a')
+    a.href = window.URL.createObjectURL(blob)
+    a.download = addForm.value.ifilePathName
+    a.click()
+    a.remove()
+}
+
+// 重置
+const cancel = () => {
+    formRef.value?.resetFields()
+    uploadConclusions.value = false
+}
+
+const open = (text: string, row: any) => {
+    title.value = text
+
+    getLoadTypeUserById({ id: row.id }).then((res: any) => {
+        addForm.value = {
+            id: res.data.id,
+            orgNo: res.data.orgNo,
+            loadType: res.data.loadType,
+            userName: res.data.userName,
+            recordTime: res.data.recordTime,
+            iIsOverLimit: res.data.iisOverLimit ? res.data.iisOverLimit : 0,
+            IDescription: res.data.idescription ? res.data.idescription : '',
+            IPlanStep: res.data.iplanStep ? res.data.iplanStep : '',
+            IOverLimitTarget: res.data.ioverLimitTarget ? res.data.ioverLimitTarget.split(',') : [],
+            fileList: res.data.ifilePathName ? [{ name: res.data.ifilePathName, status: 'ready' }] : [],
+            ifilePathName: res.data.ifilePathName ? res.data.ifilePathName : '',
+            ifile: res.data.ifile
+        }
+    })
+
+    uploadConclusions.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
new file mode 100644
index 00000000..dafc8f63
--- /dev/null
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -0,0 +1,171 @@
+<template>
+    <TableHeader area ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="干扰源类型">
+                <el-select v-model="tableStore.table.params.loadType" clearable placeholder="请选择干扰源类型">
+                    <el-option
+                        v-for="item in interferenceType"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="干扰源用户名称">
+                <el-input
+                    v-model="tableStore.table.params.userName"
+                    clearable
+                    placeholder="请选择干扰源用户名称"
+                ></el-input>
+            </el-form-item>
+
+            <el-form-item label="是否上传报告:">
+                <el-select v-model="tableStore.table.params.fileUploadflag" clearable placeholder="请选择是否上传报告">
+                    <el-option label="否" value="0" />
+                    <el-option label="是" value="1" />
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Plus" type="primary" @click="addList">新增</el-button>
+
+            <el-button icon="el-icon-Download" type="primary">导出</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- 新增 -->
+    <Add ref="addRef" @onSubmit="tableStore.index()" />
+    <!-- 上传 -->
+    <Audit ref="AuditRef" @onSubmit="tableStore.index()" />
+</template>
+<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 { mainHeight } from '@/utils/layout'
+import Add from './add.vue'
+import Audit from './audit.vue'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+
+const TableHeaderRef = ref()
+const interferenceType = dictData.getBasicData('Interference_Source')
+
+const istatusList = dictData.getBasicData('On-network_Status')
+
+const addRef = ref()
+const AuditRef = ref()
+const ruleFormRef = ref()
+const fileList = ref([])
+const tableStore = new TableStore({
+    url: '/process-boot/loadTypeUserManage/getLoadTypeUserList',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        // { width: '60', type: 'checkbox' },
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'loadType',
+            title: '干扰源类型',
+            formatter: row => {
+                return interferenceType.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        { field: 'userName', title: '干扰源用户名称' },
+        { field: 'recordTime', title: '建档时间' },
+        {
+            field: 'iisFileUpload',
+            title: '是否上传报告',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '否',
+                1: '是'
+            }
+        },
+        {
+            field: 'istatus',
+            title: '入网评估报告状态',
+            formatter: row => {
+                return istatusList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+
+        {
+            title: '操作',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '上传',
+                    type: 'primary',
+                    disabled: row => {
+                        return !(
+                            row.istatus == null ||
+                            istatusList.filter(item => item.code == 'Newly')[0]?.id == row.istatus ||
+                            istatusList.filter(item => item.code == 'Failed')[0]?.id == row.istatus
+                        )
+                        // ||
+                        // istatusList.filter(item => item.code == 'Failed')[0]?.id == row.istatus
+                    },
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        AuditRef.value.open('未建档干扰源用户入网报告结论上传', row)
+                    }
+                },
+
+                {
+                    name: 'edit',
+                    text: '查看',
+                    type: 'primary',
+                    disabled: row => {
+                        return row.istatus == null
+                    },
+                    icon: 'el-icon-Delete',
+                    render: 'basicButton',
+                    click: row => {
+                        AuditRef.value.open('未建档干扰源用户详情', row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.relationUserName = tableStore.table.params.userName
+    }
+})
+
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.fileUploadflag = ''
+
+provide('tableStore', tableStore)
+// 新增
+const addList = () => {
+    addRef.value.open()
+}
+// 提交
+const submit = () => {
+    console.log(123, fileList.value)
+}
+// 保存
+const preservation = () => {}
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>
+
+<style scoped lang="scss">
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>
diff --git a/src/views/pqs/supervise/interfere/index.vue b/src/views/pqs/supervise/interfere/index.vue
index fcc1156f..2b67081a 100644
--- a/src/views/pqs/supervise/interfere/index.vue
+++ b/src/views/pqs/supervise/interfere/index.vue
@@ -13,8 +13,8 @@
 
 <script setup lang="ts">
 import { onMounted, reactive, ref, provide } from 'vue'
-import undocumented from './components/undocumented.vue'
-import network from './components/network.vue'
+import undocumented from './components/undocumented/index.vue'
+import network from './components/network/index.vue'
 import normal from './components/normal.vue'
 import report from './components/report.vue'
 
diff --git a/src/views/pqs/supervise/terminal/components/cycleTab.vue b/src/views/pqs/supervise/terminal/components/cycleTab.vue
index c53ae97d..7d1021f9 100644
--- a/src/views/pqs/supervise/terminal/components/cycleTab.vue
+++ b/src/views/pqs/supervise/terminal/components/cycleTab.vue
@@ -142,9 +142,18 @@ const tableStore = new TableStore({
         {
             field: 'testResults',
             title: '检测结果',
-            formatter(row: any) {
-                return row.cellValue == 0 ? '未展开' : '已展开'
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '未展开',
+                1: '已展开'
             }
+            // formatter(row: any) {
+            //     return row.cellValue == 0 ? '未展开' : '已展开'
+            // }
         },
         { field: 'nextInspectionTime', title: '下次检测时间' },
         {
diff --git a/src/views/pqs/supervise/terminal/components/networkTab.vue b/src/views/pqs/supervise/terminal/components/networkTab.vue
index 2026cc23..c68e8e6c 100644
--- a/src/views/pqs/supervise/terminal/components/networkTab.vue
+++ b/src/views/pqs/supervise/terminal/components/networkTab.vue
@@ -161,8 +161,14 @@ const tableStore = new TableStore({
         {
             field: 'testResults',
             title: '检测结果',
-            formatter(row: any) {
-                return row.cellValue == 0 ? '未展开' : '已展开'
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '未展开',
+                1: '已展开'
             }
         },
         { field: 'inspectionTime', title: '检测时间' },