diff --git a/src/api/event-boot/report.ts b/src/api/event-boot/report.ts
index 55ef1bc3..6815083c 100644
--- a/src/api/event-boot/report.ts
+++ b/src/api/event-boot/report.ts
@@ -1,72 +1,115 @@
-import createAxios from '@/utils/request'
-
-//事件报告
-export function getEventReport(data) {
-    return createAxios({
-        url: '/event-boot/report/getEventReport',
-        method: 'post',
-        data
-    })
-}
-// 生成报告
-export function getAreaReport(data) {
-    return createAxios({
-        url: '/event-boot/report/getAreaReport',
-        method: 'post',
-        data,
-        responseType: 'blob'
-    })
-}
-//查询所有模板
-export function getList(data) {
-    return createAxios({
-        url: '/system-boot/EventTemplate/getList',
-        method: 'post',
-        data
-    })
-}
-export function selectReleation(data) {
-    return createAxios({
-        url: '/system-boot/EventTemplate/selectReleation',
-        method: 'post',
-        params: data
-    })
-}
-export function getLineExport(data) {
-    return createAxios({
-        url: '/event-boot/report/getLineExport',
-        method: 'post',
-        data: data,
-        responseType: 'blob'
-    })
-}
-export function getVoltage(data: any) {
-    return createAxios({
-        url: '/event-boot/report/getVoltage',
-        method: 'post',
-        data
-    })
-}
-export function getGeneralSituation(data: any) {
-    return createAxios({
-        url: '/event-boot/report/getGeneralSituation',
-        method: 'post',
-        data
-    })
-}
-export function getTransientValue(data: any) {
-    return createAxios({
-        url: '/event-boot/transient/getTransientValue',
-        method: 'post',
-        data
-    })
-}
-// 周报导出
-export function getExport(data: any) {
-    return createAxios({
-        url: '/event-boot/report/getExport',
-        method: 'post',
-        data,
-        responseType: 'blob'
-    })
-}
+import createAxios from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
+
+//事件报告
+export function getEventReport(data) {
+    return createAxios({
+        url: '/event-boot/report/getEventReport',
+        method: 'post',
+        data
+    })
+}
+// 生成报告
+export function getAreaReport(data) {
+    return createAxios({
+        url: '/event-boot/report/getAreaReport',
+        method: 'post',
+        data,
+        responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
+    })
+}
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}
+
+//查询所有模板
+export function getList(data) {
+    return createAxios({
+        url: '/system-boot/EventTemplate/getList',
+        method: 'post',
+        data
+    })
+}
+export function selectReleation(data) {
+    return createAxios({
+        url: '/system-boot/EventTemplate/selectReleation',
+        method: 'post',
+        params: data
+    })
+}
+export function getLineExport(data) {
+    return createAxios({
+        url: '/event-boot/report/getLineExport',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
+    })
+}
+export function getVoltage(data: any) {
+    return createAxios({
+        url: '/event-boot/report/getVoltage',
+        method: 'post',
+        data
+    })
+}
+export function getGeneralSituation(data: any) {
+    return createAxios({
+        url: '/event-boot/report/getGeneralSituation',
+        method: 'post',
+        data
+    })
+}
+export function getTransientValue(data: any) {
+    return createAxios({
+        url: '/event-boot/transient/getTransientValue',
+        method: 'post',
+        data
+    })
+}
+// 周报导出
+export function getExport(data: any) {
+    return createAxios({
+        url: '/event-boot/report/getExport',
+        method: 'post',
+        data,
+        responseType: 'blob'
+    })
+}
diff --git a/src/api/harmonic-boot/harmonic.ts b/src/api/harmonic-boot/harmonic.ts
index 6a494662..497a9216 100644
--- a/src/api/harmonic-boot/harmonic.ts
+++ b/src/api/harmonic-boot/harmonic.ts
@@ -1,18 +1,48 @@
-import request from '@/utils/request'
-
-export function getHistoryResult(data: any) {
-    return request({
-        url: '/harmonic-boot/harmonic/getHistoryResult',
-        method: 'post',
-        data: data
-    })
-}
-// word报告
-export function exportModelJB(data: any) {
-    return request({
-        url: '/harmonic-boot/exportmodel/exportModelJB',
-        method: 'post',
-        responseType: 'blob',
-        data: data
-    })
-}
+import request from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
+export function getHistoryResult(data: any) {
+    return request({
+        url: '/harmonic-boot/harmonic/getHistoryResult',
+        method: 'post',
+        data: data
+    })
+}
+// word报告
+export function exportModelJB(data: any) {
+    return request({
+        url: '/harmonic-boot/exportmodel/exportModelJB',
+        method: 'post',
+        responseType: 'blob',
+        data: data
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
+    })
+}
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}
diff --git a/src/api/process-boot/reportForms.ts b/src/api/process-boot/reportForms.ts
index e97f0ec3..52da52cf 100644
--- a/src/api/process-boot/reportForms.ts
+++ b/src/api/process-boot/reportForms.ts
@@ -1,4 +1,5 @@
 import createAxios from '@/utils/request'
+import { genFileId, ElMessage, ElNotification } from 'element-plus'
 
 export function exportModel(data: any) {
     return createAxios({
@@ -6,6 +7,17 @@ export function exportModel(data: any) {
         method: 'post',
         data: data,
         responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
 export function areaHarmonicReport(data: any) {
@@ -14,5 +26,35 @@ export function areaHarmonicReport(data: any) {
         method: 'post',
         data: data,
         responseType: 'blob'
+    }).then(async res => {
+        let load: any = await readJsonBlob(res)
+        if (load.code) {
+            if (load.data.code == 'A0011') {
+                ElMessage.warning('下载失败!')
+            } else {
+                ElMessage.warning(load.data.message)
+            }
+        } else {
+            return res
+        }
     })
 }
+async function readJsonBlob(blob) {
+    try {
+        // 1. Blob.text() 读取二进制 → 直接转为 字符串（自动处理编码）
+        const jsonStr = await blob.text()
+        // 2. JSON.parse 解析字符串 → 得到可用的 JS 对象/数组
+        const jsonData = JSON.parse(jsonStr)
+        // 3. 拿到数据，后续随便用
+        return {
+            code: true,
+            data: jsonData
+        }
+    } catch (err) {
+        return {
+            code: false,
+            data: {}
+        }
+        // console.error('解析Blob的JSON数据失败：', err)
+    }
+}
diff --git a/src/template/table.vue b/src/template/table.vue
index 91ae8218..8ffb919d 100644
--- a/src/template/table.vue
+++ b/src/template/table.vue
@@ -1,176 +1,176 @@
-<template>
-    <div class='default-main'>
-        <!-- 表头 -->
-         <!-- date-picker 时间组件    area区域组件-->
-        <TableHeader date-picker area>
-            <template v-slot:select>
-                <el-form-item label='关键词:'>
-                    <el-input
-                        style='width: 240px'
-                        v-model='tableStore.table.params.searchValue'
-                        clearable
-                        placeholder='仅根据用户名/登录名'
-                    />
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <el-button :icon='Plus' type='primary' @click='addUser'>添加</el-button>
-            </template>
-        </TableHeader>
-        <!-- 表格 -->
-        <Table ref='tableRef' />
-        <!-- 弹框 -->
-        <PopupEdit ref='popupEdit' />
-    </div>
-</template>
-<script setup lang='ts'>
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide, defineOptions } from 'vue'
-import { ElMessageBox, ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import PopupEdit from './dialog.vue'
-import { mainHeight } from '@/utils/layout'
-
-// 注意名字不要重复，若要保持页面存活，名字需要和路由admin后面的字符保持一致
-defineOptions({
-    name: 'auth/userlist'
-})
-const popupEdit = ref()
-const tableStore = new TableStore({
-    // 若页面表格高度需要调整，请修改publicHeight(内容区域除表格外其他内容的高度)
-    // publicHeight: 60,
-    url: '/user-boot/user/list',
-    method: 'POST',
-    column: [
-        { title: '用户名称', field: 'name', minWidth: '130' },
-        { title: '登录名', field: 'loginName', minWidth: '130' },
-        { title: '角色', field: 'roleName', minWidth: '130' },
-        { title: '部门', field: 'deptName', minWidth: '200' },
-        { title: '电话', field: 'phoneShow', minWidth: '100' },
-        { title: '注册时间', field: 'registerTime', minWidth: '130' },
-        { title: '登录时间', field: 'loginTime', minWidth: '130' },
-        { title: '类型', field: 'casualUserName', minWidth: '80' },
-        {
-            title: '状态',
-            field: 'state',
-            width: '100',
-            render: 'tag',
-            custom: {
-                0: 'danger',
-                1: 'success',
-                2: 'warning',
-                3: 'warning',
-                4: 'info',
-                5: 'danger'
-            },
-            replaceValue: {
-                0: '注销',
-                1: '正常',
-                2: '锁定',
-                3: '待审核',
-                4: '休眠',
-                5: '密码过期'
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1
-                    },
-                    click: row => {
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '修改密码',
-                    type: 'primary',
-                    icon: 'el-icon-Lock',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1
-                    },
-                    click: row => {
-                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
-                            confirmButtonText: '确认',
-                            cancelButtonText: '取消',
-                            inputType: 'password'
-                        }).then(({ value }) => {
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '激活',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
-                    },
-                    click: row => {
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '注销',
-                    type: 'danger',
-                    icon: 'el-icon-SwitchButton',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1 && row.state !== 3
-                    },
-                    click: row => {
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.deptName = item.deptName || '/'
-            item.phoneShow = item.phone || '/'
-            item.roleName = item.role.length ? item.role : '/'
-            switch (item.casualUser) {
-                case 0:
-                    item.casualUserName = '临时用户'
-                    break
-                case 1:
-                    item.casualUserName = '长期用户'
-                    break
-                default:
-                    item.casualUserName = '/'
-                    break
-            }
-        })
-    }
-})
-// 注入到子组件
-provide('tableStore', tableStore)
-// 默认参数 参数多的话可以使用Object.assign方法
-tableStore.table.params.searchState = 1
-tableStore.table.params.searchValue = ''
-tableStore.table.params.casualUser = -1
-tableStore.table.params.orderBy = ''
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-
-// 弹框
-const addUser = () => {
-    popupEdit.value.open('新增用户')
-}
-</script>
+<template>
+    <div class='default-main'>
+        <!-- 表头 -->
+         <!-- date-picker 时间组件    area区域组件-->
+        <TableHeader date-picker area>
+            <template v-slot:select>
+                <el-form-item label='关键词:'>
+                    <el-input
+                        style='width: 240px'
+                        v-model='tableStore.table.params.searchValue'
+                        clearable
+                        placeholder='仅根据用户名/登录名'
+                    />
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <el-button :icon='Plus' type='primary' @click='addUser'>添加</el-button>
+            </template>
+        </TableHeader>
+        <!-- 表格 -->
+        <Table ref='tableRef' />
+        <!-- 弹框 -->
+        <PopupEdit ref='popupEdit' />
+    </div>
+</template>
+<script setup lang='ts'>
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide, defineOptions } from 'vue'
+import { ElMessageBox, ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import PopupEdit from './dialog.vue'
+import { mainHeight } from '@/utils/layout'
+
+// 注意名字不要重复，若要保持页面存活，名字需要和路由admin后面的字符保持一致
+defineOptions({
+    name: 'auth/userlist'
+})
+const popupEdit = ref()
+const tableStore = new TableStore({
+    // 若页面表格高度需要调整，请修改publicHeight(内容区域除表格外其他内容的高度)
+    // publicHeight: 60,
+    url: '/user-boot/user/list',
+    method: 'POST',
+    column: [
+        { title: '用户名称', field: 'name', minWidth: '130' },
+        { title: '登录名', field: 'loginName', minWidth: '130' },
+        { title: '角色', field: 'roleName', minWidth: '130' },
+        { title: '部门', field: 'deptName', minWidth: '200' },
+        { title: '电话', field: 'phoneShow', minWidth: '100' },
+        { title: '注册时间', field: 'registerTime', minWidth: '130' },
+        { title: '登录时间', field: 'loginTime', minWidth: '130' },
+        { title: '类型', field: 'casualUserName', minWidth: '80' },
+        {
+            title: '状态',
+            field: 'state',
+            width: '100',
+            render: 'tag',
+            custom: {
+                0: 'danger',
+                1: 'success',
+                2: 'warning',
+                3: 'warning',
+                4: 'info',
+                5: 'danger'
+            },
+            replaceValue: {
+                0: '注销',
+                1: '正常',
+                2: '锁定',
+                3: '待审核',
+                4: '休眠',
+                5: '密码过期'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1
+                    },
+                    click: row => {
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '修改密码',
+                    type: 'primary',
+                    icon: 'el-icon-Lock',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1
+                    },
+                    click: row => {
+                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
+                            confirmButtonText: '确认',
+                            cancelButtonText: '取消',
+                            inputType: 'password'
+                        }).then(({ value }) => {
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '激活',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
+                    },
+                    click: row => {
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '注销',
+                    type: 'danger',
+                    icon: 'el-icon-SwitchButton',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1 && row.state !== 3
+                    },
+                    click: row => {
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.deptName = item.deptName || '/'
+            item.phoneShow = item.phone || '/'
+            item.roleName = item.role.length ? item.role : '/'
+            switch (item.casualUser) {
+                case 0:
+                    item.casualUserName = '临时用户'
+                    break
+                case 1:
+                    item.casualUserName = '长期用户'
+                    break
+                default:
+                    item.casualUserName = '/'
+                    break
+            }
+        })
+    }
+})
+// 注入到子组件
+provide('tableStore', tableStore)
+// 默认参数 参数多的话可以使用Object.assign方法
+tableStore.table.params.searchState = 1
+tableStore.table.params.searchValue = ''
+tableStore.table.params.casualUser = -1
+tableStore.table.params.orderBy = ''
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+
+// 弹框
+const addUser = () => {
+    popupEdit.value.open('新增用户')
+}
+</script>
diff --git a/src/utils/mqtt.ts b/src/utils/mqtt.ts
index ce98b12f..a8ec54ca 100644
--- a/src/utils/mqtt.ts
+++ b/src/utils/mqtt.ts
@@ -56,7 +56,7 @@ class MQTT {
                 localStorage.getItem('MqttUrl') == 'null'
                     ? 'ws://192.168.1.68:8083/mqtt'
                     : localStorage.getItem('MqttUrl')
-
+            if (mqttUrl == 'null'||mqttUrl == null) return
             this.client = mqtt.connect(mqttUrl, this.defaultOptions as IClientOptions)
             this.setupEventListeners()
 
diff --git a/src/views/LN/newEnergy/newEnergyLedger/index.vue b/src/views/LN/newEnergy/newEnergyLedger/index.vue
index 35c8a7c0..d734b301 100644
--- a/src/views/LN/newEnergy/newEnergyLedger/index.vue
+++ b/src/views/LN/newEnergy/newEnergyLedger/index.vue
@@ -1,125 +1,125 @@
-<template>
-    <div class="default-main">
-        <TableHeader ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="新能源场站名称">
-                    <el-input v-model="tableStore.table.params.name" clearable placeholder="输入关键字筛选" />
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <!--弹框-->
-        <addForm ref="addFormRef" @onSubmit="tableStore.index()" />
-    </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 addForm from './components/addForm.vue'
-import { useDictData } from '@/stores/dictData'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { delNewStation } from '@/api/device-boot/newEnergy'
-defineOptions({
-    name: 'newEnergy/newEnergyLedger'
-})
-const dictData = useDictData()
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const newEnergy = dictData.getBasicData('new_station_type')
-const scaleList = dictData.getBasicData('Dev_Voltage_Stand')
-const tableRef = ref()
-const TableHeaderRef = ref()
-const addFormRef = ref()
-const tableStore = new TableStore({
-    url: '/device-boot/newStation/queryPage',
-    method: 'POST',
-    column: [
-        {
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'name', title: '新能源场站名称' },
-        {
-            field: 'stationType',
-            title: '新能源场站类型',
-
-            formatter: (row: any) => newEnergy.filter(item => item.id == row.cellValue)[0]?.name
-        },
-        {
-            field: 'scale',
-            title: '电压等级',
-
-            formatter: (row: any) => scaleList.filter(item => item.id == row.cellValue)[0]?.name
-        },
-        { field: 'ratedPower', title: '额定有功功率(kW)' },
-        { field: 'longitude', title: '经度' },
-        { field: 'latitude', title: '纬度' },
-        {
-            title: '操作',
-            align: 'center',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '修改',
-                    type: 'primary',
-                    icon: 'el-icon-edit',
-                    render: 'basicButton',
-                    click: row => {
-                        addFormRef.value.open({
-                            title: '修改',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'delete',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除该数据吗？'
-                    },
-                    click: row => {
-                        delNewStation({ ids: row.id }).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.currentPage = tableStore.table.params.pageNum
-    },
-    loadCallback: () => {}
-})
-tableStore.table.params.name = ''
-const add = () => {
-    addFormRef.value.open({
-        title: '新增'
-    })
-}
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    tableStore.index()
-})
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+    <div class="default-main">
+        <TableHeader ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="新能源场站名称">
+                    <el-input v-model="tableStore.table.params.name" clearable placeholder="输入关键字筛选" />
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <!--弹框-->
+        <addForm ref="addFormRef" @onSubmit="tableStore.index()" />
+    </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 addForm from './components/addForm.vue'
+import { useDictData } from '@/stores/dictData'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { delNewStation } from '@/api/device-boot/newEnergy'
+defineOptions({
+    name: 'newEnergy/newEnergyLedger'
+})
+const dictData = useDictData()
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const newEnergy = dictData.getBasicData('new_station_type')
+const scaleList = dictData.getBasicData('Dev_Voltage_Stand')
+const tableRef = ref()
+const TableHeaderRef = ref()
+const addFormRef = ref()
+const tableStore = new TableStore({
+    url: '/device-boot/newStation/queryPage',
+    method: 'POST',
+    column: [
+        {
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'name', title: '新能源场站名称' },
+        {
+            field: 'stationType',
+            title: '新能源场站类型',
+
+            formatter: (row: any) => newEnergy.filter(item => item.id == row.cellValue)[0]?.name
+        },
+        {
+            field: 'scale',
+            title: '电压等级',
+
+            formatter: (row: any) => scaleList.filter(item => item.id == row.cellValue)[0]?.name
+        },
+        { field: 'ratedPower', title: '额定有功功率(kW)' },
+        { field: 'longitude', title: '经度' },
+        { field: 'latitude', title: '纬度' },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            render: 'buttons',
+          
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '修改',
+                    type: 'primary',
+                    icon: 'el-icon-edit',
+                    render: 'basicButton',
+                    click: row => {
+                        addFormRef.value.open({
+                            title: '修改',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'delete',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除该数据吗？'
+                    },
+                    click: row => {
+                        delNewStation({ ids: row.id }).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    },
+    loadCallback: () => {}
+})
+tableStore.table.params.name = ''
+const add = () => {
+    addFormRef.value.open({
+        title: '新增'
+    })
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/bearingCapacity/evaluationList/index.vue b/src/views/pqs/bearingCapacity/evaluationList/index.vue
index 6369d2ad..f7d4a2e0 100644
--- a/src/views/pqs/bearingCapacity/evaluationList/index.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/index.vue
@@ -136,7 +136,7 @@ const tableStore: any = new TableStore({
         { field: 'evaluateDate', title: '评估日期' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue
index 5c0ac06c..8540fa92 100644
--- a/src/views/pqs/bearingCapacity/userManagement/index.vue
+++ b/src/views/pqs/bearingCapacity/userManagement/index.vue
@@ -187,7 +187,7 @@ const tableStore: any = new TableStore({
         { field: 'createBy', title: '创建者' },
         { field: 'createTime', title: '创建日期' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/business/log/frontLog/index.vue b/src/views/pqs/business/log/frontLog/index.vue
index ae00d56f..9b23e827 100644
--- a/src/views/pqs/business/log/frontLog/index.vue
+++ b/src/views/pqs/business/log/frontLog/index.vue
@@ -77,7 +77,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/business/terminal/FrontManagement/index.vue b/src/views/pqs/business/terminal/FrontManagement/index.vue
index 2a5087e9..93dd3947 100644
--- a/src/views/pqs/business/terminal/FrontManagement/index.vue
+++ b/src/views/pqs/business/terminal/FrontManagement/index.vue
@@ -315,7 +315,7 @@ const tableStore = new TableStore({
         { title: '描述', field: 'remark' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
diff --git a/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue b/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
index 18a4b85e..b7f021e5 100644
--- a/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
+++ b/src/views/pqs/business/terminal/transformerStrategy/components/addLedger.vue
@@ -328,7 +328,7 @@ const tableStore = new TableStore({
             field: 'tfDescribe'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
diff --git a/src/views/pqs/business/terminal/transformerStrategy/index.vue b/src/views/pqs/business/terminal/transformerStrategy/index.vue
index 3047a291..39667d41 100644
--- a/src/views/pqs/business/terminal/transformerStrategy/index.vue
+++ b/src/views/pqs/business/terminal/transformerStrategy/index.vue
@@ -161,7 +161,7 @@ const tableStore = new TableStore({
             field: 'tfDescribe'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
diff --git a/src/views/pqs/business/terminal/userLedger/index.vue b/src/views/pqs/business/terminal/userLedger/index.vue
index fd703e40..d389c33a 100644
--- a/src/views/pqs/business/terminal/userLedger/index.vue
+++ b/src/views/pqs/business/terminal/userLedger/index.vue
@@ -1,315 +1,315 @@
-<template>
-    <div class="default-main">
-        <TableHeader ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="项目名称">
-                    <el-input
-                        style="width: 200px"
-                        placeholder="请输入项目名称"
-                        v-model="tableStore.table.params.projectName"
-                        clearable
-                        maxlength="32"
-                        show-word-limit
-                    ></el-input>
-                </el-form-item>
-                <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
-                        <el-option
-                            v-for="item in areaOptionList"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.name"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-                <!-- <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate" :loading="loading">
-                    模板下载
-                </el-button>
-                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button> -->
-            </template>
-        </TableHeader>
-        <Table ref="tableRef"  />
-
-        <el-dialog title="详情" width="60%" v-model="dialogShow" v-if="dialogShow">
-            <DetailInfo :id="userId" :openType="'sourcesOfInterference'"></DetailInfo>
-        </el-dialog>
-        <!-- 批量导入 -->
-        <sensitive-user-popup ref="sensitiveUserPopup" />
-
-        <!-- 查看详情 detail 新增/修改 create-->
-        <addForm ref="addForms" @onSubmit="tableStore.index()" :openType="'sourcesOfInterference'"></addForm>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, nextTick, watch } 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 addForm from './components/addForm.vue'
-import SensitiveUserPopup from './components/sensitiveUserPopup.vue'
-import { useDictData } from '@/stores/dictData'
-import { useRouter } from 'vue-router'
-import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form'
-import DetailInfo from './components/detail.vue'
-import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
-import { deleteUserReport } from '@/api/supervision-boot/delete/index'
-const addForms = ref()
-const dictData = useDictData()
-const sensitiveUserPopup = ref()
-const TableHeaderRef = ref()
-const loading = ref(false)
-const areaOptionList = dictData.getBasicData('jibei_area')
-const { push, options, currentRoute } = useRouter()
-import { useAdminInfo } from '@/stores/adminInfo'
-defineOptions({
-    name: 'BusinessAdministrator/TerminalManagement/userLedger'
-})
-
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const tableStore = new TableStore({
-    url: '/supervision-boot/userReport/getUserLedgerPage',
-    // publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            title: '序号',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'city', title: '所在地市', minWidth: 80 },
-        { field: 'substation', title: '厂站名称', minWidth: 100 },
-        { field: 'projectName', title: '项目名称', minWidth: 170 },
-        {
-            field: 'userType',
-            title: '用户性质',
-            minWidth: 150,
-            formatter: (obj: any) => {
-                const userType = obj.row.userType
-                return getUserTypeName(userType)
-            }
-        },
-
-        // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
-        { field: 'ratePower', title: '装机容量(MW)', minWidth: 130 },
-        {
-            field: 'createBy',
-            title: '创建人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '详细信息',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        lookInfo(row.id)
-                    }
-                },
-
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-             
-
-                    click: row => {
-                        addForms.value.filterUsers([6])
-
-                        addForms.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                },
-         
-               
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    }
-})
-tableStore.table.params.city = ''
-tableStore.table.params.orgId = adminInfo.$state.deptId
-tableStore.table.params.projectName = ''
-tableStore.table.params.loadType = ''
-tableStore.table.params.userName = ''
-tableStore.table.params.relationUserName = ''
-tableStore.table.params.aisFileUpload = ''
-
-const userId = ref()
-const dialogShow = ref(false)
-
-const lookInfo = (id: string) => {
-    userId.value = id
-    dialogShow.value = true
-}
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-            deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                ElMessage({
-                    type: 'success',
-                    message: '删除成功!'
-                })
-                tableStore.index()
-            })
-        })
-    }
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        dataType: 1,
-        reason: value
-    }
-    await cancelFormData(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-
-// 新增
-const addFormModel = () => {
-    addForms.value.filterUsers([6])
-
-    setTimeout(() => {
-        addForms.value.open({
-            title: '用户档案录入'
-        })
-    })
-}
-/**获取用户性质*/
-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 '新建电网工程'
-}
-//导出模板
-const exportExcelTemplate = async () => {
-    loading.value = true
-    await downloadSensitiveReportTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '干扰源用户台账模板'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-
-//批量导入用户数据
-const importUserData = () => {
-    sensitiveUserPopup.value.open('导入干扰源用户')
-}
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(
-    () => props.id,
-    async (newValue, oldValue) => {
-        if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-        const fullId = newValue.split('@')[0]
-        let nowTime = Date.now()
-        const routeTime = Number(newValue.split('@')[1])
-        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-        await getUserReportById(fullId).then(res => {
-            if (res && res.code == 'A0000') {
-                addForms.value.setcontroFlag()
-                addForms.value.open({
-                    title: '重新发起',
-                    row: res.data
-                })
-            }
-        })
-    },
-    { immediate: true }
-)
-</script>
+<template>
+    <div class="default-main">
+        <TableHeader ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="项目名称">
+                    <el-input
+                        style="width: 200px"
+                        placeholder="请输入项目名称"
+                        v-model="tableStore.table.params.projectName"
+                        clearable
+                        maxlength="32"
+                        show-word-limit
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="所在地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                        <el-option
+                            v-for="item in areaOptionList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.name"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
+                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+                <!-- <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate" :loading="loading">
+                    模板下载
+                </el-button>
+                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button> -->
+            </template>
+        </TableHeader>
+        <Table ref="tableRef"  />
+
+        <el-dialog title="详情" width="60%" v-model="dialogShow" v-if="dialogShow">
+            <DetailInfo :id="userId" :openType="'sourcesOfInterference'"></DetailInfo>
+        </el-dialog>
+        <!-- 批量导入 -->
+        <sensitive-user-popup ref="sensitiveUserPopup" />
+
+        <!-- 查看详情 detail 新增/修改 create-->
+        <addForm ref="addForms" @onSubmit="tableStore.index()" :openType="'sourcesOfInterference'"></addForm>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick, watch } 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 addForm from './components/addForm.vue'
+import SensitiveUserPopup from './components/sensitiveUserPopup.vue'
+import { useDictData } from '@/stores/dictData'
+import { useRouter } from 'vue-router'
+import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form'
+import DetailInfo from './components/detail.vue'
+import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
+import { deleteUserReport } from '@/api/supervision-boot/delete/index'
+const addForms = ref()
+const dictData = useDictData()
+const sensitiveUserPopup = ref()
+const TableHeaderRef = ref()
+const loading = ref(false)
+const areaOptionList = dictData.getBasicData('jibei_area')
+const { push, options, currentRoute } = useRouter()
+import { useAdminInfo } from '@/stores/adminInfo'
+defineOptions({
+    name: 'BusinessAdministrator/TerminalManagement/userLedger'
+})
+
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const tableStore = new TableStore({
+    url: '/supervision-boot/userReport/getUserLedgerPage',
+    // publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'city', title: '所在地市', minWidth: 80 },
+        { field: 'substation', title: '厂站名称', minWidth: 100 },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
+        {
+            field: 'userType',
+            title: '用户性质',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                const userType = obj.row.userType
+                return getUserTypeName(userType)
+            }
+        },
+
+        // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+        { field: 'ratePower', title: '装机容量(MW)', minWidth: 130 },
+        {
+            field: 'createBy',
+            title: '创建人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+           
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详细信息',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        lookInfo(row.id)
+                    }
+                },
+
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+             
+
+                    click: row => {
+                        addForms.value.filterUsers([6])
+
+                        addForms.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                },
+         
+               
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    }
+})
+tableStore.table.params.city = ''
+tableStore.table.params.orgId = adminInfo.$state.deptId
+tableStore.table.params.projectName = ''
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.relationUserName = ''
+tableStore.table.params.aisFileUpload = ''
+
+const userId = ref()
+const dialogShow = ref(false)
+
+const lookInfo = (id: string) => {
+    userId.value = id
+    dialogShow.value = true
+}
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功!'
+                })
+                tableStore.index()
+            })
+        })
+    }
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        dataType: 1,
+        reason: value
+    }
+    await cancelFormData(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+
+// 新增
+const addFormModel = () => {
+    addForms.value.filterUsers([6])
+
+    setTimeout(() => {
+        addForms.value.open({
+            title: '用户档案录入'
+        })
+    })
+}
+/**获取用户性质*/
+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 '新建电网工程'
+}
+//导出模板
+const exportExcelTemplate = async () => {
+    loading.value = true
+    await downloadSensitiveReportTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '干扰源用户台账模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+
+//批量导入用户数据
+const importUserData = () => {
+    sensitiveUserPopup.value.open('导入干扰源用户')
+}
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(
+    () => props.id,
+    async (newValue, oldValue) => {
+        if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+        const fullId = newValue.split('@')[0]
+        let nowTime = Date.now()
+        const routeTime = Number(newValue.split('@')[1])
+        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+        await getUserReportById(fullId).then(res => {
+            if (res && res.code == 'A0000') {
+                addForms.value.setcontroFlag()
+                addForms.value.open({
+                    title: '重新发起',
+                    row: res.data
+                })
+            }
+        })
+    },
+    { immediate: true }
+)
+</script>
diff --git a/src/views/pqs/database/case/index.vue b/src/views/pqs/database/case/index.vue
index d48a7210..899d48a6 100644
--- a/src/views/pqs/database/case/index.vue
+++ b/src/views/pqs/database/case/index.vue
@@ -1,274 +1,274 @@
-<template>
-    <div class="default-main">
-        <!-- 案例库 -->
-        <TableHeader ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="名称">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入搜索名称" maxlength="32" show-word-limit/>
-                </el-form-item>
-
-
-            </template>
-
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="addUser" v-if="information">新增</el-button>
-                <el-button icon="el-icon-View" type="primary" @click="checkOutTheCriteria">查看常见治理措施</el-button>
-
-                <!-- <el-upload :show-file-list="false" action="" :auto-upload="false" class="ml10" :on-change="choose"
-                    v-if="information">
-                    <el-button icon="el-icon-Top" type="primary">上传常见治理措施</el-button>
-                </el-upload>
-                <el-button icon="el-icon-Download" type="primary" class="ml10" @click="downloadTheReport">
-                    下载常见治理措施
-                </el-button> -->
-            </template>
-        </TableHeader>
-        <Table ref="tableRef"></Table>
-        <!-- 弹框 -->
-        <PopupEdit ref="popupEditRef" @onSubmit="tableStore.index()" />
-        <!-- 简介详情 -->
-        <el-dialog v-model="dialogVisible" title="事件简介" width="60%">
-            <div class="editor" v-html="summary"></div>
-        </el-dialog>
-        <!-- 抽屉 -->
-        <drawer ref="drawerRef" />
-        <!-- 文件 -->
-        <annex ref="annexRef" />
-    </div>
-</template>
-<script setup lang="ts">
-import { onMounted, ref, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import TableHeader from '@/components/table/header/index.vue'
-import Table from '@/components/table/index.vue'
-import PopupEdit from './components/form.vue'
-import { libcaseBeleteyById } from '@/api/supervision-boot/database/index'
-import drawer from './components/drawer.vue'
-import annex from './components/annex.vue'
-import { ElMessage } from 'element-plus'
-import { uploadFile, getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
-import { addStandardCase, queryStandardCase } from '@/api/supervision-boot/database/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-import katex from "katex";
-import "katex/dist/katex.css";
-const adminInfo = useAdminInfo()
-defineOptions({
-    name: 'database/case'
-})
-
-const popupEditRef = ref()
-const drawerRef = ref()
-const TableHeaderRef = ref()
-const annexRef = ref()
-const dialogVisible = ref(false)
-const summary = ref('')
-const information = adminInfo.roleCode.includes('information_info')
-const tableStore = new TableStore({
-    url: '/supervision-boot/libcase/pageQuery',
-    method: 'POST',
-    column: [
-        { title: '电能质量事件名称', field: 'name' },
-        {
-            title: '发生地点',
-            field: 'location'
-        },
-        // {
-        //     title: '发生事件',
-        //     field: 'type'
-        // },
-        // {
-        //     title: '事件经过',
-        //     field: 'process'
-        // },
-        // {
-        //     title: '处理措施',
-        //     field: 'measures'
-        // },
-        // {
-        //     title: '治理效果',
-        //     field: 'effect'
-        // },
-        {
-            title: '事件简介',
-            width: '140',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'view',
-                    title: '查看',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        dialogVisible.value = true
-                        summary.value = row.summary
-                        setTimeout(() => {
-
-                            const spans = document.querySelectorAll('span[data-value]');
-                            // 遍历每个 span 标签  
-                            spans.forEach(function (span) {
-
-                                let val = katex.renderToString(span.getAttribute('data-value'), {
-                                    throwOnError: false,
-                                })
-                                var newDiv = span;
-                                newDiv.innerHTML = val;
-
-                                span.parentNode.replaceChild(newDiv, span);
-                            });
-
-                        }, 100)
-                    }
-                }
-            ]
-        },
-        {
-            title: '操作',
-            width: '200',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'view',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        annexRef.value.open(row)
-                    }
-                },
-                {
-                    name: 'view',
-                    title: '下载附件',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        annexRef.value.open(row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '修改',
-                    type: 'primary',
-                    disabled: row => {
-                        return !information
-                    },
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        popupEditRef.value.open('修改案例', row)
-                    }
-                },
-                {
-                    name: 'delete',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    disabled: row => {
-                        return !information
-                    },
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        libcaseBeleteyById({ id: row.id }).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    loadCallback: () => { }
-})
-tableStore.table.params.searchValue = ''
-// 弹框
-const addUser = () => {
-    popupEditRef.value.open('新增案例')
-}
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-    // console.log('🚀 ~ libcaseBeleteyById ~ tableStore:', tableStore)
-})
-const checkOutTheCriteria = () => {
-    queryStandardCase().then(res => {
-        drawerRef.value.open(res.data)
-    })
-}
-
-// 上传
-const choose = (e: any) => {
-    ElMessage.info('上传中,请稍等...')
-    uploadFile(e.raw, '/supervision/').then((row: any) => {
-        addStandardCase({ caseUrl: row.data.name }).then(res => {
-            ElMessage.success('上传成功！')
-        })
-    })
-    //
-}
-const downloadTheReport = () => {
-    queryStandardCase().then(res => {
-        let urls = res.data
-        let name = urls.match(/\/([^/]+)\.(\w+)$/)[1]
-        ElMessage.info('下载中,请稍等...')
-        downloadFile({ filePath: urls }).then((res: any) => {
-            let blob = new Blob([res], {
-                type: urls.includes('.pdf')
-                    ? 'application/pdf'
-                    : urls.includes('.docx')
-                        ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-                        : urls.includes('.xls')
-                            ? 'application/vnd.ms-excel'
-                            : urls.includes('.xlsx')
-                                ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-                                : urls.includes('.png')
-                                    ? 'image/png'
-                                    : urls.includes('.jpeg')
-                                        ? 'image/jpeg'
-                                        : urls.includes('.jpg')
-                                            ? 'image/jpg'
-                                            : ''
-            })
-            const url = window.URL.createObjectURL(blob)
-            const link = document.createElement('a')
-            link.href = url
-            link.download = name
-            document.body.appendChild(link)
-            link.click()
-            link.remove()
-        })
-    })
-}
-</script>
-<style lang="scss">
-.editor {
-    table {
-        width: 100%;
-        border-collapse: collapse;
-    }
-
-    th,
-    td {
-        border: 1px solid black;
-        padding: 8px;
-        text-align: center;
-    }
-
-    th {
-        background-color: #f2f2f2;
-        font-weight: bold;
-    }
-
-    td {
-        background-color: #ffffff;
-    }
-}
-</style>
+<template>
+    <div class="default-main">
+        <!-- 案例库 -->
+        <TableHeader ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="名称">
+                    <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输入搜索名称" maxlength="32" show-word-limit/>
+                </el-form-item>
+
+
+            </template>
+
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="addUser" v-if="information">新增</el-button>
+                <el-button icon="el-icon-View" type="primary" @click="checkOutTheCriteria">查看常见治理措施</el-button>
+
+                <!-- <el-upload :show-file-list="false" action="" :auto-upload="false" class="ml10" :on-change="choose"
+                    v-if="information">
+                    <el-button icon="el-icon-Top" type="primary">上传常见治理措施</el-button>
+                </el-upload>
+                <el-button icon="el-icon-Download" type="primary" class="ml10" @click="downloadTheReport">
+                    下载常见治理措施
+                </el-button> -->
+            </template>
+        </TableHeader>
+        <Table ref="tableRef"></Table>
+        <!-- 弹框 -->
+        <PopupEdit ref="popupEditRef" @onSubmit="tableStore.index()" />
+        <!-- 简介详情 -->
+        <el-dialog v-model="dialogVisible" title="事件简介" width="60%">
+            <div class="editor" v-html="summary"></div>
+        </el-dialog>
+        <!-- 抽屉 -->
+        <drawer ref="drawerRef" />
+        <!-- 文件 -->
+        <annex ref="annexRef" />
+    </div>
+</template>
+<script setup lang="ts">
+import { onMounted, ref, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import TableHeader from '@/components/table/header/index.vue'
+import Table from '@/components/table/index.vue'
+import PopupEdit from './components/form.vue'
+import { libcaseBeleteyById } from '@/api/supervision-boot/database/index'
+import drawer from './components/drawer.vue'
+import annex from './components/annex.vue'
+import { ElMessage } from 'element-plus'
+import { uploadFile, getFileNameAndFilePath, downloadFile } from '@/api/system-boot/file'
+import { addStandardCase, queryStandardCase } from '@/api/supervision-boot/database/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import katex from "katex";
+import "katex/dist/katex.css";
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'database/case'
+})
+
+const popupEditRef = ref()
+const drawerRef = ref()
+const TableHeaderRef = ref()
+const annexRef = ref()
+const dialogVisible = ref(false)
+const summary = ref('')
+const information = adminInfo.roleCode.includes('information_info')
+const tableStore = new TableStore({
+    url: '/supervision-boot/libcase/pageQuery',
+    method: 'POST',
+    column: [
+        { title: '电能质量事件名称', field: 'name' },
+        {
+            title: '发生地点',
+            field: 'location'
+        },
+        // {
+        //     title: '发生事件',
+        //     field: 'type'
+        // },
+        // {
+        //     title: '事件经过',
+        //     field: 'process'
+        // },
+        // {
+        //     title: '处理措施',
+        //     field: 'measures'
+        // },
+        // {
+        //     title: '治理效果',
+        //     field: 'effect'
+        // },
+        {
+            title: '事件简介',
+            width: '140',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'view',
+                    title: '查看',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        dialogVisible.value = true
+                        summary.value = row.summary
+                        setTimeout(() => {
+
+                            const spans = document.querySelectorAll('span[data-value]');
+                            // 遍历每个 span 标签  
+                            spans.forEach(function (span) {
+
+                                let val = katex.renderToString(span.getAttribute('data-value'), {
+                                    throwOnError: false,
+                                })
+                                var newDiv = span;
+                                newDiv.innerHTML = val;
+
+                                span.parentNode.replaceChild(newDiv, span);
+                            });
+
+                        }, 100)
+                    }
+                }
+            ]
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '200',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'view',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        annexRef.value.open(row)
+                    }
+                },
+                {
+                    name: 'view',
+                    title: '下载附件',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        annexRef.value.open(row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '修改',
+                    type: 'primary',
+                    disabled: row => {
+                        return !information
+                    },
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        popupEditRef.value.open('修改案例', row)
+                    }
+                },
+                {
+                    name: 'delete',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    disabled: row => {
+                        return !information
+                    },
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        libcaseBeleteyById({ id: row.id }).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => { }
+})
+tableStore.table.params.searchValue = ''
+// 弹框
+const addUser = () => {
+    popupEditRef.value.open('新增案例')
+}
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+    // console.log('🚀 ~ libcaseBeleteyById ~ tableStore:', tableStore)
+})
+const checkOutTheCriteria = () => {
+    queryStandardCase().then(res => {
+        drawerRef.value.open(res.data)
+    })
+}
+
+// 上传
+const choose = (e: any) => {
+    ElMessage.info('上传中,请稍等...')
+    uploadFile(e.raw, '/supervision/').then((row: any) => {
+        addStandardCase({ caseUrl: row.data.name }).then(res => {
+            ElMessage.success('上传成功！')
+        })
+    })
+    //
+}
+const downloadTheReport = () => {
+    queryStandardCase().then(res => {
+        let urls = res.data
+        let name = urls.match(/\/([^/]+)\.(\w+)$/)[1]
+        ElMessage.info('下载中,请稍等...')
+        downloadFile({ filePath: urls }).then((res: any) => {
+            let blob = new Blob([res], {
+                type: urls.includes('.pdf')
+                    ? 'application/pdf'
+                    : urls.includes('.docx')
+                        ? 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+                        : urls.includes('.xls')
+                            ? 'application/vnd.ms-excel'
+                            : urls.includes('.xlsx')
+                                ? 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+                                : urls.includes('.png')
+                                    ? 'image/png'
+                                    : urls.includes('.jpeg')
+                                        ? 'image/jpeg'
+                                        : urls.includes('.jpg')
+                                            ? 'image/jpg'
+                                            : ''
+            })
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a')
+            link.href = url
+            link.download = name
+            document.body.appendChild(link)
+            link.click()
+            link.remove()
+        })
+    })
+}
+</script>
+<style lang="scss">
+.editor {
+    table {
+        width: 100%;
+        border-collapse: collapse;
+    }
+
+    th,
+    td {
+        border: 1px solid black;
+        padding: 8px;
+        text-align: center;
+    }
+
+    th {
+        background-color: #f2f2f2;
+        font-weight: bold;
+    }
+
+    td {
+        background-color: #ffffff;
+    }
+}
+</style>
diff --git a/src/views/pqs/database/stencil/index.vue b/src/views/pqs/database/stencil/index.vue
index e73243ba..31213914 100644
--- a/src/views/pqs/database/stencil/index.vue
+++ b/src/views/pqs/database/stencil/index.vue
@@ -49,7 +49,7 @@ const tableStore = new TableStore({
             field: 'createTime'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '280',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
index c910818f..715edf9c 100644
--- a/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/TransientEventList/index.vue
@@ -179,7 +179,7 @@ const tableStore = new TableStore({
         { field: 'duration', title: '持续时间(s)', minWidth: '100' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
index 3ce40832..0f7e8ce1 100644
--- a/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/qualifiedRate/index.vue
@@ -74,9 +74,14 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="电网标志">
-                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
-                        <el-option v-for="item in sign" :key="item.id" :label="item.name" :value="item.algoDescribe" />
-                    </el-select>
+                        <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
+                            <el-option
+                                v-for="item in sign"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.algoDescribe"
+                            />
+                        </el-select>
                     </el-form-item>
                 </template>
             </TableHeader>
@@ -159,6 +164,8 @@ const tableStore = new TableStore({
             title: '电压等级',
             field: 'voltageLevel',
             align: 'center',
+            minWidth: 80,
+
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -167,6 +174,7 @@ const tableStore = new TableStore({
             title: '网络参数',
             field: 'networkParam',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -175,6 +183,7 @@ const tableStore = new TableStore({
             title: '监测点名称',
             field: 'lineName',
             align: 'center',
+            minWidth: 120,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -183,6 +192,7 @@ const tableStore = new TableStore({
             title: '厂家',
             field: 'factoryName',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -191,6 +201,7 @@ const tableStore = new TableStore({
             title: '谐波电压(%)',
             field: 'harmonicVoltage',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -199,6 +210,7 @@ const tableStore = new TableStore({
             title: '电压偏差(%)',
             field: 'voltageOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -207,6 +219,7 @@ const tableStore = new TableStore({
             title: '三相电压不平衡度(%)',
             field: 'voltageUnbalance',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -215,6 +228,7 @@ const tableStore = new TableStore({
             title: '间谐波电压含有率(%)',
             field: 'interHarmonic',
             align: 'center',
+            minWidth: 100,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -223,6 +237,7 @@ const tableStore = new TableStore({
             title: '谐波电流(%)',
             field: 'harmonicCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -231,6 +246,7 @@ const tableStore = new TableStore({
             title: '负序电流(%)',
             field: 'negativeCurrent',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -239,6 +255,7 @@ const tableStore = new TableStore({
             title: '频率偏差(%)',
             field: 'freqOffset',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -247,6 +264,7 @@ const tableStore = new TableStore({
             title: '闪变(%)',
             field: 'flicker',
             align: 'center',
+            minWidth: 80,
             formatter: function (row) {
                 return row.cellValue != 3.14159 ? row.cellValue : '/'
             }
@@ -256,7 +274,7 @@ const tableStore = new TableStore({
     loadCallback: () => {
         tableStore.table.data = tree2List(tableStore.table.data, Math.random() * 1000)
         tableStore.table.column[0].title = tableStore.table.params.statisticalType.name
-      
+
         chartsRef.value && chartsRef.value.getTableStoreParams(tableStore.table.params)
         setTimeout(() => {
             activeName.value == 0 && tableRef.value && tableRef.value.getRef().setAllTreeExpand(true)
@@ -312,7 +330,7 @@ const tree2List = (list: any, id?: string) => {
     })
     // 返回结果数组
     return arr
-  }
+}
 onMounted(() => {
     tableStore.index()
 })
diff --git a/src/views/pqs/harmonicMonitoring/detailed/division/components/aListOfLoadData.vue b/src/views/pqs/harmonicMonitoring/detailed/division/components/aListOfLoadData.vue
index a063f538..6193e72e 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/division/components/aListOfLoadData.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/division/components/aListOfLoadData.vue
@@ -69,7 +69,7 @@ const tableStore = new TableStore({
         { title: '更新时间', field: 'updateTime' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/harmonicMonitoring/detailed/division/index.vue b/src/views/pqs/harmonicMonitoring/detailed/division/index.vue
index 711e4c3a..31e29d36 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/division/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/division/index.vue
@@ -49,7 +49,7 @@ const tableStore = new TableStore({
         { title: '计算时间', field: 'updateTime' },
         { title: '计算窗口', field: 'timeWindow' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue
index e2967f50..9e21ca8f 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/regionalAssessment.vue
@@ -107,9 +107,9 @@ const tableStore = new TableStore({
             minWidth: 150
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+          
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue
index cb460c0e..5dd1aed5 100644
--- a/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/pollutionReport/components/userEvaluation.vue
@@ -106,9 +106,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+            
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
index 1ee6ca13..a38957f5 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components/table.vue
@@ -123,7 +123,8 @@ const tableStore = new TableStore({
         { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
         {
             field: 'ip',
-            title: '网络参数' ,width:'120px',
+            title: '网络参数',
+            width: '120px',
             formatter: ({ row }: any) => {
                 return row.ip || '/'
             }
@@ -249,7 +250,7 @@ const searchEvent = debounce(() => {
             (item: any) => searchProps.some(key => String(item[key]).toLowerCase().indexOf(filterVal) > -1),
             options
         )
-       // console.log('🚀 ~ searchEvent ~ rest:', rest)
+        // console.log('🚀 ~ searchEvent ~ rest:', rest)
 
         tableStore.table.data = rest
 
@@ -288,6 +289,10 @@ const exportEvent = () => {
     })
     exportModelJB(form)
         .then(async res => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
             })
diff --git a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue
index 86f925df..ab56ade6 100644
--- a/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue
+++ b/src/views/pqs/harmonicMonitoring/embed/lntegruty/components_JB/table.vue
@@ -123,7 +123,8 @@ const tableStore = new TableStore({
         { field: 'name', title: '电网拓扑', width: 350, type: 'radio', align: 'left', treeNode: true },
         {
             field: 'ip',
-            title: '网络参数' ,width:'120px',
+            title: '网络参数',
+            width: '120px',
             formatter: ({ row }: any) => {
                 return row.ip || '/'
             }
@@ -249,7 +250,7 @@ const searchEvent = debounce(() => {
             (item: any) => searchProps.some(key => String(item[key]).toLowerCase().indexOf(filterVal) > -1),
             options
         )
-       // console.log('🚀 ~ searchEvent ~ rest:', rest)
+        // console.log('🚀 ~ searchEvent ~ rest:', rest)
 
         tableStore.table.data = rest
 
@@ -288,6 +289,10 @@ const exportEvent = () => {
     })
     exportModelJB(form)
         .then(async res => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
             })
diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
index 15653705..7dd9baa5 100644
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
@@ -86,7 +86,7 @@ const tableStore = new TableStore({
                 item.data[k.r][k.c].v ? (item.data[k.r][k.c] = k.v) : ''
             })
         })
-       
+
         setTimeout(() => {
             luckysheet.create({
                 container: 'luckysheet',
@@ -126,7 +126,6 @@ const changetype = (val: any) => {
     reportForm.value = val.reportForm
 }
 const selectChange = () => {
-
     if (tableStore.table.data.length != 0) {
         setTimeout(() => {
             luckysheet && luckysheet?.resize()
@@ -152,6 +151,10 @@ const exportReport = () => {
     })
     exportModelJB(form)
         .then(async res => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
             })
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
index f603095a..a55b61ce 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/passing/index.vue
@@ -1,129 +1,141 @@
-<!--业务用户管理界面-->
-<template>
-    <div class="default-main">
-        <TableHeader datePicker area showExport>
-            <template v-slot:select>
-                <el-form-item label="筛选数据">
-                    <el-input v-model="tableStore.table.params.searchValue" clearable   maxlength="32" show-word-limit placeholder="筛选数据" />
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <!-- <el-button type="primary" @click="exportEvent" class="ml10" icon="el-icon-Download">导出</el-button> -->
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref="tableRef"></Table>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import { pageTable } from '@/api/harmonic-boot/luckyexcel.ts'
-
-defineOptions({
-    name: 'harmonic-boot/reate/word'
-})
-const dictData = useDictData()
-//区域联级选择
-const industry = dictData.getBasicData('Interference_Source')
-//用户信息弹出框
-const tableRef = ref()
-
-const tableStore = new TableStore({
-    url: '/harmonic-boot/qualifiedReport/pageTable',
-    method: 'POST',
-    column: [
-        {
-            title: '序号',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '变电站', field: 'subName', width: 200 },
-        { title: '监测点名称', field: 'lineName', width: 200 },
-        {
-            title: '行业类型',
-            field: 'businessType',
-            formatter: (row: any) => {
-                return industry.find((item: any) => item.id == row.cellValue)?.name || '/'
-            }
-        },
-        {
-            title: '分类等级',
-            field: 'calssificationGrade',
-            formatter: (row: any) => {
-                return row.cellValue || '/'
-            }
-        },
-        { title: '电压等级', field: 'voltageScale' },
-        {
-            title: '上级变电站',
-            field: 'superiorsSubstation',
-            formatter: (row: any) => {
-                return row.cellValue || '/'
-            }
-        },
-        {
-            title: '挂接线路',
-            field: 'hangLine',
-            formatter: (row: any) => {
-                return row.cellValue || '/'
-            }
-        },
-        {
-            title: 'PT变比',
-            field: 'pt',
-            formatter: (row: any) => {
-                return row.row.pt1 + '/' + row.row.pt2
-            }
-        },
-        {
-            title: 'CT变比',
-            field: 'ct',
-            formatter: (row: any) => {
-                return row.row.ct1 + '/' + row.row.ct2
-            }
-        },
-        { title: '短路容量(MVA)', field: 'shortCapacity' },
-        { title: '终端容量(MVA)', field: 'deviceCapacity' },
-        { title: '协议容量(MVA)', field: 'dealCapacity' },
-        { title: '谐波情况', field: 'harmDes' },
-        { title: '电能质量情况', field: 'powerDes' }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.beginTime = tableStore.table.params.startTime
-        tableStore.table.params.deptId = tableStore.table.params.deptIndex
-    }
-})
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-tableStore.table.params.searchValue = ''
-provide('tableStore', tableStore)
-// 导出
-const exportEvent = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    pageTable(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '合格率报告', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-</script>
+<!--业务用户管理界面-->
+<template>
+    <div class="default-main">
+        <TableHeader datePicker area showExport>
+            <template v-slot:select>
+                <el-form-item label="筛选数据">
+                    <el-input
+                        v-model="tableStore.table.params.searchValue"
+                        clearable
+                        maxlength="32"
+                        show-word-limit
+                        placeholder="筛选数据"
+                    />
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <!-- <el-button type="primary" @click="exportEvent" class="ml10" icon="el-icon-Download">导出</el-button> -->
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref="tableRef"></Table>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { pageTable } from '@/api/harmonic-boot/luckyexcel.ts'
+
+defineOptions({
+    name: 'harmonic-boot/reate/word'
+})
+const dictData = useDictData()
+//区域联级选择
+const industry = dictData.getBasicData('Interference_Source')
+//用户信息弹出框
+const tableRef = ref()
+
+const tableStore = new TableStore({
+    url: '/harmonic-boot/qualifiedReport/pageTable',
+    method: 'POST',
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '变电站', field: 'subName', width: 200 },
+        { title: '监测点名称', field: 'lineName', width: 200 },
+        {
+            title: '行业类型',
+            field: 'businessType',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return industry.find((item: any) => item.id == row.cellValue)?.name || '/'
+            }
+        },
+        {
+            title: '分类等级',
+            field: 'calssificationGrade',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+        { title: '电压等级', field: 'voltageScale', minWidth: 80 },
+        {
+            title: '上级变电站',
+            field: 'superiorsSubstation',
+            minWidth: 90,
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+        {
+            title: '挂接线路',
+            field: 'hangLine',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return row.cellValue || '/'
+            }
+        },
+        {
+            title: 'PT变比',
+            field: 'pt',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return row.row.pt1 + '/' + row.row.pt2
+            }
+        },
+        {
+            title: 'CT变比',
+            field: 'ct',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return row.row.ct1 + '/' + row.row.ct2
+            }
+        },
+        { title: '短路容量(MVA)', field: 'shortCapacity', minWidth: 80 },
+        { title: '终端容量(MVA)', field: 'deviceCapacity', minWidth: 80 },
+        { title: '协议容量(MVA)', field: 'dealCapacity', minWidth: 80 },
+        { title: '谐波情况', field: 'harmDes', minWidth: 80 },
+        { title: '电能质量情况', field: 'powerDes', minWidth: 100 }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.beginTime = tableStore.table.params.startTime
+        tableStore.table.params.deptId = tableStore.table.params.deptIndex
+    }
+})
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+// 导出
+const exportEvent = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    pageTable(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '合格率报告', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+</script>
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/region/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/region/index.vue
index 14d7e8cf..75fd54bb 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/region/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/region/index.vue
@@ -87,6 +87,10 @@ const exportEvent = () => {
         endTime: TableHeaderRef.value.datePickerRef.timeValue[1]
     })
         .then((res: any) => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
             })
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
index df96fd38..f519438e 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -41,7 +41,13 @@
                     </template>
                     <template #operation>
                         <el-button icon="el-icon-Download" type="primary" @click="exportEvent">导出excel</el-button>
-                        <el-button icon="el-icon-Download" :loading="loading" @click="exportReport" type="primary" v-if="VITE_FLAG">
+                        <el-button
+                            icon="el-icon-Download"
+                            :loading="loading"
+                            @click="exportReport"
+                            type="primary"
+                            v-if="VITE_FLAG"
+                        >
                             下载报告
                         </el-button>
                     </template>
@@ -189,6 +195,10 @@ const exportReport = () => {
     })
     exportModelJB(form)
         .then(async res => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
             })
diff --git a/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue b/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
index 192843ed..c1f5aa98 100644
--- a/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
@@ -151,6 +151,10 @@ const exportEvent = () => {
         ElMessage('生成报告中...')
         exportModel(form)
             .then((res: any) => {
+                if (res == undefined) {
+                    loading.value = false
+                    return
+                }
                 let blob = new Blob([res], {
                     type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
                 })
diff --git a/src/views/pqs/process/definition/index.vue b/src/views/pqs/process/definition/index.vue
index c81286fc..dc8df8a9 100644
--- a/src/views/pqs/process/definition/index.vue
+++ b/src/views/pqs/process/definition/index.vue
@@ -1,141 +1,141 @@
-<!--业务用户管理界面-->
-<template>
-    <div class="default-main">
-        <div v-show="addedShow">
-            <TableHeader>
-                <template v-slot:select>
-                    <el-form-item label="筛选数据">
-                        <el-input v-model="tableStore.table.params.name" clearable placeholder="筛选数据" />
-                    </el-form-item>
-                </template>
-
-                <template v-slot:operation>
-                    <el-button type="primary" @click="add" class="ml10" icon="el-icon-Plus">新增</el-button>
-                </template>
-            </TableHeader>
-            <!--表格-->
-            <Table ref="tableRef"></Table>
-        </div>
-        <!-- 设计流程 -->
-        <editor v-if="!addedShow" :model="model" @quit="quit" />
-        <!-- 配置表单 -->
-        <Allocation ref="allocationRef" @quit="tableStore.index()" />
-    </div>
-</template>
-
-<script setup lang="ts">
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import Allocation from './allocation.vue'
-import { deleteDeploy } from '@/api/process-boot/bpm'
-import { onMounted, provide, ref } from 'vue'
-import { ElMessage } from 'element-plus'
-import editor from './editor/index.vue'
-
-defineOptions({
-    name: '/flowable/definition/index'
-})
-
-const tableRef = ref()
-const allocationRef = ref()
-const model = ref({})
-const addedShow = ref(true)
-
-const tableStore = new TableStore({
-    url: '/process-boot/flowable/definition/list',
-    method: 'GET',
-    column: [
-        {
-            title: '序号',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '流程标识', field: 'flowKey' },
-        { title: '流程分类', field: 'category' },
-        { title: '流程名称', field: 'name' },
-
-        {
-            title: '业务功能',
-            field: 'formId',
-            formatter: (row: any) => {
-                return row.cellValue == 1 ? '谐波普测计划' : row.cellValue == 2 ? '干扰源用户管理' : '暂无表单'
-            }
-        },
-        { title: '流程版本（V）', field: 'version' },
-
-    
-        { title: '部署时间', field: 'deploymentTime' },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '设计',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        model.value = row
-                        addedShow.value = false
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '配置主表单',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {
-                        allocationRef.value.open(row)
-                    }
-                },
-             
-                {
-                    name: 'del',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        deleteDeploy([row.id]).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.beginTime = tableStore.table.params.startTime
-        tableStore.table.params.deptId = tableStore.table.params.deptIndex
-    }
-})
-// 新增
-const add = () => {
-    model.value = {}
-    addedShow.value = false
-}
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-const quit = () => {
-    addedShow.value = true
-    tableStore.index()
-}
-tableStore.table.params.name = ''
-provide('tableStore', tableStore)
-</script>
+<!--业务用户管理界面-->
+<template>
+    <div class="default-main">
+        <div v-show="addedShow">
+            <TableHeader>
+                <template v-slot:select>
+                    <el-form-item label="筛选数据">
+                        <el-input v-model="tableStore.table.params.name" clearable placeholder="筛选数据" />
+                    </el-form-item>
+                </template>
+
+                <template v-slot:operation>
+                    <el-button type="primary" @click="add" class="ml10" icon="el-icon-Plus">新增</el-button>
+                </template>
+            </TableHeader>
+            <!--表格-->
+            <Table ref="tableRef"></Table>
+        </div>
+        <!-- 设计流程 -->
+        <editor v-if="!addedShow" :model="model" @quit="quit" />
+        <!-- 配置表单 -->
+        <Allocation ref="allocationRef" @quit="tableStore.index()" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import Allocation from './allocation.vue'
+import { deleteDeploy } from '@/api/process-boot/bpm'
+import { onMounted, provide, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import editor from './editor/index.vue'
+
+defineOptions({
+    name: '/flowable/definition/index'
+})
+
+const tableRef = ref()
+const allocationRef = ref()
+const model = ref({})
+const addedShow = ref(true)
+
+const tableStore = new TableStore({
+    url: '/process-boot/flowable/definition/list',
+    method: 'GET',
+    column: [
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '流程标识', field: 'flowKey' },
+        { title: '流程分类', field: 'category' },
+        { title: '流程名称', field: 'name' },
+
+        {
+            title: '业务功能',
+            field: 'formId',
+            formatter: (row: any) => {
+                return row.cellValue == 1 ? '谐波普测计划' : row.cellValue == 2 ? '干扰源用户管理' : '暂无表单'
+            }
+        },
+        { title: '流程版本（V）', field: 'version' },
+
+    
+        { title: '部署时间', field: 'deploymentTime' },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '设计',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        model.value = row
+                        addedShow.value = false
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '配置主表单',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {
+                        allocationRef.value.open(row)
+                    }
+                },
+             
+                {
+                    name: 'del',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteDeploy([row.id]).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.beginTime = tableStore.table.params.startTime
+        tableStore.table.params.deptId = tableStore.table.params.deptIndex
+    }
+})
+// 新增
+const add = () => {
+    model.value = {}
+    addedShow.value = false
+}
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+const quit = () => {
+    addedShow.value = true
+    tableStore.index()
+}
+tableStore.table.params.name = ''
+provide('tableStore', tableStore)
+</script>
diff --git a/src/views/pqs/runManage/assessment/components/dictionary/components/cable/index.vue b/src/views/pqs/runManage/assessment/components/dictionary/components/cable/index.vue
index 3d56a980..2840635b 100644
--- a/src/views/pqs/runManage/assessment/components/dictionary/components/cable/index.vue
+++ b/src/views/pqs/runManage/assessment/components/dictionary/components/cable/index.vue
@@ -62,9 +62,9 @@ const tableStore = new TableStore({
         { title: '零序电抗X0(Ω/km)', field: 'zeroX0', minWidth: '80' },
         { title: '零序电纳Y0(S/km)', field: 'zeroY0', minWidth: '80' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+          
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/runManage/assessment/components/dictionary/components/harmonicWave/index.vue b/src/views/pqs/runManage/assessment/components/dictionary/components/harmonicWave/index.vue
index f1ab520a..f91894e2 100644
--- a/src/views/pqs/runManage/assessment/components/dictionary/components/harmonicWave/index.vue
+++ b/src/views/pqs/runManage/assessment/components/dictionary/components/harmonicWave/index.vue
@@ -96,9 +96,9 @@ const tableStore = new TableStore({
         { title: '谐波49次', field: 'i49', minWidth: '80' },
         { title: '谐波50次', field: 'i50', minWidth: '80' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/runManage/assessment/components/dictionary/components/load/index.vue b/src/views/pqs/runManage/assessment/components/dictionary/components/load/index.vue
index aeeacc6d..48cb4c68 100644
--- a/src/views/pqs/runManage/assessment/components/dictionary/components/load/index.vue
+++ b/src/views/pqs/runManage/assessment/components/dictionary/components/load/index.vue
@@ -63,9 +63,9 @@ const tableStore = new TableStore({
         { title: '启动容量倍数', field: 'inpactloadMultiple', minWidth: '80' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
              width: '180',
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/runManage/assessment/components/dictionary/components/transformer/index.vue b/src/views/pqs/runManage/assessment/components/dictionary/components/transformer/index.vue
index d4761a4c..aef47677 100644
--- a/src/views/pqs/runManage/assessment/components/dictionary/components/transformer/index.vue
+++ b/src/views/pqs/runManage/assessment/components/dictionary/components/transformer/index.vue
@@ -73,9 +73,9 @@ const tableStore = new TableStore({
         { title: '空载电流(A)', field: 'noloadCur', minWidth: '80' },
         { title: '短路阻抗(%)', field: 'shortCircuitImpedance', minWidth: '80' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/runManage/assessment/components/uese/index.vue b/src/views/pqs/runManage/assessment/components/uese/index.vue
index 2c1d5c38..fdc4258b 100644
--- a/src/views/pqs/runManage/assessment/components/uese/index.vue
+++ b/src/views/pqs/runManage/assessment/components/uese/index.vue
@@ -184,10 +184,10 @@ const tableStore: any = new TableStore({
         // { field: 'name13', title: '单相负荷', minWidth: 180 },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '220',
             render: 'buttons',
-            fixed: 'right',
+           
             buttons: [
                 {
                     name: 'edit',
diff --git a/src/views/pqs/supervise/electricalEnergy/components/audit.vue b/src/views/pqs/supervise/electricalEnergy/components/audit.vue
index 9ce86866..8a19821e 100644
--- a/src/views/pqs/supervise/electricalEnergy/components/audit.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components/audit.vue
@@ -1,155 +1,155 @@
-<template>
-    <div>
-        <TableHeader area datePicker ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="问题来源">
-                    <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
-                        <el-option
-                            v-for="item in problemData"
-                            :key="item.code"
-                            :label="item.name"
-                            :value="item.code"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="填报进度">
-                    <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
-                        <el-option
-                            v-for="item in fillingProgress"
-                            :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.problemName"
-                        clearable
-                        placeholder="请输入问题名称"
-                        style="width: 100%"
-                    ></el-input>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-
-        <!-- 审核 -->
-        <el-dialog draggable title="问题审核" v-model="dialogVisible" width="1400px" :before-close="beforeClose">
-            <Filling
-                ref="FillingRef"
-                v-if="dialogVisible"
-                :isDisabled="true"
-                :audit="true"
-                :flag="true"
-                @beforeClose="beforeClose"
-            />
-        </el-dialog>
-
-        <!-- 审核记录 -->
-        <recording ref="recordingRef" />
-    </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 { useDictData } from '@/stores/dictData'
-
-import Filling from './filling.vue'
-import recording from './recording.vue'
-const dictData = useDictData()
-const problemData = dictData.getBasicData('Problem_Sources')
-const fillingProgress = dictData.getBasicData('Fill_Progress')
-const TableHeaderRef = ref()
-const FillingRef = ref()
-const ruleFormRef = ref()
-
-const list: any = ref({})
-const recordingRef = ref(false)
-const dialogVisible = ref(false)
-const tableStore = new TableStore({
-    url: '/process-boot/electricityQuality/getIssues',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'orgName', title: '所属单位' },
-        {
-            field: 'problemSources',
-            title: '问题来源'
-        },
-        { field: 'powerQualityProblemNo', title: '问题编号' },
-        { field: 'problemName', title: '问题名称' },
-
-        { field: 'dataDate', title: '提交时间' },
-        {
-            field: 'reportProcess',
-            title: '填报节点',
-            formatter: (row: any) => {
-                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            width: '150',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '审核',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {
-                        dialogVisible.value = true
-                        setTimeout(() => {
-                            list.value = row
-                            FillingRef.value.open(row)
-                        }, 10)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '审核记录',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {
-                        recordingRef.value.open(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
-        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
-    }
-})
-
-tableStore.table.params.problemSources = ''
-tableStore.table.params.reportProcess = ''
-tableStore.table.params.problemName = ''
-tableStore.table.params.reportProcessStatus = 'Auditt'
-
-const beforeClose = () => {
-    tableStore.index()
-    dialogVisible.value = false
-}
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div>
+        <TableHeader area datePicker ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="问题来源">
+                    <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
+                        <el-option
+                            v-for="item in problemData"
+                            :key="item.code"
+                            :label="item.name"
+                            :value="item.code"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="填报进度">
+                    <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
+                        <el-option
+                            v-for="item in fillingProgress"
+                            :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.problemName"
+                        clearable
+                        placeholder="请输入问题名称"
+                        style="width: 100%"
+                    ></el-input>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+
+        <!-- 审核 -->
+        <el-dialog draggable title="问题审核" v-model="dialogVisible" width="1400px" :before-close="beforeClose">
+            <Filling
+                ref="FillingRef"
+                v-if="dialogVisible"
+                :isDisabled="true"
+                :audit="true"
+                :flag="true"
+                @beforeClose="beforeClose"
+            />
+        </el-dialog>
+
+        <!-- 审核记录 -->
+        <recording ref="recordingRef" />
+    </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 { useDictData } from '@/stores/dictData'
+
+import Filling from './filling.vue'
+import recording from './recording.vue'
+const dictData = useDictData()
+const problemData = dictData.getBasicData('Problem_Sources')
+const fillingProgress = dictData.getBasicData('Fill_Progress')
+const TableHeaderRef = ref()
+const FillingRef = ref()
+const ruleFormRef = ref()
+
+const list: any = ref({})
+const recordingRef = ref(false)
+const dialogVisible = ref(false)
+const tableStore = new TableStore({
+    url: '/process-boot/electricityQuality/getIssues',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'problemSources',
+            title: '问题来源'
+        },
+        { field: 'powerQualityProblemNo', title: '问题编号' },
+        { field: 'problemName', title: '问题名称' },
+
+        { field: 'dataDate', title: '提交时间' },
+        {
+            field: 'reportProcess',
+            title: '填报节点',
+            formatter: (row: any) => {
+                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '150',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '审核',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {
+                        dialogVisible.value = true
+                        setTimeout(() => {
+                            list.value = row
+                            FillingRef.value.open(row)
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '审核记录',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {
+                        recordingRef.value.open(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
+        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
+    }
+})
+
+tableStore.table.params.problemSources = ''
+tableStore.table.params.reportProcess = ''
+tableStore.table.params.problemName = ''
+tableStore.table.params.reportProcessStatus = 'Auditt'
+
+const beforeClose = () => {
+    tableStore.index()
+    dialogVisible.value = false
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
index 17f754fa..a78c273f 100644
--- a/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components/maintenance.vue
@@ -1,255 +1,255 @@
-<template>
-    <TableHeader area datePicker ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="问题来源">
-                <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
-                    <el-option
-                        v-for="item in problemData"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="填报进度">
-                <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
-                    <el-option
-                        v-for="item in fillingProgress"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="状态">
-                <el-select v-model="tableStore.table.params.reportProcessStatus" clearable placeholder="请选择状态">
-                    <el-option
-                        v-for="item in auditStatus"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="问题名称">
-                <el-input
-                    v-model="tableStore.table.params.problemName"
-                    clearable
-                    placeholder="请填写问题名称"
-                    style="width: 100%"
-                ></el-input>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" />
-    <!-- 新增 -->
-    <NewlyAdd v-if="showNewlyAdded" @handleClose="handleClose" @onSubmit="beforeClose" />
-    <!-- 填报 -->
-    <el-dialog draggable title="填报" v-model="dialogVisible" width="1400px" :before-close="beforeClose">
-        <Filling ref="FillingRef" v-if="dialogVisible" @beforeClose="beforeClose" />
-    </el-dialog>
-
-    <!-- 详情 -->
-    <Detail ref="detailRef" />
-
-    <!-- 审核记录 -->
-    <recording ref="recordingRef" />
-</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 { deleteIssues, archive } from '@/api/process-boot/electricitymanagement'
-import { useDictData } from '@/stores/dictData'
-import NewlyAdd from './NewlyAdd.vue'
-import Filling from './filling.vue'
-import Detail from './detail.vue'
-import recording from './recording.vue'
-const dictData = useDictData()
-const FillingRef = ref()
-
-const showNewlyAdded = ref(false)
-const dialogVisible = ref(false)
-const recordingRef = ref(false)
-const TableHeaderRef = ref()
-const detailRef = ref()
-const problemData = dictData.getBasicData('Problem_Sources')
-const fillingProgress = dictData.getBasicData('Fill_Progress')
-const auditStatus = dictData.getBasicData('Audit_Status')
-
-const tableStore: any = new TableStore({
-    url: '/process-boot/electricityQuality/getIssues',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        // { width: '60', type: 'checkbox' },
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'orgName', title: '所属单位' },
-        {
-            field: 'problemSources',
-            title: '问题来源'
-        },
-        { field: 'powerQualityProblemNo', title: '问题编号' },
-        { field: 'problemName', title: '问题名称' },
-        { field: 'dataDate', title: '问题新建时间' },
-        {
-            field: 'reportProcess',
-            title: '填报进度',
-            formatter: (row: any) => {
-                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'reportProcessStatus',
-            title: '状态',
-            formatter: (row: any) => {
-                return auditStatus.filter(item => item.code == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '查看',
-                    type: 'primary',
-                    disabled: row => {
-                        return row.reportProcessStatus == 'Init'
-                    },
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {
-                        detailRef.value.open(row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '填报',
-                    disabled: row => {
-                        return (
-                            row.reportProcessStatus == 'Auditt' ||
-                            (row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success') ||
-                            row.reportProcess == 'Archived'
-                        )
-                    },
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        dialogVisible.value = true
-                        setTimeout(() => {
-                            FillingRef.value.open(row)
-                        }, 10)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '归档',
-                    disabled: row => {
-                        return !(row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success')
-                    },
-                    type: 'primary',
-                    icon: 'el-icon-SuccessFilled',
-                    render: 'basicButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定归档？'
-                    },
-                    click: row => {
-                        archive(row.powerQualityProblemNo).then(() => {
-                            ElMessage.success('归档成功！')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '审核记录',
-                    type: 'primary',
-                    disabled: row => {
-                        return row.reportProcessStatus == 'Init'
-                    },
-                    icon: 'el-icon-PieChart',
-                    render: 'basicButton',
-                    click: row => {
-                        recordingRef.value.open(row)
-                    }
-                },
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    disabled: row => {
-                        return row.reportProcess == 'Archived'
-                    },
-                    click: row => {
-                        deleteIssues(row.powerQualityProblemNo).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
-        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
-    }
-})
-
-tableStore.table.params.problemName = ''
-tableStore.table.params.problemSources = ''
-tableStore.table.params.reportProcess = ''
-tableStore.table.params.reportProcessStatus = ''
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    TableHeaderRef.value.setDatePicker([
-        { label: '年', value: 1 },
-        { label: '季', value: 2 },
-        { label: '月', value: 3 }
-    ])
-
-    tableStore.index()
-})
-// 新增
-const add = () => {
-    showNewlyAdded.value = true
-}
-
-// 关闭弹框
-const handleClose = () => {
-    showNewlyAdded.value = false
-}
-// 关闭 填报
-const beforeClose = () => {
-    dialogVisible.value = false
-    tableStore.index()
-}
-</script>
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="问题来源">
+                <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
+                    <el-option
+                        v-for="item in problemData"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="填报进度">
+                <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
+                    <el-option
+                        v-for="item in fillingProgress"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="状态">
+                <el-select v-model="tableStore.table.params.reportProcessStatus" clearable placeholder="请选择状态">
+                    <el-option
+                        v-for="item in auditStatus"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="问题名称">
+                <el-input
+                    v-model="tableStore.table.params.problemName"
+                    clearable
+                    placeholder="请填写问题名称"
+                    style="width: 100%"
+                ></el-input>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- 新增 -->
+    <NewlyAdd v-if="showNewlyAdded" @handleClose="handleClose" @onSubmit="beforeClose" />
+    <!-- 填报 -->
+    <el-dialog draggable title="填报" v-model="dialogVisible" width="1400px" :before-close="beforeClose">
+        <Filling ref="FillingRef" v-if="dialogVisible" @beforeClose="beforeClose" />
+    </el-dialog>
+
+    <!-- 详情 -->
+    <Detail ref="detailRef" />
+
+    <!-- 审核记录 -->
+    <recording ref="recordingRef" />
+</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 { deleteIssues, archive } from '@/api/process-boot/electricitymanagement'
+import { useDictData } from '@/stores/dictData'
+import NewlyAdd from './NewlyAdd.vue'
+import Filling from './filling.vue'
+import Detail from './detail.vue'
+import recording from './recording.vue'
+const dictData = useDictData()
+const FillingRef = ref()
+
+const showNewlyAdded = ref(false)
+const dialogVisible = ref(false)
+const recordingRef = ref(false)
+const TableHeaderRef = ref()
+const detailRef = ref()
+const problemData = dictData.getBasicData('Problem_Sources')
+const fillingProgress = dictData.getBasicData('Fill_Progress')
+const auditStatus = dictData.getBasicData('Audit_Status')
+
+const tableStore: any = new TableStore({
+    url: '/process-boot/electricityQuality/getIssues',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        // { width: '60', type: 'checkbox' },
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'problemSources',
+            title: '问题来源'
+        },
+        { field: 'powerQualityProblemNo', title: '问题编号' },
+        { field: 'problemName', title: '问题名称' },
+        { field: 'dataDate', title: '问题新建时间' },
+        {
+            field: 'reportProcess',
+            title: '填报进度',
+            formatter: (row: any) => {
+                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'reportProcessStatus',
+            title: '状态',
+            formatter: (row: any) => {
+                return auditStatus.filter(item => item.code == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '查看',
+                    type: 'primary',
+                    disabled: row => {
+                        return row.reportProcessStatus == 'Init'
+                    },
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {
+                        detailRef.value.open(row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '填报',
+                    disabled: row => {
+                        return (
+                            row.reportProcessStatus == 'Auditt' ||
+                            (row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success') ||
+                            row.reportProcess == 'Archived'
+                        )
+                    },
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        dialogVisible.value = true
+                        setTimeout(() => {
+                            FillingRef.value.open(row)
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '归档',
+                    disabled: row => {
+                        return !(row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success')
+                    },
+                    type: 'primary',
+                    icon: 'el-icon-SuccessFilled',
+                    render: 'basicButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定归档？'
+                    },
+                    click: row => {
+                        archive(row.powerQualityProblemNo).then(() => {
+                            ElMessage.success('归档成功！')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '审核记录',
+                    type: 'primary',
+                    disabled: row => {
+                        return row.reportProcessStatus == 'Init'
+                    },
+                    icon: 'el-icon-PieChart',
+                    render: 'basicButton',
+                    click: row => {
+                        recordingRef.value.open(row)
+                    }
+                },
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    disabled: row => {
+                        return row.reportProcess == 'Archived'
+                    },
+                    click: row => {
+                        deleteIssues(row.powerQualityProblemNo).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
+        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
+    }
+})
+
+tableStore.table.params.problemName = ''
+tableStore.table.params.problemSources = ''
+tableStore.table.params.reportProcess = ''
+tableStore.table.params.reportProcessStatus = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    TableHeaderRef.value.setDatePicker([
+        { label: '年', value: 1 },
+        { label: '季', value: 2 },
+        { label: '月', value: 3 }
+    ])
+
+    tableStore.index()
+})
+// 新增
+const add = () => {
+    showNewlyAdded.value = true
+}
+
+// 关闭弹框
+const handleClose = () => {
+    showNewlyAdded.value = false
+}
+// 关闭 填报
+const beforeClose = () => {
+    dialogVisible.value = false
+    tableStore.index()
+}
+</script>
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
index a6e9c756..8095a5fa 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/complaints.vue
@@ -122,7 +122,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 120,
             align: 'center',
             render: 'buttons',
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/online.vue b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
index 69627990..7432a093 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/online.vue
@@ -187,11 +187,11 @@ const tableStore = new TableStore({
             title: '最新数据时间'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+           
             buttons: [
                 {
                     name: 'productSetting',
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
index f8717200..108a9e48 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testQuestions.vue
@@ -104,11 +104,11 @@ const tableStore = new TableStore({
       }
     },
     {
-      title: '操作',
+       title: '操作',fixed: 'right',
       minWidth: '180',
       align: 'center',
       render: 'buttons',
-      fixed: 'right',
+   
       buttons: [
         {
           name: 'edit',
diff --git a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
index 681b5d62..aca433f8 100644
--- a/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
+++ b/src/views/pqs/supervise/electricalEnergy/components1/testRun.vue
@@ -134,9 +134,9 @@ const tableStore = new TableStore({
       }
     },
     {
-      title: '操作',
+       title: '操作',fixed: 'right',
       minWidth: 230,
-      fixed: 'right',
+    
       render: 'buttons',
       buttons: [
         // {
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue b/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue
index 081d3778..ad54ac2e 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planAudits.vue
@@ -1,67 +1,67 @@
-<template>
-    <div>
-        <div>
-            <TableHeader area datePicker ref="TableHeaderRef" />
-            <Table ref="tableRef" />
-            <!-- 审核 -->
-            <planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
-        </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 planAdd from './planAdd.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useDictData } from '@/stores/dictData'
-
-const dictData = useDictData()
-
-const TableHeaderRef = ref()
-const planAddRef = ref()
-const tableStore = new TableStore({
-    url: '/process-boot/rGeneralSurveyPlan/queryPlanAudit',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        { field: 'orgName', title: '所属单位' },
-        { field: 'planNo', title: '普测计划编号' },
-        { field: 'planName', title: '普测计划名称' },
-        { field: 'planStartTime', title: '开始时间' },
-        { field: 'planEndTime', title: '结束时间' },
-        { field: 'subCount', title: '普测变电站数量' },
-        {
-            title: '操作',
-            width: '120',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '审核',
-                    type: 'primary',
-
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        planAddRef.value.open('计划审核', row)
-                    }
-                }
-            ]
-        }
-    ],
-
-    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
-    }
-})
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div>
+        <div>
+            <TableHeader area datePicker ref="TableHeaderRef" />
+            <Table ref="tableRef" />
+            <!-- 审核 -->
+            <planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
+        </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 planAdd from './planAdd.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+
+const TableHeaderRef = ref()
+const planAddRef = ref()
+const tableStore = new TableStore({
+    url: '/process-boot/rGeneralSurveyPlan/queryPlanAudit',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { field: 'orgName', title: '所属单位' },
+        { field: 'planNo', title: '普测计划编号' },
+        { field: 'planName', title: '普测计划名称' },
+        { field: 'planStartTime', title: '开始时间' },
+        { field: 'planEndTime', title: '结束时间' },
+        { field: 'subCount', title: '普测变电站数量' },
+        {
+             title: '操作',fixed: 'right',
+            width: '120',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '审核',
+                    type: 'primary',
+
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        planAddRef.value.open('计划审核', row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    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
+    }
+})
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index d1efb543..daab4386 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -147,9 +147,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: '180',
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
index 9f701921..5830734d 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue
@@ -1,362 +1,362 @@
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
-        <template v-slot:select>
-            <el-form-item label="监督类型">
-                <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型">
-                    <el-option
-                        v-for="item in supvTypeOptionList"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                    <el-option
-                        v-for="item in statusSelect"
-                        :key="item.id"
-                        :label="item.name"
-                        :value="item.id"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-    <!-- 新增 -->
-    <planTest ref="planTestRef" @onsubmit="tableStore.index()" />
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, watch, nextTick } from 'vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-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 { cancelTest } from '@/api/process-boot/generalTest'
-import planTest from './planTest.vue'
-import { useRouter } from 'vue-router'
-import { deleteSurveyPlanTest } from '@/api/supervision-boot/delete/index'
-import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
-import { getUserByRoleType } from '@/api/user-boot/user'
-
-const { push } = useRouter()
-const tableRef = ref()
-import { useDictData } from '@/stores/dictData'
-
-const dictData = useDictData()
-const supvTypeOptionList = dictData.getBasicData('supv_type')
-const statusSelect = dictData.statusSelect()
-
-const planTestRef = ref()
-const TableHeaderRef = ref()
-const auditList: any = ref([])
-
-const tableStore = new TableStore({
-    url: '/supervision-boot/surveyTest/surveyTestPage',
-    publicHeight: 65,
-    method: 'POST',
-    filename: '技术监督测试管理',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            title: '序号',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'planName', title: '计划名称', minWidth: 140 },
-        {
-            field: 'supvType',
-            title: '监督类型',
-            minWidth: 130,
-            formatter: (row: any) => {
-                return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'supvObjectName',
-            minWidth: 130,
-            title: '监督对象名称'
-        },
-        { field: 'substationName', title: '变电站', minWidth: 140 },
-        { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
-        { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
-        {
-            field: 'problemFlag',
-            title: '是否存在问题',
-            minWidth: 120,
-            render: 'tag',
-            custom: {
-                0: 'success',
-                1: 'danger',
-                null: 'primary'
-            },
-            replaceValue: {
-                0: '合格',
-                1: '存在问题',
-                null: '待测试'
-            }
-        },
-        { field: 'deptName', title: '负责单位', minWidth: 140 },
-        { field: 'completeBy', title: '计划负责人', minWidth: 130 },
-        { field: 'completeTime', title: '实际完成时间', minWidth: 140 },
-        {
-            field: 'status',
-            title: '流程状态',
-            render: 'tag',
-            minWidth: 140,
-            custom: {
-                0: 'warning',
-
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                0: '待提交审批',
-
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 120,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 180,
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '测试填报',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.status != 6
-                    },
-                    click: row => {
-                        add(row.id)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.status == 6 || !row.processInstanceId
-                    },
-                    click: row => {
-                        // planTestRef.value.open('查看计划', row)
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.deptId != adminInfo.$state.deptId || !(row.status == 0)
-                    },
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-                    click: row => {
-                        planTestRef.value.open('编辑', row.id, false)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.deptId != adminInfo.$state.deptId || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        planTestRef.value.open('重新发起计划测试', row.id, false)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.deptId != adminInfo.$state.deptId || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.currentPage = tableStore.table.params.pageNum
-    },
-    exportProcessingData: () => {
-        tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.problemFlag = item.problemFlag == 0 ? '合格' : item.problemFlag == 1 ? '存在问题' : '待测试'
-            item.status =
-                item.status == 0
-                    ? '待提交审批'
-                    : item.status == 1
-                    ? '审批中'
-                    : item.status == 2
-                    ? '审批通过'
-                    : item.status == 3
-                    ? '审批不通过'
-                    : '已取消'
-            return item
-        })
-    }
-})
-
-tableStore.table.params.status = ''
-tableStore.table.params.supvType = ''
-
-provide('tableStore', tableStore)
-// 新增计划
-const add = (id: string) => {
-    planTestRef.value.open('计划测试填报', id, true)
-}
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-            deleteSurveyPlanTest(tableStore.table.selection.map(item => item.id)).then(res => {
-                ElMessage({
-                    type: 'success',
-                    message: '删除成功!'
-                })
-                tableStore.index()
-            })
-        })
-    }
-}
-const exportFn = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    queryPlan(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '计划', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelTest(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-// 取消
-
-onMounted(() => {
-    tableStore.index()
-    getUserByRoleType(3).then(res => {
-        auditList.value = res.data
-    })
-})
-
-const props = defineProps(['id', 'businessKey'])
-watch(
-    () => props.id,
-    async (newValue, oldValue) => {
-        if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-        const fullId = newValue.split('@')[0]
-        let nowTime = Date.now()
-        const routeTime = Number(newValue.split('@')[1])
-        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-        nextTick(() => {
-            if (props.businessKey == '3') {
-                planTestRef.value.open('编辑', fullId, false)
-            } else {
-                planTestRef.value.open('重新发起计划测试', fullId, false)
-            }
-        })
-    },
-    { immediate: true }
-)
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll ref="TableHeaderRef" showExport>
+        <template v-slot:select>
+            <el-form-item label="监督类型">
+                <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型">
+                    <el-option
+                        v-for="item in supvTypeOptionList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-option
+                        v-for="item in statusSelect"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+    <!-- 新增 -->
+    <planTest ref="planTestRef" @onsubmit="tableStore.index()" />
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, watch, nextTick } from 'vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+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 { cancelTest } from '@/api/process-boot/generalTest'
+import planTest from './planTest.vue'
+import { useRouter } from 'vue-router'
+import { deleteSurveyPlanTest } from '@/api/supervision-boot/delete/index'
+import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
+import { getUserByRoleType } from '@/api/user-boot/user'
+
+const { push } = useRouter()
+const tableRef = ref()
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
+const statusSelect = dictData.statusSelect()
+
+const planTestRef = ref()
+const TableHeaderRef = ref()
+const auditList: any = ref([])
+
+const tableStore = new TableStore({
+    url: '/supervision-boot/surveyTest/surveyTestPage',
+    publicHeight: 65,
+    method: 'POST',
+    filename: '技术监督测试管理',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'planName', title: '计划名称', minWidth: 140 },
+        {
+            field: 'supvType',
+            title: '监督类型',
+            minWidth: 130,
+            formatter: (row: any) => {
+                return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'supvObjectName',
+            minWidth: 130,
+            title: '监督对象名称'
+        },
+        { field: 'substationName', title: '变电站', minWidth: 140 },
+        { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
+        { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
+        {
+            field: 'problemFlag',
+            title: '是否存在问题',
+            minWidth: 120,
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'danger',
+                null: 'primary'
+            },
+            replaceValue: {
+                0: '合格',
+                1: '存在问题',
+                null: '待测试'
+            }
+        },
+        { field: 'deptName', title: '负责单位', minWidth: 140 },
+        { field: 'completeBy', title: '计划负责人', minWidth: 130 },
+        { field: 'completeTime', title: '实际完成时间', minWidth: 140 },
+        {
+            field: 'status',
+            title: '流程状态',
+            render: 'tag',
+            minWidth: 140,
+            custom: {
+                0: 'warning',
+
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 120,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 180,
+            render: 'buttons',
+           
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '测试填报',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status != 6
+                    },
+                    click: row => {
+                        add(row.id)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 6 || !row.processInstanceId
+                    },
+                    click: row => {
+                        // planTestRef.value.open('查看计划', row)
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.deptId != adminInfo.$state.deptId || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+                    click: row => {
+                        planTestRef.value.open('编辑', row.id, false)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.deptId != adminInfo.$state.deptId || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        planTestRef.value.open('重新发起计划测试', row.id, false)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.deptId != adminInfo.$state.deptId || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    },
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.problemFlag = item.problemFlag == 0 ? '合格' : item.problemFlag == 1 ? '存在问题' : '待测试'
+            item.status =
+                item.status == 0
+                    ? '待提交审批'
+                    : item.status == 1
+                    ? '审批中'
+                    : item.status == 2
+                    ? '审批通过'
+                    : item.status == 3
+                    ? '审批不通过'
+                    : '已取消'
+            return item
+        })
+    }
+})
+
+tableStore.table.params.status = ''
+tableStore.table.params.supvType = ''
+
+provide('tableStore', tableStore)
+// 新增计划
+const add = (id: string) => {
+    planTestRef.value.open('计划测试填报', id, true)
+}
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            deleteSurveyPlanTest(tableStore.table.selection.map(item => item.id)).then(res => {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功!'
+                })
+                tableStore.index()
+            })
+        })
+    }
+}
+const exportFn = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    queryPlan(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '计划', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelTest(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+// 取消
+
+onMounted(() => {
+    tableStore.index()
+    getUserByRoleType(3).then(res => {
+        auditList.value = res.data
+    })
+})
+
+const props = defineProps(['id', 'businessKey'])
+watch(
+    () => props.id,
+    async (newValue, oldValue) => {
+        if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+        const fullId = newValue.split('@')[0]
+        let nowTime = Date.now()
+        const routeTime = Number(newValue.split('@')[1])
+        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+        nextTick(() => {
+            if (props.businessKey == '3') {
+                planTestRef.value.open('编辑', fullId, false)
+            } else {
+                planTestRef.value.open('重新发起计划测试', fullId, false)
+            }
+        })
+    },
+    { immediate: true }
+)
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise/interfere/components/network/index.vue b/src/views/pqs/supervise/interfere/components/network/index.vue
index 12a20c63..a5adcc86 100644
--- a/src/views/pqs/supervise/interfere/components/network/index.vue
+++ b/src/views/pqs/supervise/interfere/components/network/index.vue
@@ -61,7 +61,7 @@ const tableStore = new TableStore({
         { field: 'recordTime', title: '建档时间' },
         { field: 'iuploadTime', title: '报告提交评估时间' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/supervise/interfere/components/normal.vue b/src/views/pqs/supervise/interfere/components/normal.vue
index 96dc7996..199262b7 100644
--- a/src/views/pqs/supervise/interfere/components/normal.vue
+++ b/src/views/pqs/supervise/interfere/components/normal.vue
@@ -1,129 +1,129 @@
-<template>
-    <div>
-        <div>
-            <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-input
-                            v-model="tableStore.table.params.relationUserName"
-                            clearable
-                            placeholder="请选择关联干扰源用户"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="是否已上传实测">
-                        <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>
-                <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>
-    </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 interferenceType = dictData.getBasicData('Interference_Source')
-const istatusList = dictData.getBasicData('On-network_Status')
-const TableHeaderRef = ref()
-
-const tableStore = new TableStore({
-    url: '/process-boot/loadTypeUserManage/getLoadTypeRelationList',
-    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: 'relationUserName', title: '关联干扰源用户名称' },
-        {
-            field: 'istatus',
-            title: '实测报告状态',
-            formatter: row => {
-                return istatusList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '查看',
-                    type: 'primary',
-
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {}
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = 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()
-})
-</script>
+<template>
+    <div>
+        <div>
+            <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-input
+                            v-model="tableStore.table.params.relationUserName"
+                            clearable
+                            placeholder="请选择关联干扰源用户"
+                        ></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="是否已上传实测">
+                        <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>
+                <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>
+    </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 interferenceType = dictData.getBasicData('Interference_Source')
+const istatusList = dictData.getBasicData('On-network_Status')
+const TableHeaderRef = ref()
+
+const tableStore = new TableStore({
+    url: '/process-boot/loadTypeUserManage/getLoadTypeRelationList',
+    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: 'relationUserName', title: '关联干扰源用户名称' },
+        {
+            field: 'istatus',
+            title: '实测报告状态',
+            formatter: row => {
+                return istatusList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '查看',
+                    type: 'primary',
+
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {}
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = 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()
+})
+</script>
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
index ea2a6696..eaf9f74c 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -188,9 +188,9 @@ const tableStore = new TableStore({
     },
     // visible:!jb_pl.value && !jb_dky.value?true:false,
     {
-      title: '操作',
+       title: '操作',fixed: 'right',
       minWidth: 300,
-      fixed: 'right',
+     
       render: 'buttons',
 
       buttons: [
diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue
index 45f6bf94..f19c42ab 100644
--- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue
+++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue
@@ -161,9 +161,9 @@ const tableStore = new TableStore({
         },
         { field: 'createTime', title: '创建时间', minWidth: 100 },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 180,
-            fixed: 'right',
+         
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index ea0b2af7..a472ec94 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -167,9 +167,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 150,
-            fixed: 'right',
+         
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/supervise/plan/components/effectProblem/index.vue b/src/views/pqs/supervise/plan/components/effectProblem/index.vue
index ec711a87..b19e99a4 100644
--- a/src/views/pqs/supervise/plan/components/effectProblem/index.vue
+++ b/src/views/pqs/supervise/plan/components/effectProblem/index.vue
@@ -1,217 +1,217 @@
-<template>
-    <div class="default-main">
-        <!-- <el-dialog
-        v-model="dialogFormVisible"
-        title="技术监督计划实施问题"
-        width="90%"
-        :append-to-body="true"
-        :before-close="close"
-        :close-on-click-modal="false"
-        draggable
-        custom-class="fixed-dialog"
-        @closed="close"
-    > -->
-        <TableHeader :showSearch="false" 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-Plus" type="primary" @click="addFormModel">新增</el-button>
-                <el-button icon="el-icon-Back" @click="go(-1)">返回</el-button>
-                <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
-            </template>
-        </TableHeader>
-        <Table ref="tableRefs" />
-        <!-- </el-dialog> -->
-        <addForm ref="addFormRef" :planId="planId" @onSubmit="effectTableStore.index()"></addForm>
-    </div>
-</template>
-<script lang="ts" setup>
-import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import addForm from './addForm.vue'
-import { queryByAllCode } from '@/api/system-boot/dictTree'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { uploadFile } from '@/api/system-boot/file'
-import { addPlanFormData, getUserByDeptId } from '@/api/supervision-boot/plan/index'
-import { getAreaList } from '@/api/common'
-import Area from '@/components/form/area/index.vue'
-defineOptions({
-    name: 'PlanEffectProblem'
-})
-const emits = defineEmits([''])
-const props = defineProps({
-    effectProblemForm: {
-        type: Object,
-        default: () => ({})
-    }
-})
-const planId: any = ref('')
-const dictData = useDictData()
-const dialogFormVisible = ref(false)
-const tableRefs = ref()
-//字典获取问题类型
-const problemTypeList = dictData.getBasicData('problem_type')
-//字典整改情况
-const rectificationStatusList = dictData.getBasicData('rectification_type')
-//字典问题等级
-const problemLevelList = dictData.getBasicData('problem_level_type')
-const effectTableStore = new TableStore({
-    url: '/supervision-boot/superProblem/pageProblem',
-    // publicHeight: 65,
-    method: 'POST',
-    column: [
-        { title: '序号', width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        {
-            field: 'problemDesc',
-            title: '问题描述',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        {
-            field: 'problemLevel',
-            title: '问题等级',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return problemLevelList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'problemLevelReason',
-            title: '定级依据',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        {
-            field: 'problemType',
-            title: '问题类型',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return problemTypeList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        { field: 'rectificationMeasure', title: '整改措施', minWidth: 170 },
-        { field: 'rectificationProgramme', title: '整改方案', minWidth: 170 },
-        {
-            field: 'rectificationStatus',
-            title: '整改情况',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return rectificationStatusList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'rectificationTime',
-            title: '整改时间',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue.replace('T', ' ')
-            }
-        },
-        { field: 'remark', title: '备注', minWidth: 170 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        handleDetail(row)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '修改',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return true
-                    },
-                    click: row => {
-                        handleEdit(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        effectTableStore.table.params.orgNo = effectTableStore.table.params.deptIndex
-    }
-})
-const { query } = useRoute() // 查询参数
-const { go } = useRouter() // 路由
-const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
-planId.value = queryId
-watch(
-    () => queryId,
-    (val, oldVal) => {
-        if (val) {
-            effectTableStore.table.params.planId = val
-            effectTableStore.index()
-        }
-    },
-    {
-        deep: true,
-        immediate: true
-    }
-)
-provide('tableStore', effectTableStore)
-const open = () => {
-    dialogFormVisible.value = true
-}
-const close = () => {
-    dialogFormVisible.value = false
-    // emits('onSubmit')
-}
-//新增
-const addFormRef = ref()
-const addFormModel = () => {
-    addFormRef.value.open({}, 'add')
-}
-//详情
-const handleDetail = (row: any) => {
-    addFormRef.value.open(row, 'detail')
-}
-//修改
-const handleEdit = (row: any) => {
-    console.log(row)
-}
-onMounted(() => {})
-defineExpose({ open })
-</script>
+<template>
+    <div class="default-main">
+        <!-- <el-dialog
+        v-model="dialogFormVisible"
+        title="技术监督计划实施问题"
+        width="90%"
+        :append-to-body="true"
+        :before-close="close"
+        :close-on-click-modal="false"
+        draggable
+        custom-class="fixed-dialog"
+        @closed="close"
+    > -->
+        <TableHeader :showSearch="false" 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-Plus" type="primary" @click="addFormModel">新增</el-button>
+                <el-button icon="el-icon-Back" @click="go(-1)">返回</el-button>
+                <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
+            </template>
+        </TableHeader>
+        <Table ref="tableRefs" />
+        <!-- </el-dialog> -->
+        <addForm ref="addFormRef" :planId="planId" @onSubmit="effectTableStore.index()"></addForm>
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import addForm from './addForm.vue'
+import { queryByAllCode } from '@/api/system-boot/dictTree'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { uploadFile } from '@/api/system-boot/file'
+import { addPlanFormData, getUserByDeptId } from '@/api/supervision-boot/plan/index'
+import { getAreaList } from '@/api/common'
+import Area from '@/components/form/area/index.vue'
+defineOptions({
+    name: 'PlanEffectProblem'
+})
+const emits = defineEmits([''])
+const props = defineProps({
+    effectProblemForm: {
+        type: Object,
+        default: () => ({})
+    }
+})
+const planId: any = ref('')
+const dictData = useDictData()
+const dialogFormVisible = ref(false)
+const tableRefs = ref()
+//字典获取问题类型
+const problemTypeList = dictData.getBasicData('problem_type')
+//字典整改情况
+const rectificationStatusList = dictData.getBasicData('rectification_type')
+//字典问题等级
+const problemLevelList = dictData.getBasicData('problem_level_type')
+const effectTableStore = new TableStore({
+    url: '/supervision-boot/superProblem/pageProblem',
+    // publicHeight: 65,
+    method: 'POST',
+    column: [
+        { title: '序号', width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        {
+            field: 'problemDesc',
+            title: '问题描述',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        {
+            field: 'problemLevel',
+            title: '问题等级',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return problemLevelList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'problemLevelReason',
+            title: '定级依据',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        {
+            field: 'problemType',
+            title: '问题类型',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return problemTypeList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        { field: 'rectificationMeasure', title: '整改措施', minWidth: 170 },
+        { field: 'rectificationProgramme', title: '整改方案', minWidth: 170 },
+        {
+            field: 'rectificationStatus',
+            title: '整改情况',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return rectificationStatusList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'rectificationTime',
+            title: '整改时间',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue.replace('T', ' ')
+            }
+        },
+        { field: 'remark', title: '备注', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+       
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        handleDetail(row)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '修改',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return true
+                    },
+                    click: row => {
+                        handleEdit(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        effectTableStore.table.params.orgNo = effectTableStore.table.params.deptIndex
+    }
+})
+const { query } = useRoute() // 查询参数
+const { go } = useRouter() // 路由
+const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
+planId.value = queryId
+watch(
+    () => queryId,
+    (val, oldVal) => {
+        if (val) {
+            effectTableStore.table.params.planId = val
+            effectTableStore.index()
+        }
+    },
+    {
+        deep: true,
+        immediate: true
+    }
+)
+provide('tableStore', effectTableStore)
+const open = () => {
+    dialogFormVisible.value = true
+}
+const close = () => {
+    dialogFormVisible.value = false
+    // emits('onSubmit')
+}
+//新增
+const addFormRef = ref()
+const addFormModel = () => {
+    addFormRef.value.open({}, 'add')
+}
+//详情
+const handleDetail = (row: any) => {
+    addFormRef.value.open(row, 'detail')
+}
+//修改
+const handleEdit = (row: any) => {
+    console.log(row)
+}
+onMounted(() => {})
+defineExpose({ open })
+</script>
diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue
index 886e2d3d..dbb4527d 100644
--- a/src/views/pqs/supervise/plan/index.vue
+++ b/src/views/pqs/supervise/plan/index.vue
@@ -176,9 +176,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 300,
-            fixed: 'right',
+          
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/supervise/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue
index 949439bc..1e02a04c 100644
--- a/src/views/pqs/supervise/retire/monitor.vue
+++ b/src/views/pqs/supervise/retire/monitor.vue
@@ -1,382 +1,382 @@
-<!--待办事项列表-->
-<template>
-    <div>
-        <TableHeader date-picker nextFlag theCurrentTime showTimeAll showExport>
-            <template #select>
-                <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                        <el-option
-                            v-for="item in statusSelect"
-                            :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"
-                        placeholder="输入变电站、监测点"
-                        clearable
-                    ></el-input>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref="tableRef" :checkbox-config="checkboxConfig"></Table>
-        <!--弹框-->
-        <monitor-quit-popup ref="deviceQuitPopup" />
-    </div>
-</template>
-
-<script setup lang="ts">
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
-import MonitorQuitPopup from '@/views/pqs/supervise/retire/monitorQuitPopup.vue'
-import { ElMessage } from 'element-plus'
-import { ElMessageBox } from 'element-plus/es'
-import { cancelQuitRunningDevice, getRunningDeviceById } from '@/api/supervision-boot/device/quitRunningDev'
-import { deleteQuitRunningDevice } from '@/api/supervision-boot/delete/index'
-import { useDictData } from '@/stores/dictData'
-const dictData = useDictData()
-const statusSelect = dictData.statusSelect()
-
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-defineOptions({
-    name: 'supervision/retire'
-})
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-const deviceQuitPopup = ref()
-const tableStore = new TableStore({
-    url: '/supervision-boot/quitRunningDevice/list',
-    method: 'POST',
-    publicHeight: 65,
-    filename:'监测点状态管理',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '供电公司', field: 'gdName', minWidth: 130 },
-        { title: '变电站', field: 'subName', minWidth: 160 },
-        { title: '监测点', field: 'deviceName', minWidth: 200 },
-        { title: '退运原因', field: 'propertyNo', minWidth: 160 },
-        {
-            title: '变更前状态',
-            field: 'devOriginalStatus',
-            minWidth: 130,
-            render: 'tag',
-            custom: {
-                0: 'success',
-                1: 'warning',
-                2: 'danger',
-                3: 'warning',
-                4: 'info',
-                null: 'primary'
-            },
-
-            replaceValue: {
-                0: '投运',
-                1: '检修',
-                2: '停运',
-                3: '调试',
-                4: '退运',
-                null: '/'
-            }
-        },
-        {
-            title: '目标状态',
-            field: 'devStatus',
-            minWidth: 130,
-            render: 'tag',
-            custom: {
-                0: 'success',
-                1: 'warning',
-                2: 'danger',
-                3: 'warning',
-                4: 'info',
-                null: 'primary'
-            },
-            replaceValue: {
-                0: '投运',
-                1: '检修',
-                2: '停运',
-                3: '调试',
-                4: '退运',
-                null: '/'
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning',
-                null: 'primary'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消',
-                null: '/'
-            }
-        },
-        { field: 'createTime', title: '开始时间', minWidth: 170 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            align: 'center',
-            minWidth: '150',
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
-                    click: row => {
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
-                    },
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-                    click: row => {
-                        deviceQuitPopup.value.open('编辑', row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        deviceQuitPopup.value.open('重新发起', row)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status !== 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        // for (let key in tableStore.table.params) {
-        //   if (tableStore.table.params[key] === '') {
-        //     delete tableStore.table.params[key]
-        //   }
-
-        // }
-        tableStore.table.params.deviceType = 2
-    },
-    exportProcessingData: () => {
-        tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.devOriginalStatus =
-                item.devOriginalStatus == 0
-                    ? '运行'
-                    : item.devOriginalStatus == 1
-                    ? '检修'
-                    : item.devOriginalStatus == 2
-                    ? '停运'
-                    : item.devOriginalStatus == 3
-                    ? '调试'
-                    : item.devOriginalStatus == 4
-                    ? '退运'
-                    : '/'
-            item.devStatus =
-                item.devStatus == 0
-                    ? '运行'
-                    : item.devStatus == 1
-                    ? '检修'
-                    : item.devStatus == 2
-                    ? '停运'
-                    : item.devStatus == 3
-                    ? '调试'
-                    : item.devStatus == 4
-                    ? '退运'
-                    : '/'
-            item.status =
-                item.status == 0
-                    ? '待提交审批'
-                    : item.status == 1
-                    ? '审批中'
-                    : item.status == 2
-                    ? '审批通过'
-                    : item.status == 3
-                    ? '审批不通过'
-                    : item.status == 4
-                    ? '已取消'
-                    : item.status == 5
-                    ? '新增'
-                    : '/'
-            return item
-        })
-    }
-})
-tableStore.table.params.searchValue = ''
-tableStore.table.params.status = ''
-provide('tableStore', tableStore)
-
-//新增退运终端信息
-const add = () => {
-    deviceQuitPopup.value.open('新增监测点状态变更')
-}
-
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-            deleteQuitRunningDevice(tableStore.table.selection.map(item => item.id)).then(res => {
-                ElMessage({
-                    type: 'success',
-                    message: '删除成功!'
-                })
-                tableStore.index()
-            })
-        })
-    }
-}
-/** 流程实例详情 */
-const handleAudit = (instanceId: string, historyInstanceId: string) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelQuitRunningDevice(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(
-    () => props.id,
-    async (newValue, oldValue) => {
-        if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-        const fullId = newValue.split('@')[0]
-        let nowTime = Date.now()
-        const routeTime = Number(newValue.split('@')[1])
-        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-        await getRunningDeviceById(fullId).then(res => {
-            if (res && res.code == 'A0000') {
-                deviceQuitPopup.value.open('重新发起', res.data)
-            }
-        })
-    },
-    { immediate: true }
-)
-</script>
+<!--待办事项列表-->
+<template>
+    <div>
+        <TableHeader date-picker nextFlag theCurrentTime showTimeAll showExport>
+            <template #select>
+                <el-form-item label="流程状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                        <el-option
+                            v-for="item in statusSelect"
+                            :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"
+                        placeholder="输入变电站、监测点"
+                        clearable
+                    ></el-input>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref="tableRef" :checkbox-config="checkboxConfig"></Table>
+        <!--弹框-->
+        <monitor-quit-popup ref="deviceQuitPopup" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import MonitorQuitPopup from '@/views/pqs/supervise/retire/monitorQuitPopup.vue'
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+import { cancelQuitRunningDevice, getRunningDeviceById } from '@/api/supervision-boot/device/quitRunningDev'
+import { deleteQuitRunningDevice } from '@/api/supervision-boot/delete/index'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const statusSelect = dictData.statusSelect()
+
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'supervision/retire'
+})
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+const deviceQuitPopup = ref()
+const tableStore = new TableStore({
+    url: '/supervision-boot/quitRunningDevice/list',
+    method: 'POST',
+    publicHeight: 65,
+    filename:'监测点状态管理',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '供电公司', field: 'gdName', minWidth: 130 },
+        { title: '变电站', field: 'subName', minWidth: 160 },
+        { title: '监测点', field: 'deviceName', minWidth: 200 },
+        { title: '退运原因', field: 'propertyNo', minWidth: 160 },
+        {
+            title: '变更前状态',
+            field: 'devOriginalStatus',
+            minWidth: 130,
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'warning',
+                2: 'danger',
+                3: 'warning',
+                4: 'info',
+                null: 'primary'
+            },
+
+            replaceValue: {
+                0: '投运',
+                1: '检修',
+                2: '停运',
+                3: '调试',
+                4: '退运',
+                null: '/'
+            }
+        },
+        {
+            title: '目标状态',
+            field: 'devStatus',
+            minWidth: 130,
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'warning',
+                2: 'danger',
+                3: 'warning',
+                4: 'info',
+                null: 'primary'
+            },
+            replaceValue: {
+                0: '投运',
+                1: '检修',
+                2: '停运',
+                3: '调试',
+                4: '退运',
+                null: '/'
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning',
+                null: 'primary'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消',
+                null: '/'
+            }
+        },
+        { field: 'createTime', title: '开始时间', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            minWidth: '150',
+            
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+                    click: row => {
+                        deviceQuitPopup.value.open('编辑', row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        deviceQuitPopup.value.open('重新发起', row)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status !== 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        // for (let key in tableStore.table.params) {
+        //   if (tableStore.table.params[key] === '') {
+        //     delete tableStore.table.params[key]
+        //   }
+
+        // }
+        tableStore.table.params.deviceType = 2
+    },
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.devOriginalStatus =
+                item.devOriginalStatus == 0
+                    ? '运行'
+                    : item.devOriginalStatus == 1
+                    ? '检修'
+                    : item.devOriginalStatus == 2
+                    ? '停运'
+                    : item.devOriginalStatus == 3
+                    ? '调试'
+                    : item.devOriginalStatus == 4
+                    ? '退运'
+                    : '/'
+            item.devStatus =
+                item.devStatus == 0
+                    ? '运行'
+                    : item.devStatus == 1
+                    ? '检修'
+                    : item.devStatus == 2
+                    ? '停运'
+                    : item.devStatus == 3
+                    ? '调试'
+                    : item.devStatus == 4
+                    ? '退运'
+                    : '/'
+            item.status =
+                item.status == 0
+                    ? '待提交审批'
+                    : item.status == 1
+                    ? '审批中'
+                    : item.status == 2
+                    ? '审批通过'
+                    : item.status == 3
+                    ? '审批不通过'
+                    : item.status == 4
+                    ? '已取消'
+                    : item.status == 5
+                    ? '新增'
+                    : '/'
+            return item
+        })
+    }
+})
+tableStore.table.params.searchValue = ''
+tableStore.table.params.status = ''
+provide('tableStore', tableStore)
+
+//新增退运终端信息
+const add = () => {
+    deviceQuitPopup.value.open('新增监测点状态变更')
+}
+
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            deleteQuitRunningDevice(tableStore.table.selection.map(item => item.id)).then(res => {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功!'
+                })
+                tableStore.index()
+            })
+        })
+    }
+}
+/** 流程实例详情 */
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelQuitRunningDevice(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(
+    () => props.id,
+    async (newValue, oldValue) => {
+        if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+        const fullId = newValue.split('@')[0]
+        let nowTime = Date.now()
+        const routeTime = Number(newValue.split('@')[1])
+        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+        await getRunningDeviceById(fullId).then(res => {
+            if (res && res.code == 'A0000') {
+                deviceQuitPopup.value.open('重新发起', res.data)
+            }
+        })
+    },
+    { immediate: true }
+)
+</script>
diff --git a/src/views/pqs/supervise/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue
index 81c6de14..91c4814e 100644
--- a/src/views/pqs/supervise/retire/terminal.vue
+++ b/src/views/pqs/supervise/retire/terminal.vue
@@ -1,378 +1,378 @@
-<!--待办事项列表-->
-<template>
-    <div>
-        <TableHeader date-picker nextFlag theCurrentTime showTimeAll showExport>
-            <template v-slot:select>
-                <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                        <el-option
-                            v-for="item in statusSelect"
-                            :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"
-                        placeholder="输入变电站、终端"
-                        clearable
-                    ></el-input>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref="tableRef" :checkbox-config="checkboxConfig"></Table>
-        <!--弹框-->
-        <device-quit-popup ref="deviceQuitPopup" />
-    </div>
-</template>
-
-<script setup lang="ts">
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
-import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
-import { ElMessage } from 'element-plus'
-import { ElMessageBox } from 'element-plus/es'
-import { cancelQuitRunningDevice, getRunningDeviceById } from '@/api/supervision-boot/device/quitRunningDev'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { useDictData } from '@/stores/dictData'
-import { deleteQuitRunningDevice } from '@/api/supervision-boot/delete/index'
-const dictData = useDictData()
-const statusSelect = dictData.statusSelect()
-
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-defineOptions({
-    name: 'supervision/retire'
-})
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-const deviceQuitPopup = ref()
-const tableStore = new TableStore({
-    url: '/supervision-boot/quitRunningDevice/list',
-    method: 'POST',
-    publicHeight: 65,
-    filename:'终端状态管理',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '供电公司', field: 'gdName', minWidth: 130 },
-        { title: '变电站', field: 'subName', minWidth: 160 },
-        { title: '终端名称', field: 'deviceName', minWidth: 130 },
-        { title: '变更原因', field: 'propertyNo', minWidth: 160 },
-        {
-            title: '变更前状态',
-            field: 'devOriginalStatus',
-            minWidth: 130,
-            render: 'tag',
-            custom: {
-                0: 'success',
-                1: 'warning',
-                2: 'danger',
-                3: 'warning',
-                4: 'info',
-                null: 'primary'
-            },
-            replaceValue: {
-                0: '运行',
-                1: '检修',
-                2: '停运',
-                3: '调试',
-                4: '退运',
-                null: '/'
-            }
-        },
-        {
-            title: '目标状态',
-            field: 'devStatus',
-            minWidth: 130,
-            render: 'tag',
-            custom: {
-                0: 'success',
-                1: 'warning',
-                2: 'danger',
-                3: 'warning',
-                4: 'info',
-                null: 'primary'
-            },
-            replaceValue: {
-                0: '运行',
-                1: '检修',
-                2: '停运',
-                3: '调试',
-                4: '退运',
-                null: '/'
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        { field: 'createTime', title: '开始时间', minWidth: 170 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            align: 'center',
-            minWidth: '150',
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
-                    },
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-                    click: row => {
-                        deviceQuitPopup.value.open('编辑', row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        deviceQuitPopup.value.open('重新发起', row)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        // for (let key in tableStore.table.params) {
-        //     if (tableStore.table.params[key] === '') {
-        //         delete tableStore.table.params[key]
-        //     }
-        // }
-        tableStore.table.params.deviceType = 1
-    },
-    exportProcessingData: () => {
-        tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.devOriginalStatus =
-                item.devOriginalStatus == 0
-                    ? '运行'
-                    : item.devOriginalStatus == 1
-                    ? '检修'
-                    : item.devOriginalStatus == 2
-                    ? '停运'
-                    : item.devOriginalStatus == 3
-                    ? '调试'
-                    : item.devOriginalStatus == 4
-                    ? '退运'
-                    : '/'
-            item.devStatus =
-                item.devStatus == 0
-                    ? '运行'
-                    : item.devStatus == 1
-                    ? '检修'
-                    : item.devStatus == 2
-                    ? '停运'
-                    : item.devStatus == 3
-                    ? '调试'
-                    : item.devStatus == 4
-                    ? '退运'
-                    : '/'
-            item.status =
-                item.status == 0
-                    ? '待提交审批'
-                    : item.status == 1
-                    ? '审批中'
-                    : item.status == 2
-                    ? '审批通过'
-                    : item.status == 3
-                    ? '审批不通过'
-                    : item.status == 4
-                    ? '已取消'
-                    : item.status == 5
-                    ? '新增'
-                    : '/'
-            return item
-        })
-    }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.searchValue = ''
-provide('tableStore', tableStore)
-
-//新增退运终端信息
-const add = () => {
-    deviceQuitPopup.value.open('新增终端状态变更')
-}
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        }).then(() => {
-            deleteQuitRunningDevice(tableStore.table.selection.map(item => item.id)).then(res => {
-                ElMessage({
-                    type: 'success',
-                    message: '删除成功!'
-                })
-                tableStore.index()
-            })
-        })
-    }
-}
-/** 流程实例详情 */
-const handleAudit = (instanceId: string, historyInstanceId: string) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelQuitRunningDevice(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(
-    () => props.id,
-    async (newValue, oldValue) => {
-        if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-        const fullId = newValue.split('@')[0]
-        let nowTime = Date.now()
-        const routeTime = Number(newValue.split('@')[1])
-        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-        await getRunningDeviceById(fullId).then(res => {
-            if (res && res.code == 'A0000') {
-                deviceQuitPopup.value.open('重新发起', res.data)
-            }
-        })
-    },
-    { immediate: true }
-)
-</script>
+<!--待办事项列表-->
+<template>
+    <div>
+        <TableHeader date-picker nextFlag theCurrentTime showTimeAll showExport>
+            <template v-slot:select>
+                <el-form-item label="流程状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                        <el-option
+                            v-for="item in statusSelect"
+                            :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"
+                        placeholder="输入变电站、终端"
+                        clearable
+                    ></el-input>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref="tableRef" :checkbox-config="checkboxConfig"></Table>
+        <!--弹框-->
+        <device-quit-popup ref="deviceQuitPopup" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import DeviceQuitPopup from '@/views/pqs/supervise/retire/deviceQuitPopup.vue'
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+import { cancelQuitRunningDevice, getRunningDeviceById } from '@/api/supervision-boot/device/quitRunningDev'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { deleteQuitRunningDevice } from '@/api/supervision-boot/delete/index'
+const dictData = useDictData()
+const statusSelect = dictData.statusSelect()
+
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'supervision/retire'
+})
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+const deviceQuitPopup = ref()
+const tableStore = new TableStore({
+    url: '/supervision-boot/quitRunningDevice/list',
+    method: 'POST',
+    publicHeight: 65,
+    filename:'终端状态管理',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '供电公司', field: 'gdName', minWidth: 130 },
+        { title: '变电站', field: 'subName', minWidth: 160 },
+        { title: '终端名称', field: 'deviceName', minWidth: 130 },
+        { title: '变更原因', field: 'propertyNo', minWidth: 160 },
+        {
+            title: '变更前状态',
+            field: 'devOriginalStatus',
+            minWidth: 130,
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'warning',
+                2: 'danger',
+                3: 'warning',
+                4: 'info',
+                null: 'primary'
+            },
+            replaceValue: {
+                0: '运行',
+                1: '检修',
+                2: '停运',
+                3: '调试',
+                4: '退运',
+                null: '/'
+            }
+        },
+        {
+            title: '目标状态',
+            field: 'devStatus',
+            minWidth: 130,
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'warning',
+                2: 'danger',
+                3: 'warning',
+                4: 'info',
+                null: 'primary'
+            },
+            replaceValue: {
+                0: '运行',
+                1: '检修',
+                2: '停运',
+                3: '调试',
+                4: '退运',
+                null: '/'
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        { field: 'createTime', title: '开始时间', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            minWidth: '150',
+           
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+                    click: row => {
+                        deviceQuitPopup.value.open('编辑', row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        deviceQuitPopup.value.open('重新发起', row)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        // for (let key in tableStore.table.params) {
+        //     if (tableStore.table.params[key] === '') {
+        //         delete tableStore.table.params[key]
+        //     }
+        // }
+        tableStore.table.params.deviceType = 1
+    },
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.devOriginalStatus =
+                item.devOriginalStatus == 0
+                    ? '运行'
+                    : item.devOriginalStatus == 1
+                    ? '检修'
+                    : item.devOriginalStatus == 2
+                    ? '停运'
+                    : item.devOriginalStatus == 3
+                    ? '调试'
+                    : item.devOriginalStatus == 4
+                    ? '退运'
+                    : '/'
+            item.devStatus =
+                item.devStatus == 0
+                    ? '运行'
+                    : item.devStatus == 1
+                    ? '检修'
+                    : item.devStatus == 2
+                    ? '停运'
+                    : item.devStatus == 3
+                    ? '调试'
+                    : item.devStatus == 4
+                    ? '退运'
+                    : '/'
+            item.status =
+                item.status == 0
+                    ? '待提交审批'
+                    : item.status == 1
+                    ? '审批中'
+                    : item.status == 2
+                    ? '审批通过'
+                    : item.status == 3
+                    ? '审批不通过'
+                    : item.status == 4
+                    ? '已取消'
+                    : item.status == 5
+                    ? '新增'
+                    : '/'
+            return item
+        })
+    }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+
+//新增退运终端信息
+const add = () => {
+    deviceQuitPopup.value.open('新增终端状态变更')
+}
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(() => {
+            deleteQuitRunningDevice(tableStore.table.selection.map(item => item.id)).then(res => {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功!'
+                })
+                tableStore.index()
+            })
+        })
+    }
+}
+/** 流程实例详情 */
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelQuitRunningDevice(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(
+    () => props.id,
+    async (newValue, oldValue) => {
+        if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+        const fullId = newValue.split('@')[0]
+        let nowTime = Date.now()
+        const routeTime = Number(newValue.split('@')[1])
+        if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+        await getRunningDeviceById(fullId).then(res => {
+            if (res && res.code == 'A0000') {
+                deviceQuitPopup.value.open('重新发起', res.data)
+            }
+        })
+    },
+    { immediate: true }
+)
+</script>
diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue
index bea281ea..ad8d3ad7 100644
--- a/src/views/pqs/supervise/technology/components/alarm.vue
+++ b/src/views/pqs/supervise/technology/components/alarm.vue
@@ -221,11 +221,11 @@ const tableStore = new TableStore({
         // },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: '220',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+           
             buttons: [
                 {
                     name: 'productSetting',
diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue
index 39bf3863..b6946ef3 100644
--- a/src/views/pqs/supervise/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue
@@ -138,11 +138,11 @@ const tableStore = new TableStore({
         //     ]
         // },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: '220',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+          
             buttons: [
                 {
                     name: 'productSetting',
diff --git a/src/views/pqs/supervise/technology/components/overview.vue b/src/views/pqs/supervise/technology/components/overview.vue
index 72dcd6c0..600883fb 100644
--- a/src/views/pqs/supervise/technology/components/overview.vue
+++ b/src/views/pqs/supervise/technology/components/overview.vue
@@ -1,214 +1,214 @@
-<template>
-    <div>
-        <div>
-            <TableHeader datePicker ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="筛选数据">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            clearable
-                            placeholder="请选择筛选数据"
-                        ></el-input>
-                    </el-form-item>
-                </template>
-            </TableHeader>
-            <div class="box">
-                <MyEChart style="flex: 1.2" :options="options1" />
-                <MyEChart style="flex: 2" :options="options2" />
-            </div>
-            <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 MyEChart from '@/components/echarts/MyEchart.vue'
-import { info } from 'console'
-
-const dictData = useDictData()
-
-const dialogVisible = ref(false)
-const TableHeaderRef = ref()
-const title = ref('')
-const options1 = ref({})
-const options2 = ref({})
-
-const ruleFormRef = ref()
-const tableStore = new TableStore({
-    url: '/system-boot/area/areaSelect',
-    publicHeight: 345,
-    method: 'POST',
-    column: [
-        { field: 'name', title: '事务名称' },
-        { field: 'type', title: '事务类型' },
-        { field: 'createUser', title: '创建人员' },
-        { field: 'companyName', title: '创建部门' },
-        { field: 'modifyUser', title: '处理人员' },
-        { field: 'modifyTime', title: '处理时间' },
-        { field: 'progressTime', title: '进行时间(天)' },
-        { field: 'progress', title: '流程状态' },
-        { field: 'alertType', 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 => {}
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        tableStore.table.data = []
-    }
-})
-
-tableStore.table.params.searchState = ''
-tableStore.table.params.searchValue = ''
-tableStore.table.params.type = ''
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-    info()
-})
-//渲染图表
-const info = () => {
-    options1.value = {
-        title: {
-            text: '商务类型',
-            x: 'center',
-            textStyle: {
-                fontWeight: 'normal'
-            }
-        },
-        xAxis: [
-            {
-                data: ['全部', '预警单', '告警单']
-            }
-        ],
-        yAxis: [{}],
-        series: [
-            {
-                name: '数量',
-                type: 'bar',
-                barMaxWidth: 30, //最大宽度
-                data: [
-                    {
-                        value: 9,
-                        id: ''
-                    },
-                    {
-                        value: 4,
-                        id: '0'
-                    },
-                    {
-                        value: 5,
-                        id: '1'
-                    }
-                ]
-            }
-        ]
-    }
-    options2.value = {
-        title: {
-            text: '事务流程',
-            x: 'center',
-            textStyle: {
-                fontWeight: 'normal'
-            }
-        },
-        xAxis: [
-            {
-                data: [
-                    '全部',
-                    '开始',
-                    '预/告警单下发',
-                    '预/告警单反馈',
-                    '现场测试',
-                    '整改通知单下发',
-                    '整改通知单反馈',
-                    '完结'
-                ]
-            }
-        ],
-        yAxis: [{}],
-        series: [
-            {
-                name: '数量',
-                type: 'bar',
-                barMaxWidth: 30, //最大宽度
-                data: [
-                    {
-                        value: 9,
-                        id: ''
-                    },
-                    {
-                        value: 4,
-                        id: '0'
-                    },
-                    {
-                        value: 5,
-                        id: '1'
-                    },
-                    {
-                        value: 5,
-                        id: '2'
-                    },
-                    {
-                        value: 5,
-                        id: '3'
-                    },
-                    {
-                        value: 5,
-                        id: '4'
-                    },
-                    {
-                        value: 5,
-                        id: '5'
-                    },
-                    {
-                        value: 5,
-                        id: '6'
-                    }
-                ]
-            }
-        ]
-    }
-}
-// 新增
-const add = () => {
-    title.value = '新增告警单'
-    dialogVisible.value = true
-}
-</script>
-<style lang="scss" scoped>
-.box {
-    height: 280px;
-    display: flex;
-    justify-content: space-between;
-}
-</style>
+<template>
+    <div>
+        <div>
+            <TableHeader datePicker ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="筛选数据">
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            clearable
+                            placeholder="请选择筛选数据"
+                        ></el-input>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <div class="box">
+                <MyEChart style="flex: 1.2" :options="options1" />
+                <MyEChart style="flex: 2" :options="options2" />
+            </div>
+            <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 MyEChart from '@/components/echarts/MyEchart.vue'
+import { info } from 'console'
+
+const dictData = useDictData()
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+const options1 = ref({})
+const options2 = ref({})
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 345,
+    method: 'POST',
+    column: [
+        { field: 'name', title: '事务名称' },
+        { field: 'type', title: '事务类型' },
+        { field: 'createUser', title: '创建人员' },
+        { field: 'companyName', title: '创建部门' },
+        { field: 'modifyUser', title: '处理人员' },
+        { field: 'modifyTime', title: '处理时间' },
+        { field: 'progressTime', title: '进行时间(天)' },
+        { field: 'progress', title: '流程状态' },
+        { field: 'alertType', title: '预警类型' },
+
+        {
+             title: '操作',fixed: 'right',
+            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 => {}
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = []
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+    info()
+})
+//渲染图表
+const info = () => {
+    options1.value = {
+        title: {
+            text: '商务类型',
+            x: 'center',
+            textStyle: {
+                fontWeight: 'normal'
+            }
+        },
+        xAxis: [
+            {
+                data: ['全部', '预警单', '告警单']
+            }
+        ],
+        yAxis: [{}],
+        series: [
+            {
+                name: '数量',
+                type: 'bar',
+                barMaxWidth: 30, //最大宽度
+                data: [
+                    {
+                        value: 9,
+                        id: ''
+                    },
+                    {
+                        value: 4,
+                        id: '0'
+                    },
+                    {
+                        value: 5,
+                        id: '1'
+                    }
+                ]
+            }
+        ]
+    }
+    options2.value = {
+        title: {
+            text: '事务流程',
+            x: 'center',
+            textStyle: {
+                fontWeight: 'normal'
+            }
+        },
+        xAxis: [
+            {
+                data: [
+                    '全部',
+                    '开始',
+                    '预/告警单下发',
+                    '预/告警单反馈',
+                    '现场测试',
+                    '整改通知单下发',
+                    '整改通知单反馈',
+                    '完结'
+                ]
+            }
+        ],
+        yAxis: [{}],
+        series: [
+            {
+                name: '数量',
+                type: 'bar',
+                barMaxWidth: 30, //最大宽度
+                data: [
+                    {
+                        value: 9,
+                        id: ''
+                    },
+                    {
+                        value: 4,
+                        id: '0'
+                    },
+                    {
+                        value: 5,
+                        id: '1'
+                    },
+                    {
+                        value: 5,
+                        id: '2'
+                    },
+                    {
+                        value: 5,
+                        id: '3'
+                    },
+                    {
+                        value: 5,
+                        id: '4'
+                    },
+                    {
+                        value: 5,
+                        id: '5'
+                    },
+                    {
+                        value: 5,
+                        id: '6'
+                    }
+                ]
+            }
+        ]
+    }
+}
+// 新增
+const add = () => {
+    title.value = '新增告警单'
+    dialogVisible.value = true
+}
+</script>
+<style lang="scss" scoped>
+.box {
+    height: 280px;
+    display: flex;
+    justify-content: space-between;
+}
+</style>
diff --git a/src/views/pqs/supervise/technology/components/technology.vue b/src/views/pqs/supervise/technology/components/technology.vue
index ecefff60..d4883fc4 100644
--- a/src/views/pqs/supervise/technology/components/technology.vue
+++ b/src/views/pqs/supervise/technology/components/technology.vue
@@ -1,188 +1,188 @@
-<template>
-    <div>
-        <div>
-            <TableHeader datePicker 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-select v-model="tableStore.table.params.type" clearable placeholder="请选择事务类型">
-                            <el-option
-                                v-for="item in affairs"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </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-Plus" type="primary" @click="add">上传模板</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: '0'
-    },
-    {
-        name: '预/告警单下发',
-        id: '1'
-    },
-    {
-        name: '反馈单上传',
-        id: '2'
-    },
-    {
-        name: '现场测试',
-        id: '3'
-    },
-    {
-        name: '整改通知单下发',
-        id: '4'
-    },
-    {
-        name: '整改通知单反馈',
-        id: '5'
-    },
-    {
-        name: '完结',
-        id: '6'
-    }
-]
-const affairs = [
-    {
-        name: '预警单',
-        id: '0'
-    },
-    {
-        name: '告警单',
-        id: '1'
-    }
-]
-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: [
-        { field: 'name', title: '名称' },
-        {
-            field: 'grade',
-            title: '等级'
-        },
-        { field: 'bigType', title: '策略选择' },
-        { field: 'updateBy', title: '更新人员' },
-        { field: 'updateTime', title: '更新时间' },
-        {
-            field: 'state',
-            title: '状态',
-            activeValue: '2',
-            inactiveValue: '1',
-            render: 'switch',
-            onChangeField: (row: any, value) => {
-                console.log('🚀 ~ row:', 444123, value)
-            }
-        },
-
-        {
-            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 = []
-    }
-})
-
-tableStore.table.params.searchState = ''
-tableStore.table.params.searchValue = ''
-tableStore.table.params.type = ''
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-
-// 新增
-const add = () => {
-    title.value = '新增告警单'
-    dialogVisible.value = true
-}
-</script>
+<template>
+    <div>
+        <div>
+            <TableHeader datePicker 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-select v-model="tableStore.table.params.type" clearable placeholder="请选择事务类型">
+                            <el-option
+                                v-for="item in affairs"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </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-Plus" type="primary" @click="add">上传模板</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: '0'
+    },
+    {
+        name: '预/告警单下发',
+        id: '1'
+    },
+    {
+        name: '反馈单上传',
+        id: '2'
+    },
+    {
+        name: '现场测试',
+        id: '3'
+    },
+    {
+        name: '整改通知单下发',
+        id: '4'
+    },
+    {
+        name: '整改通知单反馈',
+        id: '5'
+    },
+    {
+        name: '完结',
+        id: '6'
+    }
+]
+const affairs = [
+    {
+        name: '预警单',
+        id: '0'
+    },
+    {
+        name: '告警单',
+        id: '1'
+    }
+]
+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: [
+        { field: 'name', title: '名称' },
+        {
+            field: 'grade',
+            title: '等级'
+        },
+        { field: 'bigType', title: '策略选择' },
+        { field: 'updateBy', title: '更新人员' },
+        { field: 'updateTime', title: '更新时间' },
+        {
+            field: 'state',
+            title: '状态',
+            activeValue: '2',
+            inactiveValue: '1',
+            render: 'switch',
+            onChangeField: (row: any, value) => {
+                console.log('🚀 ~ row:', 444123, value)
+            }
+        },
+
+        {
+             title: '操作',fixed: 'right',
+            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 = []
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+
+// 新增
+const add = () => {
+    title.value = '新增告警单'
+    dialogVisible.value = true
+}
+</script>
diff --git a/src/views/pqs/supervise/terminal/components/cycleTab.vue b/src/views/pqs/supervise/terminal/components/cycleTab.vue
index f8c9ba59..781fefc0 100644
--- a/src/views/pqs/supervise/terminal/components/cycleTab.vue
+++ b/src/views/pqs/supervise/terminal/components/cycleTab.vue
@@ -1,302 +1,302 @@
-<template>
-    <div>
-        <div>
-            <TableHeader area ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="终端名称">
-                        <el-input
-                            v-model="tableStore.table.params.name"
-                            clearable
-                            placeholder="请输入终端名称"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="生产厂家">
-                        <el-select
-                            v-model="tableStore.table.params.manufacture"
-                            placeholder="请选择生产厂家"
-                            multiple
-                            collapse-tags
-                            clearable
-                            class="select"
-                        >
-                            <el-option
-                                v-for="item in manufactorList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-
-                    <el-form-item label="检测结果">
-                        <el-select
-                            v-model="tableStore.table.params.testResults"
-                            placeholder="请选择检测结果"
-                            clearable
-                            class="select"
-                        >
-                            <el-option
-                                v-for="item in testResultsList"
-                                :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-upload
-                        ref="uploadRef"
-                        action=""
-                        accept=".xls"
-                        :on-change="choose"
-                        :show-file-list="false"
-                        :auto-upload="false"
-                    >
-                        <template #trigger>
-                            <el-button
-                                icon="el-icon-Upload"
-                                type="primary"
-                                style="margin-left: 12px; margin-right: 12px"
-                            >
-                                excel导入
-                            </el-button>
-                        </template>
-                    </el-upload>
-                    <el-button icon="el-icon-Upload" type="primary" @click="UploadOriginal">上传检测报告</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-            <!-- 上传检测报告 -->
-            <el-dialog
-                draggable
-                title="上传检测报告__支持批量上传"
-                v-model="showBatchUpload"
-                width="30%"
-                :before-close="handleClose"
-            >
-                <el-upload
-                    multiple
-                    action=""
-                    :auto-upload="false"
-                    :limit="999"
-                    accept=".doc,.docx"
-                    :file-list="fileList"
-                    :on-remove="handleRemove"
-                    :on-change="chooseBatch"
-                    ref="upload"
-                >
-                    <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
-                    <span :style="`color:#f58003`">
-                        　　(*传入的检测报告文件格式(终端编号-检测报告(yyyy-MM-dd).docx))
-                    </span>
-                </el-upload>
-                <template #footer>
-                    <el-button @click="handleClose">取 消</el-button>
-                    <el-button type="primary" @click="BatchUpload">上 传</el-button>
-                </template>
-            </el-dialog>
-        </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 { DownloadExport, reportDownload, batchTerminal, importReport } from '@/api/process-boot/terminal'
-import { useDictData } from '@/stores/dictData'
-
-const dictData = useDictData()
-const manufactorList = dictData.getBasicData('Dev_Manufacturers')
-const testResultsList = [
-    {
-        id: 0,
-        name: '未展开'
-    },
-    {
-        id: 1,
-        name: '已展开'
-    }
-]
-
-const TableHeaderRef = ref()
-const showBatchUpload = ref(false)
-const fileList: any = ref([])
-const tableStore = new TableStore({
-    url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
-    publicHeight: 85,
-    method: 'POST',
-    column: [
-        { field: 'id', title: '终端编号' },
-        {
-            field: 'manufacture',
-            title: '生产厂家',
-            formatter(row: any) {
-                return manufactorList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        { field: 'installPlace', title: '安装位置' },
-        { field: 'inspectionUnit', title: '送检单位' },
-        {
-            field: 'testResults',
-            title: '检测结果',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success'
-            },
-            replaceValue: {
-                0: '未展开',
-                1: '已展开'
-            }
-            // formatter(row: any) {
-            //     return row.cellValue == 0 ? '未展开' : '已展开'
-            // }
-        },
-        { field: 'nextInspectionTime', title: '下次检测时间' },
-        {
-            title: '操作',
-            width: '250',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '下载原始数据报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.originalReport == null
-                    },
-                    click: row => {
-                        download(row, 0)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '下载检测报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.inspectionReport == null
-                    },
-                    click: row => {
-                        download(row, 1)
-                    }
-                }
-            ]
-        }
-    ]
-})
-
-tableStore.table.params.name = ''
-tableStore.table.params.id = dictData.state.area[0].id
-tableStore.table.params.testResults = ''
-tableStore.table.params.manufacture = []
-tableStore.table.params.type = 1
-
-provide('tableStore', tableStore)
-
-// 关闭弹窗查询
-const onsubmit = () => {}
-// 下载模版
-const Export = () => {
-    DownloadExport().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        link.download = '终端入网检测录入模板' // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-    })
-}
-// 下载报告
-const download = (row: any, type: number) => {
-    reportDownload({
-        id: row.id,
-        type: type
-    }).then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
-        })
-
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        link.download = type == 1 ? row.inspectionName : row.originalName // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-    })
-}
-// excel导入
-const choose = (e: any) => {
-    batchTerminal(e.raw).then((res: any) => {
-        if (res.type == 'application/json') {
-            ElMessage.success('上传成功,无错误数据!')
-            tableStore.index()
-        } else {
-            ElMessage.warning('上传成功,有错误数据  自动下载 请查看')
-            let blob = new Blob([res], {
-                type: 'application/vnd.ms-excel'
-            })
-            const url = window.URL.createObjectURL(blob)
-            const link = document.createElement('a') // 创建a标签
-            link.href = url
-            link.download = '模板错误信息' // 设置下载的文件名
-            document.body.appendChild(link)
-            link.click() //执行下载
-            document.body.removeChild(link)
-        }
-    })
-}
-// 上传原始报告
-const UploadOriginal = () => {
-    showBatchUpload.value = true
-}
-// 上传
-const BatchUpload = () => {
-    let form = new FormData()
-    form.append('type', '1')
-    fileList.value.forEach((item: any) => {
-        form.append('files', item.raw)
-    })
-    importReport(form)
-        .then((res: any) => {
-            if (res.type == 'application/json') {
-                ElMessage.success('上传成功!')
-                handleClose()
-                tableStore.index()
-            } else {
-                ElMessage.error('上传失败!')
-            }
-        })
-        .catch(response => {
-            // console.log(response);
-        })
-    // fileList.value
-}
-const chooseBatch = (e: any) => {
-    fileList.value.push(e)
-}
-const handleRemove = (e: any) => {
-    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
-}
-const handleClose = () => {
-    fileList.value = []
-    showBatchUpload.value = false
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div>
+        <div>
+            <TableHeader area ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="终端名称">
+                        <el-input
+                            v-model="tableStore.table.params.name"
+                            clearable
+                            placeholder="请输入终端名称"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="生产厂家">
+                        <el-select
+                            v-model="tableStore.table.params.manufacture"
+                            placeholder="请选择生产厂家"
+                            multiple
+                            collapse-tags
+                            clearable
+                            class="select"
+                        >
+                            <el-option
+                                v-for="item in manufactorList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="检测结果">
+                        <el-select
+                            v-model="tableStore.table.params.testResults"
+                            placeholder="请选择检测结果"
+                            clearable
+                            class="select"
+                        >
+                            <el-option
+                                v-for="item in testResultsList"
+                                :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-upload
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls"
+                        :on-change="choose"
+                        :show-file-list="false"
+                        :auto-upload="false"
+                    >
+                        <template #trigger>
+                            <el-button
+                                icon="el-icon-Upload"
+                                type="primary"
+                                style="margin-left: 12px; margin-right: 12px"
+                            >
+                                excel导入
+                            </el-button>
+                        </template>
+                    </el-upload>
+                    <el-button icon="el-icon-Upload" type="primary" @click="UploadOriginal">上传检测报告</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+            <!-- 上传检测报告 -->
+            <el-dialog
+                draggable
+                title="上传检测报告__支持批量上传"
+                v-model="showBatchUpload"
+                width="30%"
+                :before-close="handleClose"
+            >
+                <el-upload
+                    multiple
+                    action=""
+                    :auto-upload="false"
+                    :limit="999"
+                    accept=".doc,.docx"
+                    :file-list="fileList"
+                    :on-remove="handleRemove"
+                    :on-change="chooseBatch"
+                    ref="upload"
+                >
+                    <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
+                    <span :style="`color:#f58003`">
+                        　　(*传入的检测报告文件格式(终端编号-检测报告(yyyy-MM-dd).docx))
+                    </span>
+                </el-upload>
+                <template #footer>
+                    <el-button @click="handleClose">取 消</el-button>
+                    <el-button type="primary" @click="BatchUpload">上 传</el-button>
+                </template>
+            </el-dialog>
+        </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 { DownloadExport, reportDownload, batchTerminal, importReport } from '@/api/process-boot/terminal'
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+const manufactorList = dictData.getBasicData('Dev_Manufacturers')
+const testResultsList = [
+    {
+        id: 0,
+        name: '未展开'
+    },
+    {
+        id: 1,
+        name: '已展开'
+    }
+]
+
+const TableHeaderRef = ref()
+const showBatchUpload = ref(false)
+const fileList: any = ref([])
+const tableStore = new TableStore({
+    url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
+    publicHeight: 85,
+    method: 'POST',
+    column: [
+        { field: 'id', title: '终端编号' },
+        {
+            field: 'manufacture',
+            title: '生产厂家',
+            formatter(row: any) {
+                return manufactorList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        { field: 'installPlace', title: '安装位置' },
+        { field: 'inspectionUnit', title: '送检单位' },
+        {
+            field: 'testResults',
+            title: '检测结果',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '未展开',
+                1: '已展开'
+            }
+            // formatter(row: any) {
+            //     return row.cellValue == 0 ? '未展开' : '已展开'
+            // }
+        },
+        { field: 'nextInspectionTime', title: '下次检测时间' },
+        {
+             title: '操作',fixed: 'right',
+            width: '250',
+            render: 'buttons',
+           
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '下载原始数据报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.originalReport == null
+                    },
+                    click: row => {
+                        download(row, 0)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '下载检测报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.inspectionReport == null
+                    },
+                    click: row => {
+                        download(row, 1)
+                    }
+                }
+            ]
+        }
+    ]
+})
+
+tableStore.table.params.name = ''
+tableStore.table.params.id = dictData.state.area[0].id
+tableStore.table.params.testResults = ''
+tableStore.table.params.manufacture = []
+tableStore.table.params.type = 1
+
+provide('tableStore', tableStore)
+
+// 关闭弹窗查询
+const onsubmit = () => {}
+// 下载模版
+const Export = () => {
+    DownloadExport().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = '终端入网检测录入模板' // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+// 下载报告
+const download = (row: any, type: number) => {
+    reportDownload({
+        id: row.id,
+        type: type
+    }).then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = type == 1 ? row.inspectionName : row.originalName // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+// excel导入
+const choose = (e: any) => {
+    batchTerminal(e.raw).then((res: any) => {
+        if (res.type == 'application/json') {
+            ElMessage.success('上传成功,无错误数据!')
+            tableStore.index()
+        } else {
+            ElMessage.warning('上传成功,有错误数据  自动下载 请查看')
+            let blob = new Blob([res], {
+                type: 'application/vnd.ms-excel'
+            })
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download = '模板错误信息' // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+        }
+    })
+}
+// 上传原始报告
+const UploadOriginal = () => {
+    showBatchUpload.value = true
+}
+// 上传
+const BatchUpload = () => {
+    let form = new FormData()
+    form.append('type', '1')
+    fileList.value.forEach((item: any) => {
+        form.append('files', item.raw)
+    })
+    importReport(form)
+        .then((res: any) => {
+            if (res.type == 'application/json') {
+                ElMessage.success('上传成功!')
+                handleClose()
+                tableStore.index()
+            } else {
+                ElMessage.error('上传失败!')
+            }
+        })
+        .catch(response => {
+            // console.log(response);
+        })
+    // fileList.value
+}
+const chooseBatch = (e: any) => {
+    fileList.value.push(e)
+}
+const handleRemove = (e: any) => {
+    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
+}
+const handleClose = () => {
+    fileList.value = []
+    showBatchUpload.value = false
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
index 141dbe58..d7380e04 100644
--- a/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
+++ b/src/views/pqs/supervise/terminal/components/deviceLedgerTable.vue
@@ -95,7 +95,7 @@ const tableStore = new TableStore({
         }
 
         /*   {
-               title: '操作',
+                title: '操作',fixed: 'right',
                minWidth: 150,
                fixed: 'right',
                render: 'buttons',
diff --git a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
index c2069c66..bcbd97c8 100644
--- a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
+++ b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue
@@ -1,388 +1,388 @@
-<template>
-    <div>
-        <TableHeader ref="TableHeaderRef" showExport>
-            <template #select>
-                <el-form-item label="项目名称">
-                    <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
-                        clearable></el-input>
-                </el-form-item>
-                <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
-                        <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
-                            :value="item.name"></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate" :loading="loading">模板下载</el-button>
-                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-
-        <el-dialog title="详情" width="80%" v-model="dialogShow" v-if="dialogShow">
-            <DetailInfo :id="userId" :openType="'sourcesOfInterference'"></DetailInfo>
-        </el-dialog>
-        <!-- 批量导入 -->
-        <sensitive-user-popup ref="sensitiveUserPopup" />
-
-        <!-- 查看详情 detail 新增/修改 create-->
-        <addForm ref="addForms" @onSubmit="tableStore.index()" :openType="'sourcesOfInterference'"></addForm>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, nextTick, watch } 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 addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
-import SensitiveUserPopup from './sensitiveUserPopup.vue'
-import { useDictData } from '@/stores/dictData'
-import { useRouter } from 'vue-router'
-import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form'
-import DetailInfo from '../../interfere/components/undocumented/detail.vue'
-import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
-import { deleteUserReport } from '@/api/supervision-boot/delete/index'
-const addForms = ref()
-const dictData = useDictData()
-const sensitiveUserPopup = ref()
-const TableHeaderRef = ref()
-const loading = ref(false)
-const areaOptionList = dictData.getBasicData('jibei_area')
-const { push, options, currentRoute } = useRouter()
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const tableStore = new TableStore({
-    url: '/supervision-boot/userReport/getInterferenceUserPage',
-    publicHeight: 65,
-    method: 'POST',
-    filename:'干扰源用户台账',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { field: 'city', title: '所在地市', minWidth: 80 },
-        { field: 'substation', title: '厂站名称', minWidth: 100 },
-        { field: 'projectName', title: '项目名称', minWidth: 170 },
-        {
-            field: 'userType',
-            title: '用户性质',
-            minWidth: 150,
-            formatter: (obj: any) => {
-                const userType = obj.row.userType
-                return getUserTypeName(userType)
-            }
-        },
-
-        { 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: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '详细信息',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        lookInfo(row.id)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
-                    click: row => {
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    // showDisabled: row => {
-                    //     return (
-                    //         (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
-                    //         !(row.dataType == 1)
-                    //     )
-                    // },
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-
-                    click: row => {
-                        addForms.value.filterUsers([6])
-
-                        addForms.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        addForms.value.setcontroFlag()
-                        addForms.value.open({
-                            title: '重新发起',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    }
-})
-tableStore.table.params.city = ''
-tableStore.table.params.orgId = adminInfo.$state.deptId
-tableStore.table.params.projectName = ''
-tableStore.table.params.loadType = ''
-tableStore.table.params.userName = ''
-tableStore.table.params.relationUserName = ''
-tableStore.table.params.aisFileUpload = ''
-
-const userId = ref()
-const dialogShow = ref(false)
-
-const lookInfo = (id: string) => {
-    userId.value = id
-    dialogShow.value = true
-}
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    })
-        .then(() => {
-          
-            deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                ElMessage({
-                    type: 'success',
-                    message: '删除成功!'
-                })
-                tableStore.index()
-            })
-        })
-
-    }
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        dataType: 1,
-        reason: value
-    }
-    await cancelFormData(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-// 新增
-const addFormModel = () => {
-    addForms.value.filterUsers([6])
-
-    setTimeout(() => {
-        addForms.value.open({
-            title: '用户档案录入'
-        })
-    })
-}
-/**获取用户性质*/
-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 '新建电网工程'
-}
-//导出模板
-const exportExcelTemplate = async() => {
-    loading.value = true
-   await downloadSensitiveReportTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '干扰源用户台账模板'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    },0)
-}
-
-//批量导入用户数据
-const importUserData = () => {
-    sensitiveUserPopup.value.open('导入干扰源用户')
-}
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    const fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    await getUserReportById(fullId).then(res => {
-        if (res && res.code == 'A0000') {
-            addForms.value.setcontroFlag()
-            addForms.value.open({
-                title: '重新发起',
-                row: res.data
-            })
-        }
-    })
-}, { immediate: true })
-</script>
+<template>
+    <div>
+        <TableHeader ref="TableHeaderRef" showExport>
+            <template #select>
+                <el-form-item label="项目名称">
+                    <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
+                        clearable></el-input>
+                </el-form-item>
+                <el-form-item label="所在地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                        <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
+                            :value="item.name"></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
+                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate" :loading="loading">模板下载</el-button>
+                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+
+        <el-dialog title="详情" width="80%" v-model="dialogShow" v-if="dialogShow">
+            <DetailInfo :id="userId" :openType="'sourcesOfInterference'"></DetailInfo>
+        </el-dialog>
+        <!-- 批量导入 -->
+        <sensitive-user-popup ref="sensitiveUserPopup" />
+
+        <!-- 查看详情 detail 新增/修改 create-->
+        <addForm ref="addForms" @onSubmit="tableStore.index()" :openType="'sourcesOfInterference'"></addForm>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick, watch } 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 addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
+import SensitiveUserPopup from './sensitiveUserPopup.vue'
+import { useDictData } from '@/stores/dictData'
+import { useRouter } from 'vue-router'
+import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form'
+import DetailInfo from '../../interfere/components/undocumented/detail.vue'
+import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
+import { deleteUserReport } from '@/api/supervision-boot/delete/index'
+const addForms = ref()
+const dictData = useDictData()
+const sensitiveUserPopup = ref()
+const TableHeaderRef = ref()
+const loading = ref(false)
+const areaOptionList = dictData.getBasicData('jibei_area')
+const { push, options, currentRoute } = useRouter()
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const tableStore = new TableStore({
+    url: '/supervision-boot/userReport/getInterferenceUserPage',
+    publicHeight: 65,
+    method: 'POST',
+    filename:'干扰源用户台账',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { field: 'city', title: '所在地市', minWidth: 80 },
+        { field: 'substation', title: '厂站名称', minWidth: 100 },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
+        {
+            field: 'userType',
+            title: '用户性质',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                const userType = obj.row.userType
+                return getUserTypeName(userType)
+            }
+        },
+
+        { 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: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+          
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详细信息',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        lookInfo(row.id)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    // showDisabled: row => {
+                    //     return (
+                    //         (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
+                    //         !(row.dataType == 1)
+                    //     )
+                    // },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+
+                    click: row => {
+                        addForms.value.filterUsers([6])
+
+                        addForms.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        addForms.value.setcontroFlag()
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    }
+})
+tableStore.table.params.city = ''
+tableStore.table.params.orgId = adminInfo.$state.deptId
+tableStore.table.params.projectName = ''
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.relationUserName = ''
+tableStore.table.params.aisFileUpload = ''
+
+const userId = ref()
+const dialogShow = ref(false)
+
+const lookInfo = (id: string) => {
+    userId.value = id
+    dialogShow.value = true
+}
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    })
+        .then(() => {
+          
+            deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功!'
+                })
+                tableStore.index()
+            })
+        })
+
+    }
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        dataType: 1,
+        reason: value
+    }
+    await cancelFormData(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+// 新增
+const addFormModel = () => {
+    addForms.value.filterUsers([6])
+
+    setTimeout(() => {
+        addForms.value.open({
+            title: '用户档案录入'
+        })
+    })
+}
+/**获取用户性质*/
+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 '新建电网工程'
+}
+//导出模板
+const exportExcelTemplate = async() => {
+    loading.value = true
+   await downloadSensitiveReportTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '干扰源用户台账模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    },0)
+}
+
+//批量导入用户数据
+const importUserData = () => {
+    sensitiveUserPopup.value.open('导入干扰源用户')
+}
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    const fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+    await getUserReportById(fullId).then(res => {
+        if (res && res.code == 'A0000') {
+            addForms.value.setcontroFlag()
+            addForms.value.open({
+                title: '重新发起',
+                row: res.data
+            })
+        }
+    })
+}, { immediate: true })
+</script>
diff --git a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
index b71924af..1092879b 100644
--- a/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
+++ b/src/views/pqs/supervise/terminal/components/monitorLedgerTable.vue
@@ -194,7 +194,7 @@ const tableStore = new TableStore({
         }
 
         /*   {
-               title: '操作',
+                title: '操作',fixed: 'right',
                minWidth: 150,
                fixed: 'right',
                render: 'buttons',
diff --git a/src/views/pqs/supervise/terminal/components/networkTab.vue b/src/views/pqs/supervise/terminal/components/networkTab.vue
index 4cf60870..6109d2f7 100644
--- a/src/views/pqs/supervise/terminal/components/networkTab.vue
+++ b/src/views/pqs/supervise/terminal/components/networkTab.vue
@@ -1,372 +1,372 @@
-<template>
-    <div>
-        <div>
-            <TableHeader area ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="终端名称">
-                        <el-input
-                            v-model="tableStore.table.params.name"
-                            clearable
-                            placeholder="请输入终端名称"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="生产厂家">
-                        <el-select
-                            v-model="tableStore.table.params.manufacture"
-                            placeholder="请选择生产厂家"
-                            multiple
-                            collapse-tags
-                            clearable
-                            class="select"
-                        >
-                            <el-option
-                                v-for="item in manufactorList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-
-                    <el-form-item label="检测结果">
-                        <el-select
-                            v-model="tableStore.table.params.testResults"
-                            placeholder="请选择检测结果"
-                            clearable
-                            class="select"
-                        >
-                            <el-option
-                                v-for="item in testResultsList"
-                                :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-Download" type="primary" @click="exportEvent">导出</el-button>
-                    <el-button icon="el-icon-Download" type="primary" @click="Export">下载模板</el-button>
-                    <el-upload
-                        ref="uploadRef"
-                        action=""
-                        accept=".xls"
-                        :on-change="choose"
-                        :show-file-list="false"
-                        :auto-upload="false"
-                    >
-                        <template #trigger>
-                            <el-button
-                                icon="el-icon-Upload"
-                                type="primary"
-                                style="margin-left: 12px; margin-right: 12px"
-                            >
-                                excel导入
-                            </el-button>
-                        </template>
-                    </el-upload>
-                    <el-button icon="el-icon-Upload" type="primary" @click="UploadOriginal">上传原始报告</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-            <!-- 新增 -->
-            <newlyIncreased ref="addRef" @onsubmit="tableStore.index()" />
-            <!-- 上传原始报告 -->
-            <el-dialog
-                draggable
-                title="上传原始报告__支持批量上传"
-                v-model="showBatchUpload"
-                width="30%"
-                :before-close="handleClose"
-            >
-                <el-upload
-                    multiple
-                    action=""
-                    :auto-upload="false"
-                    :limit="999"
-                    accept=".doc,.docx"
-                    :file-list="fileList"
-                    :on-remove="handleRemove"
-                    :on-change="chooseBatch"
-                    ref="upload"
-                >
-                    <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
-                    <span :style="`color:#f58003`">　　(*传入的原始数据文件格式(终端编号-原始数据报告.docx))</span>
-                </el-upload>
-                <template #footer>
-                    <el-button @click="handleClose">取 消</el-button>
-                    <el-button type="primary" @click="BatchUpload">上 传</el-button>
-                </template>
-            </el-dialog>
-        </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 newlyIncreased from './add.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import {
-    DownloadExport,
-    reportDownload,
-    batchTerminal,
-    delTerminal,
-    getTerminalPage,
-    importReport
-} from '@/api/process-boot/terminal'
-import { useDictData } from '@/stores/dictData'
-
-const dictData = useDictData()
-const manufactorList = dictData.getBasicData('Dev_Manufacturers')
-const testResultsList = [
-    {
-        id: 0,
-        name: '未展开'
-    },
-    {
-        id: 1,
-        name: '已展开'
-    }
-]
-
-const fileList: any = ref([])
-const TableHeaderRef = ref()
-const addRef = ref()
-const showBatchUpload = ref(false)
-const tableRef = ref()
-
-const ruleFormRef = ref()
-const tableStore = new TableStore({
-    url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
-    publicHeight: 85,
-    method: 'POST',
-    column: [
-        // { width: '60', type: 'checkbox' },
-
-        { field: 'orgName', title: '所属单位' },
-        { field: 'id', title: '终端编号' },
-        { field: 'name', title: '终端名称' },
-        {
-            field: 'manufacture',
-            title: '生产厂家',
-            formatter(row: any) {
-                return manufactorList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        { field: 'installPlace', title: '安装位置' },
-        { field: 'inspectionUnit', title: '送检单位' },
-        {
-            field: 'testResults',
-            title: '检测结果',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success'
-            },
-            replaceValue: {
-                0: '未展开',
-                1: '已展开'
-            }
-        },
-        { field: 'inspectionTime', title: '检测时间' },
-        { field: 'nextInspectionTime', title: '下次检测时间' },
-        {
-            title: '操作',
-            width: '250',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        addRef.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗?'
-                    },
-                    click: row => {
-                        delTerminal([row.id]).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '下载原始数据报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.originalReport == null
-                    },
-                    click: row => {
-                        download(row, 0)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '下载检测报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.inspectionReport == null
-                    },
-                    click: row => {
-                        download(row, 1)
-                    }
-                }
-            ]
-        }
-    ]
-})
-
-tableStore.table.params.name = ''
-tableStore.table.params.id = dictData.state.area[0].id
-tableStore.table.params.testResults = ''
-tableStore.table.params.manufacture = []
-tableStore.table.params.type = 0
-
-provide('tableStore', tableStore)
-
-const add = () => {
-    addRef.value.open({
-        title: '新增'
-    })
-}
-
-// 下载模版
-const Export = () => {
-    DownloadExport().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        link.download = '终端入网检测录入模板' // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-    })
-}
-// 下载报告
-const download = (row: any, type: number) => {
-    reportDownload({
-        id: row.id,
-        type: type
-    }).then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
-        })
-
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        link.download = type == 1 ? row.inspectionName : row.originalName // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-    })
-}
-// excel导入
-const choose = (e: any) => {
-    batchTerminal(e.raw).then((res: any) => {
-        if (res.type == 'application/json') {
-            ElMessage.success('上传成功,无错误数据!')
-            tableStore.index()
-        } else {
-            ElMessage.warning('上传成功,有错误数据  自动下载 请查看')
-            let blob = new Blob([res], {
-                type: 'application/vnd.ms-excel'
-            })
-            const url = window.URL.createObjectURL(blob)
-            const link = document.createElement('a') // 创建a标签
-            link.href = url
-            link.download = '模板错误信息' // 设置下载的文件名
-            document.body.appendChild(link)
-            link.click() //执行下载
-            document.body.removeChild(link)
-        }
-    })
-}
-// 导出
-const exportEvent = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    getTerminalPage(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '终端入网检测', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-// 上传原始报告
-const UploadOriginal = () => {
-    showBatchUpload.value = true
-}
-// 上传
-const BatchUpload = () => {
-    let form = new FormData()
-    form.append('type', '0')
-    fileList.value.forEach((item: any) => {
-        form.append('files', item.raw)
-    })
-    importReport(form)
-        .then((res: any) => {
-            if (res.type == 'application/json') {
-                ElMessage.success('上传成功!')
-                handleClose()
-                tableStore.index()
-            } else {
-                ElMessage.error('上传失败!')
-            }
-        })
-        .catch(response => {
-            // console.log(response);
-        })
-    // fileList.value
-}
-const chooseBatch = (e: any) => {
-    fileList.value.push(e)
-}
-const handleRemove = (e: any) => {
-    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
-}
-const handleClose = () => {
-    fileList.value = []
-    showBatchUpload.value = false
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div>
+        <div>
+            <TableHeader area ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="终端名称">
+                        <el-input
+                            v-model="tableStore.table.params.name"
+                            clearable
+                            placeholder="请输入终端名称"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="生产厂家">
+                        <el-select
+                            v-model="tableStore.table.params.manufacture"
+                            placeholder="请选择生产厂家"
+                            multiple
+                            collapse-tags
+                            clearable
+                            class="select"
+                        >
+                            <el-option
+                                v-for="item in manufactorList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="检测结果">
+                        <el-select
+                            v-model="tableStore.table.params.testResults"
+                            placeholder="请选择检测结果"
+                            clearable
+                            class="select"
+                        >
+                            <el-option
+                                v-for="item in testResultsList"
+                                :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-Download" type="primary" @click="exportEvent">导出</el-button>
+                    <el-button icon="el-icon-Download" type="primary" @click="Export">下载模板</el-button>
+                    <el-upload
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls"
+                        :on-change="choose"
+                        :show-file-list="false"
+                        :auto-upload="false"
+                    >
+                        <template #trigger>
+                            <el-button
+                                icon="el-icon-Upload"
+                                type="primary"
+                                style="margin-left: 12px; margin-right: 12px"
+                            >
+                                excel导入
+                            </el-button>
+                        </template>
+                    </el-upload>
+                    <el-button icon="el-icon-Upload" type="primary" @click="UploadOriginal">上传原始报告</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+            <!-- 新增 -->
+            <newlyIncreased ref="addRef" @onsubmit="tableStore.index()" />
+            <!-- 上传原始报告 -->
+            <el-dialog
+                draggable
+                title="上传原始报告__支持批量上传"
+                v-model="showBatchUpload"
+                width="30%"
+                :before-close="handleClose"
+            >
+                <el-upload
+                    multiple
+                    action=""
+                    :auto-upload="false"
+                    :limit="999"
+                    accept=".doc,.docx"
+                    :file-list="fileList"
+                    :on-remove="handleRemove"
+                    :on-change="chooseBatch"
+                    ref="upload"
+                >
+                    <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
+                    <span :style="`color:#f58003`">　　(*传入的原始数据文件格式(终端编号-原始数据报告.docx))</span>
+                </el-upload>
+                <template #footer>
+                    <el-button @click="handleClose">取 消</el-button>
+                    <el-button type="primary" @click="BatchUpload">上 传</el-button>
+                </template>
+            </el-dialog>
+        </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 newlyIncreased from './add.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import {
+    DownloadExport,
+    reportDownload,
+    batchTerminal,
+    delTerminal,
+    getTerminalPage,
+    importReport
+} from '@/api/process-boot/terminal'
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+const manufactorList = dictData.getBasicData('Dev_Manufacturers')
+const testResultsList = [
+    {
+        id: 0,
+        name: '未展开'
+    },
+    {
+        id: 1,
+        name: '已展开'
+    }
+]
+
+const fileList: any = ref([])
+const TableHeaderRef = ref()
+const addRef = ref()
+const showBatchUpload = ref(false)
+const tableRef = ref()
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
+    publicHeight: 85,
+    method: 'POST',
+    column: [
+        // { width: '60', type: 'checkbox' },
+
+        { field: 'orgName', title: '所属单位' },
+        { field: 'id', title: '终端编号' },
+        { field: 'name', title: '终端名称' },
+        {
+            field: 'manufacture',
+            title: '生产厂家',
+            formatter(row: any) {
+                return manufactorList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        { field: 'installPlace', title: '安装位置' },
+        { field: 'inspectionUnit', title: '送检单位' },
+        {
+            field: 'testResults',
+            title: '检测结果',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '未展开',
+                1: '已展开'
+            }
+        },
+        { field: 'inspectionTime', title: '检测时间' },
+        { field: 'nextInspectionTime', title: '下次检测时间' },
+        {
+             title: '操作',fixed: 'right',
+            width: '250',
+            render: 'buttons',
+         
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        addRef.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗?'
+                    },
+                    click: row => {
+                        delTerminal([row.id]).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '下载原始数据报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.originalReport == null
+                    },
+                    click: row => {
+                        download(row, 0)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '下载检测报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.inspectionReport == null
+                    },
+                    click: row => {
+                        download(row, 1)
+                    }
+                }
+            ]
+        }
+    ]
+})
+
+tableStore.table.params.name = ''
+tableStore.table.params.id = dictData.state.area[0].id
+tableStore.table.params.testResults = ''
+tableStore.table.params.manufacture = []
+tableStore.table.params.type = 0
+
+provide('tableStore', tableStore)
+
+const add = () => {
+    addRef.value.open({
+        title: '新增'
+    })
+}
+
+// 下载模版
+const Export = () => {
+    DownloadExport().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = '终端入网检测录入模板' // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+// 下载报告
+const download = (row: any, type: number) => {
+    reportDownload({
+        id: row.id,
+        type: type
+    }).then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = type == 1 ? row.inspectionName : row.originalName // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+// excel导入
+const choose = (e: any) => {
+    batchTerminal(e.raw).then((res: any) => {
+        if (res.type == 'application/json') {
+            ElMessage.success('上传成功,无错误数据!')
+            tableStore.index()
+        } else {
+            ElMessage.warning('上传成功,有错误数据  自动下载 请查看')
+            let blob = new Blob([res], {
+                type: 'application/vnd.ms-excel'
+            })
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download = '模板错误信息' // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+        }
+    })
+}
+// 导出
+const exportEvent = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    getTerminalPage(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '终端入网检测', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+// 上传原始报告
+const UploadOriginal = () => {
+    showBatchUpload.value = true
+}
+// 上传
+const BatchUpload = () => {
+    let form = new FormData()
+    form.append('type', '0')
+    fileList.value.forEach((item: any) => {
+        form.append('files', item.raw)
+    })
+    importReport(form)
+        .then((res: any) => {
+            if (res.type == 'application/json') {
+                ElMessage.success('上传成功!')
+                handleClose()
+                tableStore.index()
+            } else {
+                ElMessage.error('上传失败!')
+            }
+        })
+        .catch(response => {
+            // console.log(response);
+        })
+    // fileList.value
+}
+const chooseBatch = (e: any) => {
+    fileList.value.push(e)
+}
+const handleRemove = (e: any) => {
+    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
+}
+const handleClose = () => {
+    fileList.value = []
+    showBatchUpload.value = false
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
index 76b77bd5..3e5f32c2 100644
--- a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
+++ b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue
@@ -1,286 +1,286 @@
-<template>
-    <div>
-        <TableHeader ref="TableHeaderRef" showExport>
-            <template #select>
-                <el-form-item label="项目名称">
-                    <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
-                        clearable></el-input>
-                </el-form-item>
-                <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
-                        <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
-                            :value="item.name"></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"  :loading="loading">模版下载</el-button>
-                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-        <el-dialog title="详情" width="80%" v-model="dialogShow">
-            <DetailInfo :id="userId"></DetailInfo>
-        </el-dialog>
-        <sensitive-user-popup ref="sensitiveUserPopup" />
-
-        <!-- 查看详情 detail 新增/修改 create-->
-        <addForm ref="addForms" @onSubmit="tableStore.index()" openType="create" :submissionControl="false"></addForm>
-    </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 { useDictData } from '@/stores/dictData'
-import DetailInfo from '../../interfere/components/undocumented/detail.vue'
-import { downloadSensitiveUserTemplate } from '@/api/supervision-boot/userReport/form'
-import SensitiveUserPopup from './sensitiveUserPopup.vue'
-import addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
-import { deleteUserReport } from '@/api/supervision-boot/delete/index'
-import { ElMessage } from 'element-plus'
-const dictData = useDictData()
-const sensitiveUserPopup = ref()
-const TableHeaderRef = ref()
-const loading = ref(false)
-const areaOptionList = dictData.getBasicData('jibei_area')
-const loadLevelOptionList = dictData.getBasicData('load_level')
-const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const tableStore = new TableStore({
-    url: '/supervision-boot/userReport/getSensitiveUserPage',
-    publicHeight: 65,
-    method: 'POST',
-    filename:'敏感及重要用户台账',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            title: '序号',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'city', title: '所在地市', minWidth: 80 },
-        {
-            field: 'substation',
-            title: '厂站名称',
-            minWidth: 100,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        { field: 'projectName', title: '项目名称', minWidth: 170 },
-
-        // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
-
-        {
-            field: 'userReportSensitivePO.loadLevel',
-            title: '负荷级别',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return loadLevelOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'userReportSensitivePO.powerSupplyInfo',
-            title: '供电电源情况',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'userStatus',
-            title: '用户状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'primary',
-                1: 'primary',
-                2: 'success',
-                3: 'warning'
-            },
-            replaceValue: {
-                0: '可研',
-                1: '建设',
-                2: '运行',
-                3: '退运'
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '详细信息',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        lookInfo(row.id)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return (
-                            (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
-                            !(row.dataType == 1)
-                        )
-                    },
-                    // disabled: row => {
-                    //     return !(row.status == 0)
-                    // },
-                    click: row => {
-                        addForms.value.filterUsers([5, 4, 3, 2, 1, 0])
-                        addForms.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    }
-})
-tableStore.table.params.city = ''
-tableStore.table.params.projectName = ''
-tableStore.table.params.loadType = ''
-tableStore.table.params.userName = ''
-tableStore.table.params.orgId = adminInfo.$state.deptId
-tableStore.table.params.relationUserName = ''
-tableStore.table.params.aisFileUpload = ''
-const addForms = ref()
-const userId = ref()
-const dialogShow = ref(false)
-
-const lookInfo = (id: string) => {
-    userId.value = id
-    dialogShow.value = true
-}
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    })
-        .then(() => {
-          
-            deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                ElMessage({
-                    type: 'success',
-                    message: '删除成功!'
-                })
-                tableStore.index()
-            })
-        })
-
-    }
-}
-
-// 新增
-const addFormModel = () => {
-    addForms.value.filterUsers([5, 4, 3, 2, 1, 0])
-
-    addForms.value.open({
-        title: '用户档案录入'
-    })
-}
-/**获取用户性质*/
-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 '新建电网工程'
-}
-
-//导出模板
-const exportExcelTemplate = async () => {
-    loading.value = true
-  await  downloadSensitiveUserTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '敏感及重要用户模板'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-
-//批量导入用户数据
-const importUserData = () => {
-    sensitiveUserPopup.value.open('导入敏感及重要用户')
-}
-</script>
+<template>
+    <div>
+        <TableHeader ref="TableHeaderRef" showExport>
+            <template #select>
+                <el-form-item label="项目名称">
+                    <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
+                        clearable></el-input>
+                </el-form-item>
+                <el-form-item label="所在地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                        <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
+                            :value="item.name"></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
+                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"  :loading="loading">模版下载</el-button>
+                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+        <el-dialog title="详情" width="80%" v-model="dialogShow">
+            <DetailInfo :id="userId"></DetailInfo>
+        </el-dialog>
+        <sensitive-user-popup ref="sensitiveUserPopup" />
+
+        <!-- 查看详情 detail 新增/修改 create-->
+        <addForm ref="addForms" @onSubmit="tableStore.index()" openType="create" :submissionControl="false"></addForm>
+    </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 { useDictData } from '@/stores/dictData'
+import DetailInfo from '../../interfere/components/undocumented/detail.vue'
+import { downloadSensitiveUserTemplate } from '@/api/supervision-boot/userReport/form'
+import SensitiveUserPopup from './sensitiveUserPopup.vue'
+import addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
+import { deleteUserReport } from '@/api/supervision-boot/delete/index'
+import { ElMessage } from 'element-plus'
+const dictData = useDictData()
+const sensitiveUserPopup = ref()
+const TableHeaderRef = ref()
+const loading = ref(false)
+const areaOptionList = dictData.getBasicData('jibei_area')
+const loadLevelOptionList = dictData.getBasicData('load_level')
+const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const tableStore = new TableStore({
+    url: '/supervision-boot/userReport/getSensitiveUserPage',
+    publicHeight: 65,
+    method: 'POST',
+    filename:'敏感及重要用户台账',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'city', title: '所在地市', minWidth: 80 },
+        {
+            field: 'substation',
+            title: '厂站名称',
+            minWidth: 100,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
+
+        // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+
+        {
+            field: 'userReportSensitivePO.loadLevel',
+            title: '负荷级别',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return loadLevelOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'userReportSensitivePO.powerSupplyInfo',
+            title: '供电电源情况',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'userStatus',
+            title: '用户状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'primary',
+                1: 'primary',
+                2: 'success',
+                3: 'warning'
+            },
+            replaceValue: {
+                0: '可研',
+                1: '建设',
+                2: '运行',
+                3: '退运'
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+         
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详细信息',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        lookInfo(row.id)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return (
+                            (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
+                            !(row.dataType == 1)
+                        )
+                    },
+                    // disabled: row => {
+                    //     return !(row.status == 0)
+                    // },
+                    click: row => {
+                        addForms.value.filterUsers([5, 4, 3, 2, 1, 0])
+                        addForms.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    }
+})
+tableStore.table.params.city = ''
+tableStore.table.params.projectName = ''
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.orgId = adminInfo.$state.deptId
+tableStore.table.params.relationUserName = ''
+tableStore.table.params.aisFileUpload = ''
+const addForms = ref()
+const userId = ref()
+const dialogShow = ref(false)
+
+const lookInfo = (id: string) => {
+    userId.value = id
+    dialogShow.value = true
+}
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    })
+        .then(() => {
+          
+            deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功!'
+                })
+                tableStore.index()
+            })
+        })
+
+    }
+}
+
+// 新增
+const addFormModel = () => {
+    addForms.value.filterUsers([5, 4, 3, 2, 1, 0])
+
+    addForms.value.open({
+        title: '用户档案录入'
+    })
+}
+/**获取用户性质*/
+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 '新建电网工程'
+}
+
+//导出模板
+const exportExcelTemplate = async () => {
+    loading.value = true
+  await  downloadSensitiveUserTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '敏感及重要用户模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+
+//批量导入用户数据
+const importUserData = () => {
+    sensitiveUserPopup.value.open('导入敏感及重要用户')
+}
+</script>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
index 234750c3..0d0fb9ab 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue
@@ -1,304 +1,304 @@
-<!---终端入网检测-->
-<template>
-  <TableHeader area  ref='TableHeaderRef' showExport>
-    <template #select>
-      <el-form-item label='搜索'>
-        <el-input
-            v-model='tableStore.table.params.searchValue'
-            placeholder='输入变电站.终端名称'
-            clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item label='流程状态'>
-        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
-          <el-option
-              v-for='item in statusSelect'
-              :key='item.id'
-              :label='item.name'
-              :value='item.id'
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label='处理状态'>
-        <el-select v-model='tableStore.table.params.state' clearable placeholder='请选处理状态'>
-          <el-option
-              v-for='item in stateSelect'
-              :key='item.id'
-              :label='item.name'
-              :value='item.id'
-          ></el-option>
-        </el-select>
-      </el-form-item>
-    </template>
-  </TableHeader>
-  <Table ref='tableRef' />
-  <Form ref='FormRef' @onSubmit='tableStore.index()' />
-</template>
-<script setup lang='ts'>
-import { ref, onMounted, provide, watch } from 'vue'
-import TableStore from '@/utils/tableStore'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import Form from './form.vue'
-import { cancel, getInfoById } from '@/api/supervision-boot/cycleDetection/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-const TableHeaderRef = ref()
-const tableRef = ref()
-const FormRef = ref()
-const statusSelect = dictData.statusSelect()
-const stateSelect = [
-  {
-    id: 0,
-    name: '未处理'
-  },
-  {
-    id: 1,
-    name: '处理中'
-  },
-  {
-    id: 2,
-    name: '已处理'
-  }
-]
-//申请联调
-const debugForms = ref()
-const tableStore = new TableStore({
-  url: '/supervision-boot/checkDevice/list',
-  publicHeight: 65,
-  method: 'POST',
-  filename:'终端周期检测',
-  column: [
-  { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-    { field: 'substation', title: '变电站' },
-
-    { field: 'dept', title: '供电公司' },
-    {
-      field: 'deviceName',
-      title: '终端名称'
-    },
-    {
-      field: 'thisTimeCheck',
-      title: '本次定检时间'
-    },
-    {
-      field: 'nextTimeCheck',
-      title: '下次定检时间'
-    },
-    {
-      field: 'overdueDay',
-      title: '逾期天数',
-      type: 'html',
-      formatter: (row: any) => {
-
-        let text = row.row.status == 2
-            ? '/'
-            : `<span style='color: ${
-                row.row.overdueDay > 10 ? 'red' : row.row.overdueDay > 3 ? 'yellow' : ''
-            };text-decoration: none'>${row.row.overdueDay}</span>`
-
-        return text
-      }
-    },
-
-    {
-      field: 'status',
-      title: '流程状态',
-      minWidth: 100,
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning',
-        5: 'primary'
-      },
-      replaceValue: {
-        0: '待提交审批',
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消',
-        5: '同步台账成功',
-        null: '/'
-      }
-    },
-    {
-      title: '操作',
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            flag.value = true
-            handleAudit(row.processInstanceId, row.historyInstanceId)
-          },
-          disabled: row => {
-            return !row.processInstanceId
-          }
-        },
-
-        {
-          name: 'edit',
-          title: '报告上传',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.status != null
-          },
-          click: row => {
-            FormRef.value.open('报告上传', row)
-          }
-        },
-
-        {
-          name: 'edit',
-          title: '重新发起',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-          },
-          click: row => {
-            FormRef.value.open('重新发起', row)
-          }
-        },
-        {
-          name: 'cancel',
-          title: '取消',
-          type: 'danger',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status != 1
-          },
-          click: async row => {
-            // cancelLeave(row)
-            const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              inputType: 'textarea',
-              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-              inputErrorMessage: '取消原因不能为空'
-            })
-            // 发起取消
-            let data = {
-              id: row.id,
-              processInstanceId: row.processInstanceId,
-              reason: value
-            }
-            await cancel(data)
-            ElMessage.success('取消成功')
-            // 加载数据
-            tableStore.index()
-          }
-        }
-      ]
-    }
-  ],
-
-  beforeSearchFun: () => {
-    tableStore.table.params.deptId = tableStore.table.params.deptIndex
-    tableStore.table.params.statveList = [2]
-    // tableStore.table.params.relationUserName = tableStore.table.params.userName
-  },
-  exportProcessingData: () => {
-        tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.status =
-                item.status == 0
-                    ? '待提交审批'
-                    : item.status == 1
-                    ? '审批中'
-                    : item.status == 2
-                    ? '审批通过'
-                    : item.status == 3
-                    ? '审批不通过'
-                    : item.status == 4
-                    ? '已取消':item.status == 5
-                    ? '同步台账成功':'/'
-            return item
-        })
-    }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.state = ''
-tableStore.table.params.searchValue = ''
-
-provide('tableStore', tableStore)
-
-onMounted(() => {
-  tableStore.index()
-})
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    state: {
-      id: instanceId,
-      historyInstanceId
-    }
-  })
-}
-
-const addFormModel = () => {
-}
-
-watch(
-    () => currentRoute.value.path,
-    () => {
-      if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-        tableStore.index()
-        flag.value = false
-      }
-    },
-    {
-      deep: true
-    }
-)
-const props = defineProps(['id', 'businessKey'])
-watch(() => props.id, async (newValue, oldValue) => {
-  if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-  const fullId = newValue.split('@')[0]
-  let nowTime = Date.now()
-  const routeTime = Number(newValue.split('@')[1])
-  if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-  await getInfoById({ id: fullId }).then(res => {
-    if (res && res.code == 'A0000') {
-      if (props.businessKey == '3') {
-        FormRef.value.open('报告上传', res.data)
-      } else {
-        FormRef.value.open('重新发起', res.data)
-      }
-
-    }
-  })
-}, { immediate: true })
-</script>
-
-<style scoped lang='scss'>
-:deep(.el-upload-list__item) {
-  width: 400px;
-}
-
-::v-deep .el-input__wrapper {
-  // width: 200px !important;
-}
-</style>
+<!---终端入网检测-->
+<template>
+  <TableHeader area  ref='TableHeaderRef' showExport>
+    <template #select>
+      <el-form-item label='搜索'>
+        <el-input
+            v-model='tableStore.table.params.searchValue'
+            placeholder='输入变电站.终端名称'
+            clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item label='流程状态'>
+        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
+          <el-option
+              v-for='item in statusSelect'
+              :key='item.id'
+              :label='item.name'
+              :value='item.id'
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label='处理状态'>
+        <el-select v-model='tableStore.table.params.state' clearable placeholder='请选处理状态'>
+          <el-option
+              v-for='item in stateSelect'
+              :key='item.id'
+              :label='item.name'
+              :value='item.id'
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </template>
+  </TableHeader>
+  <Table ref='tableRef' />
+  <Form ref='FormRef' @onSubmit='tableStore.index()' />
+</template>
+<script setup lang='ts'>
+import { ref, onMounted, provide, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import Form from './form.vue'
+import { cancel, getInfoById } from '@/api/supervision-boot/cycleDetection/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+const TableHeaderRef = ref()
+const tableRef = ref()
+const FormRef = ref()
+const statusSelect = dictData.statusSelect()
+const stateSelect = [
+  {
+    id: 0,
+    name: '未处理'
+  },
+  {
+    id: 1,
+    name: '处理中'
+  },
+  {
+    id: 2,
+    name: '已处理'
+  }
+]
+//申请联调
+const debugForms = ref()
+const tableStore = new TableStore({
+  url: '/supervision-boot/checkDevice/list',
+  publicHeight: 65,
+  method: 'POST',
+  filename:'终端周期检测',
+  column: [
+  { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+    { field: 'substation', title: '变电站' },
+
+    { field: 'dept', title: '供电公司' },
+    {
+      field: 'deviceName',
+      title: '终端名称'
+    },
+    {
+      field: 'thisTimeCheck',
+      title: '本次定检时间'
+    },
+    {
+      field: 'nextTimeCheck',
+      title: '下次定检时间'
+    },
+    {
+      field: 'overdueDay',
+      title: '逾期天数',
+      type: 'html',
+      formatter: (row: any) => {
+
+        let text = row.row.status == 2
+            ? '/'
+            : `<span style='color: ${
+                row.row.overdueDay > 10 ? 'red' : row.row.overdueDay > 3 ? 'yellow' : ''
+            };text-decoration: none'>${row.row.overdueDay}</span>`
+
+        return text
+      }
+    },
+
+    {
+      field: 'status',
+      title: '流程状态',
+      minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+        2: 'success',
+        3: 'danger',
+        4: 'warning',
+        5: 'primary'
+      },
+      replaceValue: {
+        0: '待提交审批',
+        1: '审批中',
+        2: '审批通过',
+        3: '审批不通过',
+        4: '已取消',
+        5: '同步台账成功',
+        null: '/'
+      }
+    },
+    {
+       title: '操作',fixed: 'right',
+    
+      render: 'buttons',
+      buttons: [
+        {
+          name: 'productSetting',
+          title: '流程详情',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            flag.value = true
+            handleAudit(row.processInstanceId, row.historyInstanceId)
+          },
+          disabled: row => {
+            return !row.processInstanceId
+          }
+        },
+
+        {
+          name: 'edit',
+          title: '报告上传',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.status != null
+          },
+          click: row => {
+            FormRef.value.open('报告上传', row)
+          }
+        },
+
+        {
+          name: 'edit',
+          title: '重新发起',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+          },
+          click: row => {
+            FormRef.value.open('重新发起', row)
+          }
+        },
+        {
+          name: 'cancel',
+          title: '取消',
+          type: 'danger',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || row.status != 1
+          },
+          click: async row => {
+            // cancelLeave(row)
+            const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              inputType: 'textarea',
+              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+              inputErrorMessage: '取消原因不能为空'
+            })
+            // 发起取消
+            let data = {
+              id: row.id,
+              processInstanceId: row.processInstanceId,
+              reason: value
+            }
+            await cancel(data)
+            ElMessage.success('取消成功')
+            // 加载数据
+            tableStore.index()
+          }
+        }
+      ]
+    }
+  ],
+
+  beforeSearchFun: () => {
+    tableStore.table.params.deptId = tableStore.table.params.deptIndex
+    tableStore.table.params.statveList = [2]
+    // tableStore.table.params.relationUserName = tableStore.table.params.userName
+  },
+  exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.status =
+                item.status == 0
+                    ? '待提交审批'
+                    : item.status == 1
+                    ? '审批中'
+                    : item.status == 2
+                    ? '审批通过'
+                    : item.status == 3
+                    ? '审批不通过'
+                    : item.status == 4
+                    ? '已取消':item.status == 5
+                    ? '同步台账成功':'/'
+            return item
+        })
+    }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.state = ''
+tableStore.table.params.searchValue = ''
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+  tableStore.index()
+})
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    state: {
+      id: instanceId,
+      historyInstanceId
+    }
+  })
+}
+
+const addFormModel = () => {
+}
+
+watch(
+    () => currentRoute.value.path,
+    () => {
+      if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+        tableStore.index()
+        flag.value = false
+      }
+    },
+    {
+      deep: true
+    }
+)
+const props = defineProps(['id', 'businessKey'])
+watch(() => props.id, async (newValue, oldValue) => {
+  if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+  const fullId = newValue.split('@')[0]
+  let nowTime = Date.now()
+  const routeTime = Number(newValue.split('@')[1])
+  if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+  await getInfoById({ id: fullId }).then(res => {
+    if (res && res.code == 'A0000') {
+      if (props.businessKey == '3') {
+        FormRef.value.open('报告上传', res.data)
+      } else {
+        FormRef.value.open('重新发起', res.data)
+      }
+
+    }
+  })
+}, { immediate: true })
+</script>
+
+<style scoped lang='scss'>
+:deep(.el-upload-list__item) {
+  width: 400px;
+}
+
+::v-deep .el-input__wrapper {
+  // width: 200px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
index 27033704..2118c4ef 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -1,379 +1,379 @@
-<!---终端入网检测-->
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll showExport ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="搜索">
-                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                    clearable style="width: 230px"></el-input>
-            </el-form-item>
-            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                    <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
-                        :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
-            <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-    <!-- 申请联调弹框 -->
-    <debug ref="debugForms" @onSubmit="tableStore.index()" :debugId="debugId"></debug>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, watch } from 'vue'
-import TableStore from '@/utils/tableStore'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import { getLoadTypeUserList } from '@/api/process-boot/interference'
-import {
-    getMointorPointTempLinedebugDetail,
-    setTempLinedebugLedgerSync
-} from '@/api/supervision-boot/jointDebugList/index'
-import debug from './debug.vue'
-import { cancelMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { deleteTempLineDebugReport } from '@/api/supervision-boot/delete/index'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-const TableHeaderRef = ref()
-const tableRef = ref()
-const statusSelect = dictData.statusSelect()
-statusSelect.push({ name: '同步台账成功', id: 5 })
-const tableStore = new TableStore({
-    url: '/supervision-boot/tempLinedebug/list',
-    publicHeight: 65,
-    method: 'POST',
-    filename:'监测点联调列表',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        {
-            field: 'powerSubstationName',
-            title: '电网侧变电站',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        { field: 'lineName', title: '监测点名称', minWidth: 170 },
-        {
-            field: 'reason',
-            title: '调试原因',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        { field: 'lineId', title: '监测点编号', minWidth: 170 },
-        // { field: 'monitoringTerminalCode', title: '终端编码', minWidth: 170 },
-        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning',
-                5: 'primary'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消',
-                5: '同步台账成功',
-                null: '/'
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    },
-                    disabled: row => {
-                        return !row.processInstanceId
-                    }
-                },
-                // {
-                //     name: 'edit',
-                //     title: '编辑',
-                //     type: 'primary',
-                //     icon: 'el-icon-Open',
-                //     render: 'basicButton',
-                //     showDisabled: row => {
-                //         return row.createBy != adminInfo.$state.id || !(row.status == 0)
-                //     },
-                //     disabled: row => {
-                //         return !(row.status == 0)
-                //     },
-                //     click: row => {
-                //         debugForms.value.open('编辑', row)
-                //     }
-                // },
-                {
-                    name: 'productSetting',
-                    title: '申请联调',
-                    type: 'primary',
-                    icon: 'el-icon-add',
-                    render: 'basicButton',
-                    click: row => {
-                        // handleDebug(row)
-                        debugForms.value.open('申请联调', row)
-                    },
-                    disabled: row => {
-                        return row.reason
-                    }
-                },
-
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        debugForms.value.open('重新发起', row)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '同步台账',
-                    type: 'primary',
-                    icon: 'el-icon-add',
-                    render: 'basicButton',
-                    click: row => {
-                        setTempLinedebugLedgerSync({ id: row.id }).then(res => {
-                            if (res.code == 'A0000') {
-                                ElMessage({
-                                    message: '台账同步成功',
-                                    type: 'success'
-                                })
-                                tableStore.index()
-                            }
-                        })
-                    },
-                    disabled: row => {
-                        return row.status != 2
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.statveList = [2]
-        // tableStore.table.params.relationUserName = tableStore.table.params.userName
-    },
-    exportProcessingData: () => {
-        tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.status =
-                item.status == 0
-                    ? '待提交审批'
-                    : item.status == 1
-                    ? '审批中'
-                    : item.status == 2
-                    ? '审批通过'
-                    : item.status == 3
-                    ? '审批不通过'
-                    : item.status == 4
-                    ? '已取消':item.status == 5
-                    ? '同步台账成功':'/'
-            return item
-        })
-    }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.searchValue = ''
-// tableStore.table.params.loadType = ''
-// tableStore.table.params.userName = ''
-// tableStore.table.params.fileUploadflag = ''
-
-provide('tableStore', tableStore)
-
-const exportEvent = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    getLoadTypeUserList(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '未建档非线性用户', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        })
-            .then(() => {
-
-                deleteTempLineDebugReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除成功!'
-                    })
-                    tableStore.index()
-                })
-
-            })
-    }
-}
-onMounted(() => {
-    tableStore.index()
-})
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-//申请联调
-const debugForms = ref()
-const debugId = ref('')
-const handleDebug = (row: any) => {
-    debugId.value = row.id
-    console.log(debugId.value)
-    debugForms.value.open('申请联调', row)
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelMointorPointTempLinedebug(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    const fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    await getMointorPointTempLinedebugDetail({ id: fullId }).then(res => {
-        if (res && res.code == 'A0000') {
-            debugForms.value.open('重新发起', res.data)
-        }
-    })
-}, { immediate: true })
-</script>
-
-<style scoped lang="scss">
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-
-::v-deep .el-input__wrapper {
-    // width: 200px !important;
-}
-</style>
+<!---终端入网检测-->
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll showExport ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="搜索">
+                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
+                    clearable style="width: 230px"></el-input>
+            </el-form-item>
+            <el-form-item label="流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
+                        :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
+            <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+    <!-- 申请联调弹框 -->
+    <debug ref="debugForms" @onSubmit="tableStore.index()" :debugId="debugId"></debug>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { getLoadTypeUserList } from '@/api/process-boot/interference'
+import {
+    getMointorPointTempLinedebugDetail,
+    setTempLinedebugLedgerSync
+} from '@/api/supervision-boot/jointDebugList/index'
+import debug from './debug.vue'
+import { cancelMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { deleteTempLineDebugReport } from '@/api/supervision-boot/delete/index'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+const TableHeaderRef = ref()
+const tableRef = ref()
+const statusSelect = dictData.statusSelect()
+statusSelect.push({ name: '同步台账成功', id: 5 })
+const tableStore = new TableStore({
+    url: '/supervision-boot/tempLinedebug/list',
+    publicHeight: 65,
+    method: 'POST',
+    filename:'监测点联调列表',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        {
+            field: 'powerSubstationName',
+            title: '电网侧变电站',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'lineName', title: '监测点名称', minWidth: 170 },
+        {
+            field: 'reason',
+            title: '调试原因',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'lineId', title: '监测点编号', minWidth: 170 },
+        // { field: 'monitoringTerminalCode', title: '终端编码', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning',
+                5: 'primary'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消',
+                5: '同步台账成功',
+                null: '/'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+     
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    },
+                    disabled: row => {
+                        return !row.processInstanceId
+                    }
+                },
+                // {
+                //     name: 'edit',
+                //     title: '编辑',
+                //     type: 'primary',
+                //     icon: 'el-icon-Open',
+                //     render: 'basicButton',
+                //     showDisabled: row => {
+                //         return row.createBy != adminInfo.$state.id || !(row.status == 0)
+                //     },
+                //     disabled: row => {
+                //         return !(row.status == 0)
+                //     },
+                //     click: row => {
+                //         debugForms.value.open('编辑', row)
+                //     }
+                // },
+                {
+                    name: 'productSetting',
+                    title: '申请联调',
+                    type: 'primary',
+                    icon: 'el-icon-add',
+                    render: 'basicButton',
+                    click: row => {
+                        // handleDebug(row)
+                        debugForms.value.open('申请联调', row)
+                    },
+                    disabled: row => {
+                        return row.reason
+                    }
+                },
+
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        debugForms.value.open('重新发起', row)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '同步台账',
+                    type: 'primary',
+                    icon: 'el-icon-add',
+                    render: 'basicButton',
+                    click: row => {
+                        setTempLinedebugLedgerSync({ id: row.id }).then(res => {
+                            if (res.code == 'A0000') {
+                                ElMessage({
+                                    message: '台账同步成功',
+                                    type: 'success'
+                                })
+                                tableStore.index()
+                            }
+                        })
+                    },
+                    disabled: row => {
+                        return row.status != 2
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.statveList = [2]
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
+    },
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.status =
+                item.status == 0
+                    ? '待提交审批'
+                    : item.status == 1
+                    ? '审批中'
+                    : item.status == 2
+                    ? '审批通过'
+                    : item.status == 3
+                    ? '审批不通过'
+                    : item.status == 4
+                    ? '已取消':item.status == 5
+                    ? '同步台账成功':'/'
+            return item
+        })
+    }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.searchValue = ''
+// tableStore.table.params.loadType = ''
+// tableStore.table.params.userName = ''
+// tableStore.table.params.fileUploadflag = ''
+
+provide('tableStore', tableStore)
+
+const exportEvent = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    getLoadTypeUserList(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '未建档非线性用户', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+
+                deleteTempLineDebugReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除成功!'
+                    })
+                    tableStore.index()
+                })
+
+            })
+    }
+}
+onMounted(() => {
+    tableStore.index()
+})
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+//申请联调
+const debugForms = ref()
+const debugId = ref('')
+const handleDebug = (row: any) => {
+    debugId.value = row.id
+    console.log(debugId.value)
+    debugForms.value.open('申请联调', row)
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelMointorPointTempLinedebug(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    const fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+    await getMointorPointTempLinedebugDetail({ id: fullId }).then(res => {
+        if (res && res.code == 'A0000') {
+            debugForms.value.open('重新发起', res.data)
+        }
+    })
+}, { immediate: true })
+</script>
+
+<style scoped lang="scss">
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+
+::v-deep .el-input__wrapper {
+    // width: 200px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index 8e2ffc06..e0ec8452 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -107,9 +107,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 150,
-            fixed: 'right',
+         
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index 087d2485..b9cd6260 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -1,388 +1,388 @@
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll showExport ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="搜索">
-                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端名称"
-                    clearable style="width: 180px"></el-input>
-            </el-form-item>
-            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                    <el-option v-for="item in statusSelect" :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="addFormModel">新增</el-button>
-            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"
-                :loading="loading">模版下载</el-button>
-            <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-
-    <!-- 新增弹框 -->
-    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
-    <!-- 上传模版 -->
-    <uploadATemplate ref="uploadATemplateRef" />
-
-    <!-- 上传模版 详情 -->
-    <el-dialog title="详情" width="80%" v-model="dialogShow" v-if="dialogShow">
-        <DetailInfo :id="userId"></DetailInfo>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, watch } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import { downloadDevTemplate } from '@/api/supervision-boot/userReport/form'
-import { ElMessage } from 'element-plus'
-import { ElMessageBox } from 'element-plus/es'
-import DetailInfo from '@/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue'
-import { cancelTerminalFormData, getTerminalDetailsById } from '@/api/supervision-boot/terminal/index'
-import uploadATemplate from './uploadATemplate.vue'
-import addForm from './addForm.vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { deleteDevReport } from '@/api/supervision-boot/delete/index'
-import { getUserReportById } from "@/api/supervision-boot/interfere";
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const { push, options, currentRoute } = useRouter()
-const TableHeaderRef = ref()
-const userId = ref()
-const loading = ref(false)
-const tableRef = ref()
-const areaOptionList = dictData.getBasicData('jibei_area')
-const statusSelect = dictData.statusSelect()
-const ruleFormRef = ref()
-const uploadATemplateRef = ref()
-const show: any = ref(false)
-const fileList = ref([])
-const dialogShow = ref(false)
-const flag = ref(false)
-const tableStore = new TableStore({
-    url: '/supervision-boot/deVReport/list',
-    publicHeight: 65,
-    method: 'POST',
-    filename:'终端入网检测',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        {
-            field: 'orgName',
-            title: '填报部门名称',
-            minWidth: 170,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : ''
-                return row.cellValue
-            }
-        },
-        {
-            field: 'substationName',
-            title: '所属变电站',
-            minWidth: 170,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : '/'
-                return row.cellValue
-            }
-        },
-        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
-        { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 170 },
-        { field: 'reportDate', title: '填报日期', minWidth: 170 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.importType != 0 || !row.processInstanceId
-                    },
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-
-                {
-                    name: 'productSetting',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.importType != 1
-                    },
-                    click: row => {
-                        userId.value = row.id
-                        dialogShow.value = true
-                    }
-                },
-
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.importType == 1 ? false : row.createBy != adminInfo.$state.id || !(row.status == 0)
-                    },
-                    disabled: row => {
-                        return row.importType == 1 ? false : !(row.status == 0)
-                    },
-                    click: row => {
-                        addForms.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        addForms.value.open({
-                            title: '重新发起',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        // tableStore.table.params.relationUserName = tableStore.table.params.userName
-    },
-    exportProcessingData: () => {
-        tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.status =
-                item.status == 0
-                    ? '待提交审批'
-                    : item.status == 1
-                    ? '审批中'
-                    : item.status == 2
-                    ? '审批通过'
-                    : item.status == 3
-                    ? '审批不通过'
-                    : '已取消'
-            return item
-        })
-    }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.searchValue = ''
-// tableStore.table.params.loadType = ''
-// tableStore.table.params.userName = ''
-// tableStore.table.params.fileUploadflag = ''
-
-provide('tableStore', tableStore)
-
-const addForms = ref()
-const addFormModel = () => {
-    setTimeout(() => {
-        addForms.value.open({
-            title: '终端信息'
-        })
-    }, 0)
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelTerminalFormData(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        })
-            .then(() => {
-                deleteDevReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除成功!'
-                    })
-                    tableStore.index()
-                })
-            })
-
-
-
-
-    }
-}
-
-//导出模板
-const exportExcelTemplate = async () => {
-    loading.value = true
-    downloadDevTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '终端入网检测模板'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-//批量导入用户数据
-const importUserData = () => {
-    uploadATemplateRef.value.open('导入终端入网检测')
-}
-onMounted(() => {
-    tableStore.index()
-})
-
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    const fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    await getTerminalDetailsById({ id: fullId }).then(res => {
-        if (res && res.code == 'A0000') {
-            addForms.value.open({
-                title: '重新发起',
-                row: res.data
-            })
-        }
-    })
-}, { immediate: true })
-
-</script>
-
-<style scoped lang="scss">
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-
-::v-deep .el-input__wrapper {
-    // width: 200px !important;
-}
-</style>
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime showTimeAll showExport ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="搜索">
+                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端名称"
+                    clearable style="width: 180px"></el-input>
+            </el-form-item>
+            <el-form-item label="流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-option v-for="item in statusSelect" :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="addFormModel">新增</el-button>
+            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"
+                :loading="loading">模版下载</el-button>
+            <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+
+    <!-- 新增弹框 -->
+    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
+    <!-- 上传模版 -->
+    <uploadATemplate ref="uploadATemplateRef" />
+
+    <!-- 上传模版 详情 -->
+    <el-dialog title="详情" width="80%" v-model="dialogShow" v-if="dialogShow">
+        <DetailInfo :id="userId"></DetailInfo>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { downloadDevTemplate } from '@/api/supervision-boot/userReport/form'
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+import DetailInfo from '@/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue'
+import { cancelTerminalFormData, getTerminalDetailsById } from '@/api/supervision-boot/terminal/index'
+import uploadATemplate from './uploadATemplate.vue'
+import addForm from './addForm.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { deleteDevReport } from '@/api/supervision-boot/delete/index'
+import { getUserReportById } from "@/api/supervision-boot/interfere";
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const { push, options, currentRoute } = useRouter()
+const TableHeaderRef = ref()
+const userId = ref()
+const loading = ref(false)
+const tableRef = ref()
+const areaOptionList = dictData.getBasicData('jibei_area')
+const statusSelect = dictData.statusSelect()
+const ruleFormRef = ref()
+const uploadATemplateRef = ref()
+const show: any = ref(false)
+const fileList = ref([])
+const dialogShow = ref(false)
+const flag = ref(false)
+const tableStore = new TableStore({
+    url: '/supervision-boot/deVReport/list',
+    publicHeight: 65,
+    method: 'POST',
+    filename:'终端入网检测',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        {
+            field: 'orgName',
+            title: '填报部门名称',
+            minWidth: 170,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : ''
+                return row.cellValue
+            }
+        },
+        {
+            field: 'substationName',
+            title: '所属变电站',
+            minWidth: 170,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
+        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
+        { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 170 },
+        { field: 'reportDate', title: '填报日期', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+           
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.importType != 0 || !row.processInstanceId
+                    },
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+
+                {
+                    name: 'productSetting',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.importType != 1
+                    },
+                    click: row => {
+                        userId.value = row.id
+                        dialogShow.value = true
+                    }
+                },
+
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.importType == 1 ? false : row.createBy != adminInfo.$state.id || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return row.importType == 1 ? false : !(row.status == 0)
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
+    },
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.status =
+                item.status == 0
+                    ? '待提交审批'
+                    : item.status == 1
+                    ? '审批中'
+                    : item.status == 2
+                    ? '审批通过'
+                    : item.status == 3
+                    ? '审批不通过'
+                    : '已取消'
+            return item
+        })
+    }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.searchValue = ''
+// tableStore.table.params.loadType = ''
+// tableStore.table.params.userName = ''
+// tableStore.table.params.fileUploadflag = ''
+
+provide('tableStore', tableStore)
+
+const addForms = ref()
+const addFormModel = () => {
+    setTimeout(() => {
+        addForms.value.open({
+            title: '终端信息'
+        })
+    }, 0)
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelTerminalFormData(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+                deleteDevReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除成功!'
+                    })
+                    tableStore.index()
+                })
+            })
+
+
+
+
+    }
+}
+
+//导出模板
+const exportExcelTemplate = async () => {
+    loading.value = true
+    downloadDevTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '终端入网检测模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+//批量导入用户数据
+const importUserData = () => {
+    uploadATemplateRef.value.open('导入终端入网检测')
+}
+onMounted(() => {
+    tableStore.index()
+})
+
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    const fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+    await getTerminalDetailsById({ id: fullId }).then(res => {
+        if (res && res.code == 'A0000') {
+            addForms.value.open({
+                title: '重新发起',
+                row: res.data
+            })
+        }
+    })
+}, { immediate: true })
+
+</script>
+
+<style scoped lang="scss">
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+
+::v-deep .el-input__wrapper {
+    // width: 200px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise/testRun/index.vue b/src/views/pqs/supervise/testRun/index.vue
index cf31135b..dc4fc6f4 100644
--- a/src/views/pqs/supervise/testRun/index.vue
+++ b/src/views/pqs/supervise/testRun/index.vue
@@ -146,9 +146,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 230,
-            fixed: 'right',
+          
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/supervise_hn/electricalEnergy/components/audit.vue b/src/views/pqs/supervise_hn/electricalEnergy/components/audit.vue
index 9ce86866..8a19821e 100644
--- a/src/views/pqs/supervise_hn/electricalEnergy/components/audit.vue
+++ b/src/views/pqs/supervise_hn/electricalEnergy/components/audit.vue
@@ -1,155 +1,155 @@
-<template>
-    <div>
-        <TableHeader area datePicker ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="问题来源">
-                    <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
-                        <el-option
-                            v-for="item in problemData"
-                            :key="item.code"
-                            :label="item.name"
-                            :value="item.code"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="填报进度">
-                    <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
-                        <el-option
-                            v-for="item in fillingProgress"
-                            :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.problemName"
-                        clearable
-                        placeholder="请输入问题名称"
-                        style="width: 100%"
-                    ></el-input>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-
-        <!-- 审核 -->
-        <el-dialog draggable title="问题审核" v-model="dialogVisible" width="1400px" :before-close="beforeClose">
-            <Filling
-                ref="FillingRef"
-                v-if="dialogVisible"
-                :isDisabled="true"
-                :audit="true"
-                :flag="true"
-                @beforeClose="beforeClose"
-            />
-        </el-dialog>
-
-        <!-- 审核记录 -->
-        <recording ref="recordingRef" />
-    </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 { useDictData } from '@/stores/dictData'
-
-import Filling from './filling.vue'
-import recording from './recording.vue'
-const dictData = useDictData()
-const problemData = dictData.getBasicData('Problem_Sources')
-const fillingProgress = dictData.getBasicData('Fill_Progress')
-const TableHeaderRef = ref()
-const FillingRef = ref()
-const ruleFormRef = ref()
-
-const list: any = ref({})
-const recordingRef = ref(false)
-const dialogVisible = ref(false)
-const tableStore = new TableStore({
-    url: '/process-boot/electricityQuality/getIssues',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'orgName', title: '所属单位' },
-        {
-            field: 'problemSources',
-            title: '问题来源'
-        },
-        { field: 'powerQualityProblemNo', title: '问题编号' },
-        { field: 'problemName', title: '问题名称' },
-
-        { field: 'dataDate', title: '提交时间' },
-        {
-            field: 'reportProcess',
-            title: '填报节点',
-            formatter: (row: any) => {
-                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            width: '150',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '审核',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {
-                        dialogVisible.value = true
-                        setTimeout(() => {
-                            list.value = row
-                            FillingRef.value.open(row)
-                        }, 10)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '审核记录',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {
-                        recordingRef.value.open(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
-        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
-    }
-})
-
-tableStore.table.params.problemSources = ''
-tableStore.table.params.reportProcess = ''
-tableStore.table.params.problemName = ''
-tableStore.table.params.reportProcessStatus = 'Auditt'
-
-const beforeClose = () => {
-    tableStore.index()
-    dialogVisible.value = false
-}
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div>
+        <TableHeader area datePicker ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="问题来源">
+                    <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
+                        <el-option
+                            v-for="item in problemData"
+                            :key="item.code"
+                            :label="item.name"
+                            :value="item.code"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="填报进度">
+                    <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
+                        <el-option
+                            v-for="item in fillingProgress"
+                            :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.problemName"
+                        clearable
+                        placeholder="请输入问题名称"
+                        style="width: 100%"
+                    ></el-input>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+
+        <!-- 审核 -->
+        <el-dialog draggable title="问题审核" v-model="dialogVisible" width="1400px" :before-close="beforeClose">
+            <Filling
+                ref="FillingRef"
+                v-if="dialogVisible"
+                :isDisabled="true"
+                :audit="true"
+                :flag="true"
+                @beforeClose="beforeClose"
+            />
+        </el-dialog>
+
+        <!-- 审核记录 -->
+        <recording ref="recordingRef" />
+    </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 { useDictData } from '@/stores/dictData'
+
+import Filling from './filling.vue'
+import recording from './recording.vue'
+const dictData = useDictData()
+const problemData = dictData.getBasicData('Problem_Sources')
+const fillingProgress = dictData.getBasicData('Fill_Progress')
+const TableHeaderRef = ref()
+const FillingRef = ref()
+const ruleFormRef = ref()
+
+const list: any = ref({})
+const recordingRef = ref(false)
+const dialogVisible = ref(false)
+const tableStore = new TableStore({
+    url: '/process-boot/electricityQuality/getIssues',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'problemSources',
+            title: '问题来源'
+        },
+        { field: 'powerQualityProblemNo', title: '问题编号' },
+        { field: 'problemName', title: '问题名称' },
+
+        { field: 'dataDate', title: '提交时间' },
+        {
+            field: 'reportProcess',
+            title: '填报节点',
+            formatter: (row: any) => {
+                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '150',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '审核',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {
+                        dialogVisible.value = true
+                        setTimeout(() => {
+                            list.value = row
+                            FillingRef.value.open(row)
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '审核记录',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {
+                        recordingRef.value.open(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
+        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
+    }
+})
+
+tableStore.table.params.problemSources = ''
+tableStore.table.params.reportProcess = ''
+tableStore.table.params.problemName = ''
+tableStore.table.params.reportProcessStatus = 'Auditt'
+
+const beforeClose = () => {
+    tableStore.index()
+    dialogVisible.value = false
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise_hn/electricalEnergy/components/maintenance.vue b/src/views/pqs/supervise_hn/electricalEnergy/components/maintenance.vue
index 17f754fa..a78c273f 100644
--- a/src/views/pqs/supervise_hn/electricalEnergy/components/maintenance.vue
+++ b/src/views/pqs/supervise_hn/electricalEnergy/components/maintenance.vue
@@ -1,255 +1,255 @@
-<template>
-    <TableHeader area datePicker ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="问题来源">
-                <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
-                    <el-option
-                        v-for="item in problemData"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="填报进度">
-                <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
-                    <el-option
-                        v-for="item in fillingProgress"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="状态">
-                <el-select v-model="tableStore.table.params.reportProcessStatus" clearable placeholder="请选择状态">
-                    <el-option
-                        v-for="item in auditStatus"
-                        :key="item.code"
-                        :label="item.name"
-                        :value="item.code"
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="问题名称">
-                <el-input
-                    v-model="tableStore.table.params.problemName"
-                    clearable
-                    placeholder="请填写问题名称"
-                    style="width: 100%"
-                ></el-input>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" />
-    <!-- 新增 -->
-    <NewlyAdd v-if="showNewlyAdded" @handleClose="handleClose" @onSubmit="beforeClose" />
-    <!-- 填报 -->
-    <el-dialog draggable title="填报" v-model="dialogVisible" width="1400px" :before-close="beforeClose">
-        <Filling ref="FillingRef" v-if="dialogVisible" @beforeClose="beforeClose" />
-    </el-dialog>
-
-    <!-- 详情 -->
-    <Detail ref="detailRef" />
-
-    <!-- 审核记录 -->
-    <recording ref="recordingRef" />
-</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 { deleteIssues, archive } from '@/api/process-boot/electricitymanagement'
-import { useDictData } from '@/stores/dictData'
-import NewlyAdd from './NewlyAdd.vue'
-import Filling from './filling.vue'
-import Detail from './detail.vue'
-import recording from './recording.vue'
-const dictData = useDictData()
-const FillingRef = ref()
-
-const showNewlyAdded = ref(false)
-const dialogVisible = ref(false)
-const recordingRef = ref(false)
-const TableHeaderRef = ref()
-const detailRef = ref()
-const problemData = dictData.getBasicData('Problem_Sources')
-const fillingProgress = dictData.getBasicData('Fill_Progress')
-const auditStatus = dictData.getBasicData('Audit_Status')
-
-const tableStore: any = new TableStore({
-    url: '/process-boot/electricityQuality/getIssues',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        // { width: '60', type: 'checkbox' },
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'orgName', title: '所属单位' },
-        {
-            field: 'problemSources',
-            title: '问题来源'
-        },
-        { field: 'powerQualityProblemNo', title: '问题编号' },
-        { field: 'problemName', title: '问题名称' },
-        { field: 'dataDate', title: '问题新建时间' },
-        {
-            field: 'reportProcess',
-            title: '填报进度',
-            formatter: (row: any) => {
-                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'reportProcessStatus',
-            title: '状态',
-            formatter: (row: any) => {
-                return auditStatus.filter(item => item.code == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '查看',
-                    type: 'primary',
-                    disabled: row => {
-                        return row.reportProcessStatus == 'Init'
-                    },
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: async row => {
-                        detailRef.value.open(row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '填报',
-                    disabled: row => {
-                        return (
-                            row.reportProcessStatus == 'Auditt' ||
-                            (row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success') ||
-                            row.reportProcess == 'Archived'
-                        )
-                    },
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        dialogVisible.value = true
-                        setTimeout(() => {
-                            FillingRef.value.open(row)
-                        }, 10)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '归档',
-                    disabled: row => {
-                        return !(row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success')
-                    },
-                    type: 'primary',
-                    icon: 'el-icon-SuccessFilled',
-                    render: 'basicButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定归档？'
-                    },
-                    click: row => {
-                        archive(row.powerQualityProblemNo).then(() => {
-                            ElMessage.success('归档成功！')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '审核记录',
-                    type: 'primary',
-                    disabled: row => {
-                        return row.reportProcessStatus == 'Init'
-                    },
-                    icon: 'el-icon-PieChart',
-                    render: 'basicButton',
-                    click: row => {
-                        recordingRef.value.open(row)
-                    }
-                },
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    disabled: row => {
-                        return row.reportProcess == 'Archived'
-                    },
-                    click: row => {
-                        deleteIssues(row.powerQualityProblemNo).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
-        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
-    }
-})
-
-tableStore.table.params.problemName = ''
-tableStore.table.params.problemSources = ''
-tableStore.table.params.reportProcess = ''
-tableStore.table.params.reportProcessStatus = ''
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    TableHeaderRef.value.setDatePicker([
-        { label: '年', value: 1 },
-        { label: '季', value: 2 },
-        { label: '月', value: 3 }
-    ])
-
-    tableStore.index()
-})
-// 新增
-const add = () => {
-    showNewlyAdded.value = true
-}
-
-// 关闭弹框
-const handleClose = () => {
-    showNewlyAdded.value = false
-}
-// 关闭 填报
-const beforeClose = () => {
-    dialogVisible.value = false
-    tableStore.index()
-}
-</script>
+<template>
+    <TableHeader area datePicker ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="问题来源">
+                <el-select v-model="tableStore.table.params.problemSources" clearable placeholder="请选择问题来源">
+                    <el-option
+                        v-for="item in problemData"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="填报进度">
+                <el-select v-model="tableStore.table.params.reportProcess" clearable placeholder="请选择填报进度">
+                    <el-option
+                        v-for="item in fillingProgress"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="状态">
+                <el-select v-model="tableStore.table.params.reportProcessStatus" clearable placeholder="请选择状态">
+                    <el-option
+                        v-for="item in auditStatus"
+                        :key="item.code"
+                        :label="item.name"
+                        :value="item.code"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="问题名称">
+                <el-input
+                    v-model="tableStore.table.params.problemName"
+                    clearable
+                    placeholder="请填写问题名称"
+                    style="width: 100%"
+                ></el-input>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!-- 新增 -->
+    <NewlyAdd v-if="showNewlyAdded" @handleClose="handleClose" @onSubmit="beforeClose" />
+    <!-- 填报 -->
+    <el-dialog draggable title="填报" v-model="dialogVisible" width="1400px" :before-close="beforeClose">
+        <Filling ref="FillingRef" v-if="dialogVisible" @beforeClose="beforeClose" />
+    </el-dialog>
+
+    <!-- 详情 -->
+    <Detail ref="detailRef" />
+
+    <!-- 审核记录 -->
+    <recording ref="recordingRef" />
+</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 { deleteIssues, archive } from '@/api/process-boot/electricitymanagement'
+import { useDictData } from '@/stores/dictData'
+import NewlyAdd from './NewlyAdd.vue'
+import Filling from './filling.vue'
+import Detail from './detail.vue'
+import recording from './recording.vue'
+const dictData = useDictData()
+const FillingRef = ref()
+
+const showNewlyAdded = ref(false)
+const dialogVisible = ref(false)
+const recordingRef = ref(false)
+const TableHeaderRef = ref()
+const detailRef = ref()
+const problemData = dictData.getBasicData('Problem_Sources')
+const fillingProgress = dictData.getBasicData('Fill_Progress')
+const auditStatus = dictData.getBasicData('Audit_Status')
+
+const tableStore: any = new TableStore({
+    url: '/process-boot/electricityQuality/getIssues',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        // { width: '60', type: 'checkbox' },
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'orgName', title: '所属单位' },
+        {
+            field: 'problemSources',
+            title: '问题来源'
+        },
+        { field: 'powerQualityProblemNo', title: '问题编号' },
+        { field: 'problemName', title: '问题名称' },
+        { field: 'dataDate', title: '问题新建时间' },
+        {
+            field: 'reportProcess',
+            title: '填报进度',
+            formatter: (row: any) => {
+                return fillingProgress.filter(item => item.code == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'reportProcessStatus',
+            title: '状态',
+            formatter: (row: any) => {
+                return auditStatus.filter(item => item.code == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '查看',
+                    type: 'primary',
+                    disabled: row => {
+                        return row.reportProcessStatus == 'Init'
+                    },
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: async row => {
+                        detailRef.value.open(row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '填报',
+                    disabled: row => {
+                        return (
+                            row.reportProcessStatus == 'Auditt' ||
+                            (row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success') ||
+                            row.reportProcess == 'Archived'
+                        )
+                    },
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        dialogVisible.value = true
+                        setTimeout(() => {
+                            FillingRef.value.open(row)
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '归档',
+                    disabled: row => {
+                        return !(row.reportProcess == 'Insights' && row.reportProcessStatus == 'Success')
+                    },
+                    type: 'primary',
+                    icon: 'el-icon-SuccessFilled',
+                    render: 'basicButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定归档？'
+                    },
+                    click: row => {
+                        archive(row.powerQualityProblemNo).then(() => {
+                            ElMessage.success('归档成功！')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '审核记录',
+                    type: 'primary',
+                    disabled: row => {
+                        return row.reportProcessStatus == 'Init'
+                    },
+                    icon: 'el-icon-PieChart',
+                    render: 'basicButton',
+                    click: row => {
+                        recordingRef.value.open(row)
+                    }
+                },
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    disabled: row => {
+                        return row.reportProcess == 'Archived'
+                    },
+                    click: row => {
+                        deleteIssues(row.powerQualityProblemNo).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.dataDate = tableStore.table.params.searchBeginTime
+        tableStore.table.params.dataType = TableHeaderRef.value.datePickerRef.interval
+    }
+})
+
+tableStore.table.params.problemName = ''
+tableStore.table.params.problemSources = ''
+tableStore.table.params.reportProcess = ''
+tableStore.table.params.reportProcessStatus = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    TableHeaderRef.value.setDatePicker([
+        { label: '年', value: 1 },
+        { label: '季', value: 2 },
+        { label: '月', value: 3 }
+    ])
+
+    tableStore.index()
+})
+// 新增
+const add = () => {
+    showNewlyAdded.value = true
+}
+
+// 关闭弹框
+const handleClose = () => {
+    showNewlyAdded.value = false
+}
+// 关闭 填报
+const beforeClose = () => {
+    dialogVisible.value = false
+    tableStore.index()
+}
+</script>
diff --git a/src/views/pqs/supervise_hn/electricalEnergy/components1/complaints.vue b/src/views/pqs/supervise_hn/electricalEnergy/components1/complaints.vue
index 29e8de93..312a39d5 100644
--- a/src/views/pqs/supervise_hn/electricalEnergy/components1/complaints.vue
+++ b/src/views/pqs/supervise_hn/electricalEnergy/components1/complaints.vue
@@ -1,225 +1,225 @@
-<template>
-  <!-- 用户投诉 -->
-  <!-- 2 有新增 发起 预警单 -->
-
-  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-    <template v-slot:select>
-      <el-form-item label="是否解决">
-        <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-            :value="item.value"></el-option>
-        </el-select>
-      </el-form-item>
-    </template>
-    <template v-slot:operation>
-      <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-    </template>
-  </TableHeader>
-  <Table ref="tableRef" />
-  <!-- 新增 -->
-  <complaintsForm ref="formRef" @onSubmit="tableStore.index()" />
-  <!-- 详情 -->
-  <detail ref="detailRef" />
-</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 { useDictData } from '@/stores/dictData'
-import complaintsForm from './form/complaintsForm.vue'
-import { useRouter } from 'vue-router'
-import { sureInitiateWarningLeaflet } from '@/api/process-boot/electricitymanagement'
-import detail from './complaintsDetail.vue';
-// Steady_Statis
-const dictData = useDictData()
-const exceeded = dictData.getBasicData('Steady_Statis')
-const tableRef = ref()
-const planAddRef = ref()
-const formRef = ref()
-const TableHeaderRef = ref()
-const detailRef = ref()
-const router = useRouter() // 路由对象
-const dealStateList = ref([
-  {
-    label: '未解决',
-    value: '0'
-  },
-
-])
-const tableStore = new TableStore({
-  url: '/supervision-boot/SupervisionUserComplaint/list',
-  publicHeight: 65,
-  method: 'POST',
-  column: [
-    {
-      title: '序号',
-
-      align: 'center',
-      width: 80,
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { field: 'userName', title: '用户名称' },
-    { field: 'userNumber', title: '用户编号' },
-    { field: 'dutyOrgName', title: '负责单位', minWidth: '80' },
-    // { field: 'userCategory', title: '用户类别' },
-
-    { field: 'complaintText', title: '投诉内容' },
-    { field: 'steadyIndicator', title: '稳态指标' },
-    { field: 'transientIndicators', title: '暂态指标' },
-    {
-      field: 'monitorName',
-      title: '监测点名称',
-      formatter: (row: any) => {
-        return row.cellValue ? row.cellValue : '/'
-      }
-    },
-    {
-      field: 'detectionFlag',
-      title: '是否实现监测',
-
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-
-      },
-      replaceValue: {
-        0: '否',
-        1: '是',
-
-      }
-    },
-
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 80,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    {
-      field: 'dealState',
-      title: '是否解决',
-
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        null: 'info'
-      },
-      replaceValue: {
-        0: '未解决',
-        1: '已解决',
-        null: '/'
-      }
-    },
-    {
-      title: '操作',
-      minWidth: 120,
-      align: 'center',
-      render: 'buttons',
-      buttons: [
-        {
-          name: 'edit',
-          title: '发起告警单',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.dealState != 0
-          },
-          // popconfirm: {
-          //     confirmButtonText: '确认',
-          //     cancelButtonText: '取消',
-          //     confirmButtonType: 'primary',
-          //     title: '请确认发起告警单!'
-          // },
-          click: async row => {
-            const { value } = await ElMessageBox.prompt('', '整改意见', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-
-              inputType: 'textarea',
-              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-              inputErrorMessage: '请输入整改意见'
-            })
-            sureInitiateWarningLeaflet({ id: row.id, reformAdvice: value }).then(res => {
-              ElMessage.success('发起告警单成功！')
-              tableStore.index()
-            })
-
-          }
-        },
-        {
-          name: 'edit',
-          title: '详情',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.dealState == 0
-          },
-
-          click: row => {
-            detailRef.value.open({
-              row: row,
-              title: '详情',
-
-            })
-
-          }
-        },
-        {
-          name: 'edit',
-          title: '查看告警单',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.initiateWarningFlag == 0
-          },
-          click: row => {
-            router.push({
-              name: 'supervision/supervision/manage',
-              query: {
-                type: 1,
-                t: Date.now()
-              }
-            })
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    tableStore.table.params.currentPage = tableStore.table.params.pageNum
-  },
-  loadCallback: () => {
-    // tableStore.table.data = [
-    //     {
-    //         userName: '东润开阳堡光伏电站用户',
-    //         userId: '8115771123274',
-    //         complaintContent: '终端频繁重启',
-    //         complaintTime: '2024-05-16'
-    //     }
-    // ]
-  }
-})
-
-provide('tableStore', tableStore)
-tableStore.table.params.dealState = ''
-onMounted(() => {
-  tableStore.index()
-})
-// 新增
-const add = () => {
-  formRef.value.open({ text: '新增投诉' })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <!-- 用户投诉 -->
+  <!-- 2 有新增 发起 预警单 -->
+
+  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <template v-slot:select>
+      <el-form-item label="是否解决">
+        <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
+            :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+    </template>
+    <template v-slot:operation>
+      <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+    </template>
+  </TableHeader>
+  <Table ref="tableRef" />
+  <!-- 新增 -->
+  <complaintsForm ref="formRef" @onSubmit="tableStore.index()" />
+  <!-- 详情 -->
+  <detail ref="detailRef" />
+</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 { useDictData } from '@/stores/dictData'
+import complaintsForm from './form/complaintsForm.vue'
+import { useRouter } from 'vue-router'
+import { sureInitiateWarningLeaflet } from '@/api/process-boot/electricitymanagement'
+import detail from './complaintsDetail.vue';
+// Steady_Statis
+const dictData = useDictData()
+const exceeded = dictData.getBasicData('Steady_Statis')
+const tableRef = ref()
+const planAddRef = ref()
+const formRef = ref()
+const TableHeaderRef = ref()
+const detailRef = ref()
+const router = useRouter() // 路由对象
+const dealStateList = ref([
+  {
+    label: '未解决',
+    value: '0'
+  },
+
+])
+const tableStore = new TableStore({
+  url: '/supervision-boot/SupervisionUserComplaint/list',
+  publicHeight: 65,
+  method: 'POST',
+  column: [
+    {
+      title: '序号',
+
+      align: 'center',
+      width: 80,
+      formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      }
+    },
+    { field: 'userName', title: '用户名称' },
+    { field: 'userNumber', title: '用户编号' },
+    { field: 'dutyOrgName', title: '负责单位', minWidth: '80' },
+    // { field: 'userCategory', title: '用户类别' },
+
+    { field: 'complaintText', title: '投诉内容' },
+    { field: 'steadyIndicator', title: '稳态指标' },
+    { field: 'transientIndicators', title: '暂态指标' },
+    {
+      field: 'monitorName',
+      title: '监测点名称',
+      formatter: (row: any) => {
+        return row.cellValue ? row.cellValue : '/'
+      }
+    },
+    {
+      field: 'detectionFlag',
+      title: '是否实现监测',
+
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+
+      },
+      replaceValue: {
+        0: '否',
+        1: '是',
+
+      }
+    },
+
+    {
+      field: 'createBy',
+      title: '填报人',
+      minWidth: 80,
+      formatter: (row: any) => {
+        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+      }
+    },
+    {
+      field: 'dealState',
+      title: '是否解决',
+
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+        null: 'info'
+      },
+      replaceValue: {
+        0: '未解决',
+        1: '已解决',
+        null: '/'
+      }
+    },
+    {
+       title: '操作',fixed: 'right',
+      minWidth: 120,
+      align: 'center',
+      render: 'buttons',
+      buttons: [
+        {
+          name: 'edit',
+          title: '发起告警单',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.dealState != 0
+          },
+          // popconfirm: {
+          //     confirmButtonText: '确认',
+          //     cancelButtonText: '取消',
+          //     confirmButtonType: 'primary',
+          //     title: '请确认发起告警单!'
+          // },
+          click: async row => {
+            const { value } = await ElMessageBox.prompt('', '整改意见', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+
+              inputType: 'textarea',
+              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+              inputErrorMessage: '请输入整改意见'
+            })
+            sureInitiateWarningLeaflet({ id: row.id, reformAdvice: value }).then(res => {
+              ElMessage.success('发起告警单成功！')
+              tableStore.index()
+            })
+
+          }
+        },
+        {
+          name: 'edit',
+          title: '详情',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.dealState == 0
+          },
+
+          click: row => {
+            detailRef.value.open({
+              row: row,
+              title: '详情',
+
+            })
+
+          }
+        },
+        {
+          name: 'edit',
+          title: '查看告警单',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.initiateWarningFlag == 0
+          },
+          click: row => {
+            router.push({
+              name: 'supervision/supervision/manage',
+              query: {
+                type: 1,
+                t: Date.now()
+              }
+            })
+          }
+        }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    tableStore.table.params.currentPage = tableStore.table.params.pageNum
+  },
+  loadCallback: () => {
+    // tableStore.table.data = [
+    //     {
+    //         userName: '东润开阳堡光伏电站用户',
+    //         userId: '8115771123274',
+    //         complaintContent: '终端频繁重启',
+    //         complaintTime: '2024-05-16'
+    //     }
+    // ]
+  }
+})
+
+provide('tableStore', tableStore)
+tableStore.table.params.dealState = ''
+onMounted(() => {
+  tableStore.index()
+})
+// 新增
+const add = () => {
+  formRef.value.open({ text: '新增投诉' })
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise_hn/electricalEnergy/components1/online.vue b/src/views/pqs/supervise_hn/electricalEnergy/components1/online.vue
index ad4f15f4..fe9669d4 100644
--- a/src/views/pqs/supervise_hn/electricalEnergy/components1/online.vue
+++ b/src/views/pqs/supervise_hn/electricalEnergy/components1/online.vue
@@ -1,378 +1,378 @@
-<template>
-  <!-- <div>1 监测点信息  发起预告警单 </div> -->
-
-  <TableHeader datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-    <template v-slot:select>
-      <el-form-item label="区域">
-        <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea"/>
-      </el-form-item>
-      <el-form-item label="监测点性质">
-        <el-select v-model="tableStore.table.params.lineType" clearable placeholder="请选择监测点性质">
-          <el-option label="电网侧" value="0"/>
-          <el-option label="非电网侧" value="1"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="超标指标">
-        <el-select
-            v-model="tableStore.table.params.targetList"
-            clearable
-            multiple
-            collapse-tags
-            collapse-tags-tooltip
-            placeholder="请选择超标指标"
-        >
-          <el-option v-for="item in exceeded" :key="item.id" :label="item.name" :value="item.id"/>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="数据类型">
-        <el-switch
-            v-model="tableStore.table.params.dataType"
-            inline-prompt
-            active-value="1"
-            inactive-value="0"
-            active-text="超标数据"
-            inactive-text="无数据"
-        />
-      </el-form-item>
-      <el-form-item label="预警阈值">
-        <!-- <el-input v-model="tableStore.table.params.alertThreshold" placeholder="请输入预警阈值" clearable></el-input> -->
-        <el-input-number
-            v-model="tableStore.table.params.alertThreshold"
-            :min="0"
-            :step="1"
-            step-strictly
-            @change="changeAlert"
-        />
-      </el-form-item>
-      <el-form-item label="告警阈值">
-        <el-input-number
-            v-model="tableStore.table.params.alarmThreshold"
-            :min="0"
-            :step="1"
-            step-strictly
-            @change="changeAlarm"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="搜索">
-          <el-input
-              v-model="tableStore.table.params.searchValue"
-              placeholder="输入变电站、终端、监测点名称"
-              clearable
-          ></el-input>
-      </el-form-item> -->
-    </template>
-    <template #operation>
-      <el-button icon="el-icon-Plus" :disabled="flag > 2" type="primary" @click="launch('发起预警单')">
-        发起预警单
-      </el-button>
-      <el-button icon="el-icon-Plus" :disabled="flag > 2" type="primary" @click="launch('发起告警单')">
-        发起告警单
-      </el-button>
-    </template>
-  </TableHeader>
-  <Table ref="tableRef"/>
-  <!-- /告警单 -->
-  <alarmList ref="alarmListRef" @onSubmit="tableStore.index()"/>
-  <!-- 详情 -->
-  <detail ref="detailRef"/>
-</template>
-<script setup lang="ts">
-import {ref, onMounted, provide, nextTick} from 'vue'
-import TableStore from '@/utils/tableStore'
-import Area from '@/components/form/area/index.vue'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import {ElMessage, ElMessageBox} from 'element-plus'
-import {useDictData} from '@/stores/dictData'
-import alarmList from './form/alarmList.vue'
-import detail from './form/detail.vue'
-
-const dictData = useDictData()
-import {useRouter} from 'vue-router'
-
-const router = useRouter() // 路由对象
-//字典获取超标指标
-const exceeded = dictData.getBasicData('Steady_Statis')
-const tableRef = ref()
-const industry = dictData.getBasicData('Business_Type')
-const TableHeaderRef = ref()
-const alarmListRef = ref()
-const flagTime = ref(false)
-const detailRef = ref()
-const list: any = ref({
-  deptId: '',
-  searchBeginTime: '',
-  searchEndTime: '',
-  alertThreshold: '',
-  alarmThreshold: ''
-})
-const level: any = ref(dictData.state.area[0]?.level)
-const flag: any = ref('')
-const tableStore = new TableStore({
-  url: '/supervision-boot/onlineMonitor/list',
-  publicHeight: 65,
-  method: 'POST',
-  // isWebPaging:true,
-  column: [
-    {title: '', type: 'checkbox', width: 40},
-    {
-      title: '序号',
-
-      align: 'center',
-      width: 80,
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    {field: 'dept', title: '负责单位'},
-    {field: 'substation', title: '变电站名称'},
-    {field: 'deviceName', title: '终端名称'},
-    {field: 'lineName', title: '监测点名称'},
-
-    {
-      field: 'businessType',
-      title: '监测对象类型',
-
-      formatter: (row: any) => {
-        return industry.find((item: any) => item.id == row.cellValue)?.name || '/'
-      }
-    },
-    {field: 'objectName', title: '监测对象名称'},
-    {
-      field: 'targetType',
-      title: '指标类型',
-      formatter: (row: any) => {
-        return exceeded.find((item: any) => item.id == row.cellValue)?.name || '/'
-      }
-    },
-
-    {
-      field: 'overLimitDay',
-      title: '累计超标天数',
-      formatter: (row: any) => {
-        return row.cellValue != null ? row.cellValue : '/'
-      }
-    },
-    {
-      field: 'updateTime',
-      visible: flagTime,
-      title: '最新数据时间'
-    },
-    {
-      title: '操作',
-      width: '180',
-      align: 'center',
-      render: 'buttons',
-      fixed: 'right',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return row.targetType == 0
-          },
-          click: row => {
-            detailRef.value.open({
-              text: '详情',
-              row: row,
-              list: list.value
-            })
-          }
-        },
-        {
-          name: 'productSetting',
-          title: '查看预警单',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return row.step != 1
-          },
-          click: row => {
-            router.push({
-              name: 'supervision/supervision/manage',
-              query: {
-                type: 0,
-                t: Date.now()
-              }
-            })
-          }
-        },
-        {
-          name: 'productSetting',
-          title: '查看告警单',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return row.step != 2
-          },
-          click: row => {
-            router.push({
-              name: 'supervision/supervision/manage',
-              query: {
-                type: 1,
-                t: Date.now()
-              }
-            })
-          }
-        }
-        // {
-        //     name: 'productSetting',
-        //     title: '发起告警单',
-        //     type: 'warning',
-        //     disabled: row => {
-        //         return row.overLimitDay < tableStore.table.params.alarmThreshold
-        //     },
-        //     icon: 'el-icon-EditPen',
-        //     render: 'basicButton',
-
-        //     click: async row => {
-        //         // handleWarningAlarmFlag(row).then(res => {
-        //         //     console.log(res)
-        //         //     ElMessage.success('发起告警单成功！')
-        //         //     tableStore.index()
-        //         // })
-        //         const { value } = await ElMessageBox.prompt('', '整改意见', {
-        //             confirmButtonText: '确定',
-        //             cancelButtonText: '取消',
-
-        //             inputType: 'textarea',
-        //             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        //             inputErrorMessage: '请输入整改意见'
-        //         })
-        //         handleWarningAlarmFlag({ ...row, reformAdvice: value }).then(res => {
-        //             ElMessage.success('发起告警单成功！')
-        //             tableStore.index()
-        //         })
-        //     }
-        // },
-        // {
-        //     name: 'edit',
-        //     title: '发起预警单',
-        //     type: 'primary',
-        //     icon: 'el-icon-Open',
-        //     disabled: row => {
-        //         return row.overLimitDay >= tableStore.table.params.alarmThreshold
-        //     },
-        //     render: 'basicButton',
-
-        //     click: async row => {
-        //         // handleWarningAlarmFlag(row).then(res => {
-        //         //     console.log(res)
-        //         //     ElMessage.success('发起预警单成功！')
-        //         //     tableStore.index()
-        //         // })
-        //         const { value } = await ElMessageBox.prompt('', '整改意见', {
-        //             confirmButtonText: '确定',
-        //             cancelButtonText: '取消',
-
-        //             inputType: 'textarea',
-        //             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        //             inputErrorMessage: '请输入整改意见'
-        //         })
-        //         handleWarningAlarmFlag({ ...row, reformAdvice: value }).then(res => {
-        //             ElMessage.success('发起预警单成功！')
-        //             tableStore.index()
-        //         })
-        //     }
-        // }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    tableStore.table.params.currentPage = tableStore.table.params.pageNum
-    list.value.deptId = tableStore.table.params.deptId
-
-    list.value.searchBeginTime = tableStore.table.params.searchBeginTime
-    list.value.searchEndTime = tableStore.table.params.searchEndTime
-    if (tableStore.table.params.alertThreshold != '') {
-      list.value.alertThreshold = tableStore.table.params.alertThreshold
-    }
-    list.value.lineType = tableStore.table.params.lineType
-    list.value.alarmThreshold = tableStore.table.params.alarmThreshold
-    flag.value = level.value
-    flagTime.value = tableStore.table.params.dataType == 0 ? true : false
-  },
-  loadCallback: () => {
-    // tableStore.table.data = [
-    //     {
-    //         orgName: '张家口',
-    //         subName: '110kV马头山风电场',
-    //         lineName: '111口头线',
-    //         voltageScale: '110kV',
-    //         overDay: '20',
-    //         overDays: '10'
-    //     },
-    //     {
-    //         orgName: '张家口',
-    //         subName: '110kV韩家庄风电场',
-    //         lineName: '111缘韩一线',
-    //         voltageScale: '110kV',
-    //         overDay: '20',
-    //         overDays: '16'
-    //     }
-    // ]
-  }
-})
-tableStore.table.params.alertThreshold = 5
-tableStore.table.params.alarmThreshold = 5
-tableStore.table.params.targetList = exceeded.filter(item => item.code == 'Total_Indicator')[0].id
-    ? [exceeded.filter(item => item.code == 'Total_Indicator')[0].id]
-    : []
-tableStore.table.params.lineType = ''
-tableStore.table.params.dataType = '1'
-tableStore.table.params.deptId = dictData.state.area[0].id
-provide('tableStore', tableStore)
-onMounted(() => {
-  TableHeaderRef.value.setDatePicker([{label: '月', value: 3}])
-
-  tableStore.index()
-  setTimeout(() => {
-    TableHeaderRef.value.showSelectChange()
-  }, 10)
-})
-
-const changeAlert = e => {
-  if (e == null) {
-    tableStore.table.params.alertThreshold = 5
-  } else {
-    if (e > tableStore.table.params.alarmThreshold) {
-      ElMessage.warning('预警阈值不能大于报警阈值')
-      tableStore.table.params.alertThreshold = 5
-    }
-  }
-}
-const changeAlarm = e => {
-  if (e == null) {
-    tableStore.table.params.alarmThreshold = 5
-  } else {
-    if (e < tableStore.table.params.alertThreshold) {
-      ElMessage.warning('报警阈值不能小于预警阈值')
-      tableStore.table.params.alarmThreshold = 5
-    }
-  }
-}
-// 发起预警单
-const launch = (title: string) => {
-  if (tableStore.table.selection.length == 0) {
-    ElMessage.warning('请选择一条数据')
-    return
-  }
-
-  alarmListRef.value.open({
-    text: title,
-    form: list.value,
-    row: tableStore.table.selection
-  })
-  console.log('🚀 ~ launch ~ list.value:', list.value)
-}
-const changeArea = e => {
-  level.value = e.data.level
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <!-- <div>1 监测点信息  发起预告警单 </div> -->
+
+  <TableHeader datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <template v-slot:select>
+      <el-form-item label="区域">
+        <Area ref="areaRef" v-model="tableStore.table.params.deptId" @changeValue="changeArea"/>
+      </el-form-item>
+      <el-form-item label="监测点性质">
+        <el-select v-model="tableStore.table.params.lineType" clearable placeholder="请选择监测点性质">
+          <el-option label="电网侧" value="0"/>
+          <el-option label="非电网侧" value="1"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="超标指标">
+        <el-select
+            v-model="tableStore.table.params.targetList"
+            clearable
+            multiple
+            collapse-tags
+            collapse-tags-tooltip
+            placeholder="请选择超标指标"
+        >
+          <el-option v-for="item in exceeded" :key="item.id" :label="item.name" :value="item.id"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="数据类型">
+        <el-switch
+            v-model="tableStore.table.params.dataType"
+            inline-prompt
+            active-value="1"
+            inactive-value="0"
+            active-text="超标数据"
+            inactive-text="无数据"
+        />
+      </el-form-item>
+      <el-form-item label="预警阈值">
+        <!-- <el-input v-model="tableStore.table.params.alertThreshold" placeholder="请输入预警阈值" clearable></el-input> -->
+        <el-input-number
+            v-model="tableStore.table.params.alertThreshold"
+            :min="0"
+            :step="1"
+            step-strictly
+            @change="changeAlert"
+        />
+      </el-form-item>
+      <el-form-item label="告警阈值">
+        <el-input-number
+            v-model="tableStore.table.params.alarmThreshold"
+            :min="0"
+            :step="1"
+            step-strictly
+            @change="changeAlarm"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="搜索">
+          <el-input
+              v-model="tableStore.table.params.searchValue"
+              placeholder="输入变电站、终端、监测点名称"
+              clearable
+          ></el-input>
+      </el-form-item> -->
+    </template>
+    <template #operation>
+      <el-button icon="el-icon-Plus" :disabled="flag > 2" type="primary" @click="launch('发起预警单')">
+        发起预警单
+      </el-button>
+      <el-button icon="el-icon-Plus" :disabled="flag > 2" type="primary" @click="launch('发起告警单')">
+        发起告警单
+      </el-button>
+    </template>
+  </TableHeader>
+  <Table ref="tableRef"/>
+  <!-- /告警单 -->
+  <alarmList ref="alarmListRef" @onSubmit="tableStore.index()"/>
+  <!-- 详情 -->
+  <detail ref="detailRef"/>
+</template>
+<script setup lang="ts">
+import {ref, onMounted, provide, nextTick} from 'vue'
+import TableStore from '@/utils/tableStore'
+import Area from '@/components/form/area/index.vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import {ElMessage, ElMessageBox} from 'element-plus'
+import {useDictData} from '@/stores/dictData'
+import alarmList from './form/alarmList.vue'
+import detail from './form/detail.vue'
+
+const dictData = useDictData()
+import {useRouter} from 'vue-router'
+
+const router = useRouter() // 路由对象
+//字典获取超标指标
+const exceeded = dictData.getBasicData('Steady_Statis')
+const tableRef = ref()
+const industry = dictData.getBasicData('Business_Type')
+const TableHeaderRef = ref()
+const alarmListRef = ref()
+const flagTime = ref(false)
+const detailRef = ref()
+const list: any = ref({
+  deptId: '',
+  searchBeginTime: '',
+  searchEndTime: '',
+  alertThreshold: '',
+  alarmThreshold: ''
+})
+const level: any = ref(dictData.state.area[0]?.level)
+const flag: any = ref('')
+const tableStore = new TableStore({
+  url: '/supervision-boot/onlineMonitor/list',
+  publicHeight: 65,
+  method: 'POST',
+  // isWebPaging:true,
+  column: [
+    {title: '', type: 'checkbox', width: 40},
+    {
+      title: '序号',
+
+      align: 'center',
+      width: 80,
+      formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      }
+    },
+    {field: 'dept', title: '负责单位'},
+    {field: 'substation', title: '变电站名称'},
+    {field: 'deviceName', title: '终端名称'},
+    {field: 'lineName', title: '监测点名称'},
+
+    {
+      field: 'businessType',
+      title: '监测对象类型',
+
+      formatter: (row: any) => {
+        return industry.find((item: any) => item.id == row.cellValue)?.name || '/'
+      }
+    },
+    {field: 'objectName', title: '监测对象名称'},
+    {
+      field: 'targetType',
+      title: '指标类型',
+      formatter: (row: any) => {
+        return exceeded.find((item: any) => item.id == row.cellValue)?.name || '/'
+      }
+    },
+
+    {
+      field: 'overLimitDay',
+      title: '累计超标天数',
+      formatter: (row: any) => {
+        return row.cellValue != null ? row.cellValue : '/'
+      }
+    },
+    {
+      field: 'updateTime',
+      visible: flagTime,
+      title: '最新数据时间'
+    },
+    {
+       title: '操作',fixed: 'right',
+      width: '180',
+      align: 'center',
+      render: 'buttons',
+    
+      buttons: [
+        {
+          name: 'productSetting',
+          title: '详情',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          disabled: row => {
+            return row.targetType == 0
+          },
+          click: row => {
+            detailRef.value.open({
+              text: '详情',
+              row: row,
+              list: list.value
+            })
+          }
+        },
+        {
+          name: 'productSetting',
+          title: '查看预警单',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          disabled: row => {
+            return row.step != 1
+          },
+          click: row => {
+            router.push({
+              name: 'supervision/supervision/manage',
+              query: {
+                type: 0,
+                t: Date.now()
+              }
+            })
+          }
+        },
+        {
+          name: 'productSetting',
+          title: '查看告警单',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          disabled: row => {
+            return row.step != 2
+          },
+          click: row => {
+            router.push({
+              name: 'supervision/supervision/manage',
+              query: {
+                type: 1,
+                t: Date.now()
+              }
+            })
+          }
+        }
+        // {
+        //     name: 'productSetting',
+        //     title: '发起告警单',
+        //     type: 'warning',
+        //     disabled: row => {
+        //         return row.overLimitDay < tableStore.table.params.alarmThreshold
+        //     },
+        //     icon: 'el-icon-EditPen',
+        //     render: 'basicButton',
+
+        //     click: async row => {
+        //         // handleWarningAlarmFlag(row).then(res => {
+        //         //     console.log(res)
+        //         //     ElMessage.success('发起告警单成功！')
+        //         //     tableStore.index()
+        //         // })
+        //         const { value } = await ElMessageBox.prompt('', '整改意见', {
+        //             confirmButtonText: '确定',
+        //             cancelButtonText: '取消',
+
+        //             inputType: 'textarea',
+        //             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        //             inputErrorMessage: '请输入整改意见'
+        //         })
+        //         handleWarningAlarmFlag({ ...row, reformAdvice: value }).then(res => {
+        //             ElMessage.success('发起告警单成功！')
+        //             tableStore.index()
+        //         })
+        //     }
+        // },
+        // {
+        //     name: 'edit',
+        //     title: '发起预警单',
+        //     type: 'primary',
+        //     icon: 'el-icon-Open',
+        //     disabled: row => {
+        //         return row.overLimitDay >= tableStore.table.params.alarmThreshold
+        //     },
+        //     render: 'basicButton',
+
+        //     click: async row => {
+        //         // handleWarningAlarmFlag(row).then(res => {
+        //         //     console.log(res)
+        //         //     ElMessage.success('发起预警单成功！')
+        //         //     tableStore.index()
+        //         // })
+        //         const { value } = await ElMessageBox.prompt('', '整改意见', {
+        //             confirmButtonText: '确定',
+        //             cancelButtonText: '取消',
+
+        //             inputType: 'textarea',
+        //             inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        //             inputErrorMessage: '请输入整改意见'
+        //         })
+        //         handleWarningAlarmFlag({ ...row, reformAdvice: value }).then(res => {
+        //             ElMessage.success('发起预警单成功！')
+        //             tableStore.index()
+        //         })
+        //     }
+        // }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    list.value.deptId = tableStore.table.params.deptId
+
+    list.value.searchBeginTime = tableStore.table.params.searchBeginTime
+    list.value.searchEndTime = tableStore.table.params.searchEndTime
+    if (tableStore.table.params.alertThreshold != '') {
+      list.value.alertThreshold = tableStore.table.params.alertThreshold
+    }
+    list.value.lineType = tableStore.table.params.lineType
+    list.value.alarmThreshold = tableStore.table.params.alarmThreshold
+    flag.value = level.value
+    flagTime.value = tableStore.table.params.dataType == 0 ? true : false
+  },
+  loadCallback: () => {
+    // tableStore.table.data = [
+    //     {
+    //         orgName: '张家口',
+    //         subName: '110kV马头山风电场',
+    //         lineName: '111口头线',
+    //         voltageScale: '110kV',
+    //         overDay: '20',
+    //         overDays: '10'
+    //     },
+    //     {
+    //         orgName: '张家口',
+    //         subName: '110kV韩家庄风电场',
+    //         lineName: '111缘韩一线',
+    //         voltageScale: '110kV',
+    //         overDay: '20',
+    //         overDays: '16'
+    //     }
+    // ]
+  }
+})
+tableStore.table.params.alertThreshold = 5
+tableStore.table.params.alarmThreshold = 5
+tableStore.table.params.targetList = exceeded.filter(item => item.code == 'Total_Indicator')[0].id
+    ? [exceeded.filter(item => item.code == 'Total_Indicator')[0].id]
+    : []
+tableStore.table.params.lineType = ''
+tableStore.table.params.dataType = '1'
+tableStore.table.params.deptId = dictData.state.area[0].id
+provide('tableStore', tableStore)
+onMounted(() => {
+  TableHeaderRef.value.setDatePicker([{label: '月', value: 3}])
+
+  tableStore.index()
+  setTimeout(() => {
+    TableHeaderRef.value.showSelectChange()
+  }, 10)
+})
+
+const changeAlert = e => {
+  if (e == null) {
+    tableStore.table.params.alertThreshold = 5
+  } else {
+    if (e > tableStore.table.params.alarmThreshold) {
+      ElMessage.warning('预警阈值不能大于报警阈值')
+      tableStore.table.params.alertThreshold = 5
+    }
+  }
+}
+const changeAlarm = e => {
+  if (e == null) {
+    tableStore.table.params.alarmThreshold = 5
+  } else {
+    if (e < tableStore.table.params.alertThreshold) {
+      ElMessage.warning('报警阈值不能小于预警阈值')
+      tableStore.table.params.alarmThreshold = 5
+    }
+  }
+}
+// 发起预警单
+const launch = (title: string) => {
+  if (tableStore.table.selection.length == 0) {
+    ElMessage.warning('请选择一条数据')
+    return
+  }
+
+  alarmListRef.value.open({
+    text: title,
+    form: list.value,
+    row: tableStore.table.selection
+  })
+  console.log('🚀 ~ launch ~ list.value:', list.value)
+}
+const changeArea = e => {
+  level.value = e.data.level
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise_hn/electricalEnergy/components1/testQuestions.vue b/src/views/pqs/supervise_hn/electricalEnergy/components1/testQuestions.vue
index 42737470..245b971f 100644
--- a/src/views/pqs/supervise_hn/electricalEnergy/components1/testQuestions.vue
+++ b/src/views/pqs/supervise_hn/electricalEnergy/components1/testQuestions.vue
@@ -1,187 +1,187 @@
-<template>
-  <!--     <div> 普测结果 发起预告警单</div> -->
-  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-    <template v-slot:select>
-      <el-form-item label="计划名称">
-        <el-input style="width: 200px" v-model="tableStore.table.params.searchValue" clearable
-          placeholder="请输入计划名称"></el-input>
-      </el-form-item>
-      <el-form-item label="是否解决">
-        <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-            :value="item.value"></el-option>
-        </el-select>
-      </el-form-item>
-    </template>
-  </TableHeader>
-  <Table ref="tableRef" />
-  <testQuestionsForm ref="testQuestionsFormRef" />
-  <!-- 详情 -->
-  <el-dialog draggable v-model="dialogVisible" v-if="dialogVisible" title="详情" width="1000">
-    <detail :id="detailId" :flag="flag" />
-  </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 testQuestionsForm from './form/testQuestionsForm.vue'
-import { initiateWarningLeaflet } from '@/api/supervision-boot/survey/test'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
-
-const dictData = useDictData()
-const { push } = useRouter()
-const router = useRouter() // 路由对象
-const tableRef = ref()
-const flag = ref(false)
-const TableHeaderRef = ref()
-const dialogVisible = ref(false)
-const detailId = ref('')
-const testQuestionsFormRef = ref()
-const dealStateList = ref([
-  {
-    label: '未解决',
-    value: '0'
-  },
-
-])
-const tableStore = new TableStore({
-  url: '/supervision-boot/surveyTest/pageProblemSurvey',
-  publicHeight: 65,
-  method: 'POST',
-  column: [
-    {
-      title: '序号',
-
-      align: 'center',
-      width: 80,
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { field: 'planName', title: '计划名称', minWidth: 120 },
-    { field: 'deptName', title: '负责单位', minWidth: 120 },
-    { field: 'substationName', title: '变电站', minWidth: 120 },
-    { field: 'planStartTime', title: '计划开始时间', minWidth: 100 },
-    { field: 'planEndTime', title: '计划结束时间', minWidth: 100 },
-    { field: 'completeTime', title: '实际完成时间', minWidth: 100 },
-    { field: 'completeBy', title: '测试负责人', minWidth: 120 },
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 80,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    {
-      field: 'dealState',
-      title: '是否解决',
-      minWidth: 100,
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        null: 'info'
-      },
-      replaceValue: {
-        0: '未解决',
-        1: '已解决',
-        null: '/'
-      }
-    },
-    {
-      title: '操作',
-      minWidth: '180',
-      align: 'center',
-      render: 'buttons',
-      fixed: 'right',
-      buttons: [
-        {
-          name: 'edit',
-          title: '详情',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-
-          click: async row => {
-            flag.value = row.dealState == 1 ? true : false
-            dialogVisible.value = true
-            detailId.value = row.id
-          }
-        },
-        {
-          name: 'edit',
-          title: '发起告警单',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.dealState != 0
-          },
-
-          click: async row => {
-            const { value } = await ElMessageBox.prompt('', '整改意见', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-
-              inputType: 'textarea',
-              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-              inputErrorMessage: '请输入整改意见'
-            })
-            initiateWarningLeaflet({ id: row.id, reformAdvice: value }).then(res => {
-              ElMessage.success('发起告警成功！')
-              tableStore.index()
-            })
-          }
-        },
-        {
-          name: 'edit',
-          title: '查看告警单',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.initiateWarningFlag == 0
-          },
-          click: row => {
-            router.push({
-              name: 'supervision/supervision/manage',
-              query: {
-                type: 1,
-                t: Date.now()
-              }
-            })
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    tableStore.table.params.currentPage = tableStore.table.params.pageNum
-  }
-})
-tableStore.table.params.dealState = ''
-tableStore.table.params.searchValue = ''
-provide('tableStore', tableStore)
-
-onMounted(() => {
-  tableStore.index()
-})
-
-/**
- * 发起告警单
- */
-const initiateAlarm = async (id: string) => {
-  await initiateWarningLeaflet(id)
-  ElMessage.success('发起告警成功！')
-  // 加载数据
-  tableStore.index()
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <!--     <div> 普测结果 发起预告警单</div> -->
+  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <template v-slot:select>
+      <el-form-item label="计划名称">
+        <el-input style="width: 200px" v-model="tableStore.table.params.searchValue" clearable
+          placeholder="请输入计划名称"></el-input>
+      </el-form-item>
+      <el-form-item label="是否解决">
+        <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+          <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
+            :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+    </template>
+  </TableHeader>
+  <Table ref="tableRef" />
+  <testQuestionsForm ref="testQuestionsFormRef" />
+  <!-- 详情 -->
+  <el-dialog draggable v-model="dialogVisible" v-if="dialogVisible" title="详情" width="1000">
+    <detail :id="detailId" :flag="flag" />
+  </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 testQuestionsForm from './form/testQuestionsForm.vue'
+import { initiateWarningLeaflet } from '@/api/supervision-boot/survey/test'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
+
+const dictData = useDictData()
+const { push } = useRouter()
+const router = useRouter() // 路由对象
+const tableRef = ref()
+const flag = ref(false)
+const TableHeaderRef = ref()
+const dialogVisible = ref(false)
+const detailId = ref('')
+const testQuestionsFormRef = ref()
+const dealStateList = ref([
+  {
+    label: '未解决',
+    value: '0'
+  },
+
+])
+const tableStore = new TableStore({
+  url: '/supervision-boot/surveyTest/pageProblemSurvey',
+  publicHeight: 65,
+  method: 'POST',
+  column: [
+    {
+      title: '序号',
+
+      align: 'center',
+      width: 80,
+      formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      }
+    },
+    { field: 'planName', title: '计划名称', minWidth: 120 },
+    { field: 'deptName', title: '负责单位', minWidth: 120 },
+    { field: 'substationName', title: '变电站', minWidth: 120 },
+    { field: 'planStartTime', title: '计划开始时间', minWidth: 100 },
+    { field: 'planEndTime', title: '计划结束时间', minWidth: 100 },
+    { field: 'completeTime', title: '实际完成时间', minWidth: 100 },
+    { field: 'completeBy', title: '测试负责人', minWidth: 120 },
+    {
+      field: 'createBy',
+      title: '填报人',
+      minWidth: 80,
+      formatter: (row: any) => {
+        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+      }
+    },
+    {
+      field: 'dealState',
+      title: '是否解决',
+      minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+        null: 'info'
+      },
+      replaceValue: {
+        0: '未解决',
+        1: '已解决',
+        null: '/'
+      }
+    },
+    {
+       title: '操作',fixed: 'right',
+      minWidth: '180',
+      align: 'center',
+      render: 'buttons',
+
+      buttons: [
+        {
+          name: 'edit',
+          title: '详情',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+
+          click: async row => {
+            flag.value = row.dealState == 1 ? true : false
+            dialogVisible.value = true
+            detailId.value = row.id
+          }
+        },
+        {
+          name: 'edit',
+          title: '发起告警单',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.dealState != 0
+          },
+
+          click: async row => {
+            const { value } = await ElMessageBox.prompt('', '整改意见', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+
+              inputType: 'textarea',
+              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+              inputErrorMessage: '请输入整改意见'
+            })
+            initiateWarningLeaflet({ id: row.id, reformAdvice: value }).then(res => {
+              ElMessage.success('发起告警成功！')
+              tableStore.index()
+            })
+          }
+        },
+        {
+          name: 'edit',
+          title: '查看告警单',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.initiateWarningFlag == 0
+          },
+          click: row => {
+            router.push({
+              name: 'supervision/supervision/manage',
+              query: {
+                type: 1,
+                t: Date.now()
+              }
+            })
+          }
+        }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    tableStore.table.params.currentPage = tableStore.table.params.pageNum
+  }
+})
+tableStore.table.params.dealState = ''
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+
+onMounted(() => {
+  tableStore.index()
+})
+
+/**
+ * 发起告警单
+ */
+const initiateAlarm = async (id: string) => {
+  await initiateWarningLeaflet(id)
+  ElMessage.success('发起告警成功！')
+  // 加载数据
+  tableStore.index()
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise_hn/electricalEnergy/components1/testRun.vue b/src/views/pqs/supervise_hn/electricalEnergy/components1/testRun.vue
index 1d613e44..7794e5f2 100644
--- a/src/views/pqs/supervise_hn/electricalEnergy/components1/testRun.vue
+++ b/src/views/pqs/supervise_hn/electricalEnergy/components1/testRun.vue
@@ -1,302 +1,302 @@
-<!---试运行列表-->
-<template>
-  <div>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-      <template #select>
-        <el-form-item label="流程状态">
-          <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-            <el-option v-for="item in statusSelect" :key="item.id" :label="item.name" :value="item.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="是否解决">
-          <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-            <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
-              :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
-      </template>
-    </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-    <!-- 详情 -->
-    <detail ref="detailRef" />
-  </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, reactive } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { addRunTest, initiateWarningLeaflet } from '@/api/supervision-boot/lineRunTest'
-import { formatDate } from '@/utils/formatTime'
-import { VxeTablePropTypes } from 'vxe-table'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { getFileNameAndFilePath } from '@/api/system-boot/file'
-import detail from './testRunDetail.vue'
-
-const dictData = useDictData()
-const statusSelect = dictData.statusSelect()
-const { push } = useRouter()
-const adminInfo = useAdminInfo()
-const TableHeaderRef = ref()
-const tableRef = ref()
-const detailRef = ref()
-const dealStateList = ref([
-  {
-    label: '未解决',
-    value: '0'
-  },
-
-])
-const tableStore = new TableStore({
-  url: '/supervision-boot/lineRunTestProblem/pageProblem',
-  method: 'POST',
-  publicHeight: 65,
-  column: [
-    {
-      title: '序号', width: 80, formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { field: 'lineName', title: '监测点名称', minWidth: 160 },
-    { field: 'connectedBus', title: '接入母线', minWidth: 160 },
-    // { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 140 },
-    { field: 'monitoringTerminalName', title: '终端名称', minWidth: 140, },
-    {
-      field: 'powerSubstationName', title: '变电站', minWidth: 160, formatter: row => {
-        return row.cellValue ? row.cellValue : '/'
-      }
-    },
-    { field: 'reason', title: '调试原因', minWidth: 160 },
-
-    {
-      field: 'testRunState',
-      title: '试运行状态',
-      minWidth: 100,
-      render: 'tag',  
-      custom: {
-        0: 'primary',
-        2: 'success',
-        3: 'danger',
-        1: 'warning'
-      },
-      replaceValue: {
-        0: '待试运行',
-        1: '试运行中',
-        2: '试运行成功',
-        3: '试运行失败',
-        null: '待试运行'
-      }
-    },
-    {
-      field: 'testRunTime',
-      title: '试运行时间范围',
-      minWidth: 200,
-      formatter: row => {
-        return row.cellValue ? row.cellValue : '/'
-      }
-    },
-    { field: 'problemReason', title: '试运行评估问题', minWidth: 200 },
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 100,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    {
-      field: 'dealState',
-      title: '是否解决',
-      minWidth: 100,
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        null: 'info'
-      },
-      replaceValue: {
-        0: '未解决',
-        1: '已解决',
-        null: '/'
-      }
-    },
-    {
-      title: '操作',
-      minWidth: 230,
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
-        // {
-        //     name: 'productSetting',
-        //     title: '流程详情',
-        //     type: 'primary',
-        //     icon: 'el-icon-EditPen',
-        //     render: 'basicButton',
-        //     click: row => {
-        //         handleAudit(row.processInstanceId, row.historyInstanceId)
-        //     },
-        //     disabled: row => {
-        //         return row.testRunState != 2 || !row.processInstanceId
-        //     }
-        // },
-        {
-          name: 'productSetting',
-          title: '下载报告',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            downloadTheReport(row.testRunReport)
-          },
-          disabled: row => {
-            return row.testRunReport == null || row.testRunReport.length == 0
-          }
-        },
-
-        {
-          name: 'edit',
-          title: '发起告警单',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.dealState != 0
-          },
-
-          click: async row => {
-            const { value } = await ElMessageBox.prompt('', '整改意见', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-
-              inputType: 'textarea',
-              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-              inputErrorMessage: '请输入整改意见'
-            })
-            initiateWarningLeaflet({
-              id: row.id,
-              problemId: row.problemId,
-              reformAdvice: value,
-              type: 2,
-              issueDetail: row.problemReason
-            }).then(res => {
-              ElMessage.success('发起告警单成功！')
-              tableStore.index()
-            })
-          }
-        },
-        {
-          name: 'edit',
-          title: '详情',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.dealState == 0
-          },
-
-          click: row => {
-            detailRef.value.open({
-              row: row,
-              title: '详情',
-
-            })
-
-          }
-        },
-        {
-          name: 'edit',
-          title: '查看告警单',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.problemType == null
-          },
-          click: row => {
-            push({
-              name: 'supervision/supervision/manage',
-              query: {
-                type: 1,
-                t: Date.now()
-              }
-            })
-          }
-        }
-      ]
-    }
-  ],
-
-  beforeSearchFun: () => {
-    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    tableStore.table.params.statveList = [2]
-    // tableStore.table.params.relationUserName = tableStore.table.params.userName
-  }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.dealState = ''
-provide('tableStore', tableStore)
-
-onMounted(() => {
-  tableStore.index()
-})
-const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig>({
-  labelField: '',
-  checkMethod: ({ row }) => {
-    return !(row.testRunState == 1 || row.testRunState == 2)
-  }
-})
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    state: {
-      id: instanceId,
-      historyInstanceId
-    }
-  })
-}
-
-// 下载报告
-const downloadTheReport = (url: string) => {
-  getFileNameAndFilePath({ filePath: url }).then((res: any) => {
-    const link = document.createElement('a')
-    link.href = res.data.url
-    link.download = res.data.name
-    document.body.appendChild(link)
-    link.click()
-    document.body.removeChild(link)
-  })
-}
-
-const runTestSubmit = (type: number) => {
-  const start = new Date()
-  start.setDate(start.getDate() + 1)
-  start.setHours(0, 0, 0)
-
-  const end = new Date()
-  end.setDate(end.getDate() + 3)
-  end.setHours(23, 59, 59)
-  const startString = formatDate(start, 'YYYY-MM-DD') // 转换为 YYYY-MM-DD  格式
-  const endString = formatDate(end, 'YYYY-MM-DD')
-  const data = {
-    startTime: startString,
-    endTime: endString,
-    lineIds: monitorIds,
-    operateType: type
-  }
-  addRunTest(data).then((res: any) => {
-    if (res.code === 'A0000') {
-      ElMessage({
-        message: '发起试运行成功',
-        type: 'success'
-      })
-      tableStore.index()
-    }
-  })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<!---试运行列表-->
+<template>
+  <div>
+    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+      <template #select>
+        <el-form-item label="流程状态">
+          <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+            <el-option v-for="item in statusSelect" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否解决">
+          <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+            <el-option v-for="item in dealStateList" :key="item.value" :label="item.label"
+              :value="item.value"></el-option>
+          </el-select>
+        </el-form-item>
+      </template>
+    </TableHeader>
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+    <!-- 详情 -->
+    <detail ref="detailRef" />
+  </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { addRunTest, initiateWarningLeaflet } from '@/api/supervision-boot/lineRunTest'
+import { formatDate } from '@/utils/formatTime'
+import { VxeTablePropTypes } from 'vxe-table'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+import detail from './testRunDetail.vue'
+
+const dictData = useDictData()
+const statusSelect = dictData.statusSelect()
+const { push } = useRouter()
+const adminInfo = useAdminInfo()
+const TableHeaderRef = ref()
+const tableRef = ref()
+const detailRef = ref()
+const dealStateList = ref([
+  {
+    label: '未解决',
+    value: '0'
+  },
+
+])
+const tableStore = new TableStore({
+  url: '/supervision-boot/lineRunTestProblem/pageProblem',
+  method: 'POST',
+  publicHeight: 65,
+  column: [
+    {
+      title: '序号', width: 80, formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      }
+    },
+    { field: 'lineName', title: '监测点名称', minWidth: 160 },
+    { field: 'connectedBus', title: '接入母线', minWidth: 160 },
+    // { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 140 },
+    { field: 'monitoringTerminalName', title: '终端名称', minWidth: 140, },
+    {
+      field: 'powerSubstationName', title: '变电站', minWidth: 160, formatter: row => {
+        return row.cellValue ? row.cellValue : '/'
+      }
+    },
+    { field: 'reason', title: '调试原因', minWidth: 160 },
+
+    {
+      field: 'testRunState',
+      title: '试运行状态',
+      minWidth: 100,
+      render: 'tag',  
+      custom: {
+        0: 'primary',
+        2: 'success',
+        3: 'danger',
+        1: 'warning'
+      },
+      replaceValue: {
+        0: '待试运行',
+        1: '试运行中',
+        2: '试运行成功',
+        3: '试运行失败',
+        null: '待试运行'
+      }
+    },
+    {
+      field: 'testRunTime',
+      title: '试运行时间范围',
+      minWidth: 200,
+      formatter: row => {
+        return row.cellValue ? row.cellValue : '/'
+      }
+    },
+    { field: 'problemReason', title: '试运行评估问题', minWidth: 200 },
+    {
+      field: 'createBy',
+      title: '填报人',
+      minWidth: 100,
+      formatter: (row: any) => {
+        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+      }
+    },
+    {
+      field: 'dealState',
+      title: '是否解决',
+      minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+        null: 'info'
+      },
+      replaceValue: {
+        0: '未解决',
+        1: '已解决',
+        null: '/'
+      }
+    },
+    {
+       title: '操作',fixed: 'right',
+      minWidth: 230,
+     
+      render: 'buttons',
+      buttons: [
+        // {
+        //     name: 'productSetting',
+        //     title: '流程详情',
+        //     type: 'primary',
+        //     icon: 'el-icon-EditPen',
+        //     render: 'basicButton',
+        //     click: row => {
+        //         handleAudit(row.processInstanceId, row.historyInstanceId)
+        //     },
+        //     disabled: row => {
+        //         return row.testRunState != 2 || !row.processInstanceId
+        //     }
+        // },
+        {
+          name: 'productSetting',
+          title: '下载报告',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            downloadTheReport(row.testRunReport)
+          },
+          disabled: row => {
+            return row.testRunReport == null || row.testRunReport.length == 0
+          }
+        },
+
+        {
+          name: 'edit',
+          title: '发起告警单',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.dealState != 0
+          },
+
+          click: async row => {
+            const { value } = await ElMessageBox.prompt('', '整改意见', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+
+              inputType: 'textarea',
+              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+              inputErrorMessage: '请输入整改意见'
+            })
+            initiateWarningLeaflet({
+              id: row.id,
+              problemId: row.problemId,
+              reformAdvice: value,
+              type: 2,
+              issueDetail: row.problemReason
+            }).then(res => {
+              ElMessage.success('发起告警单成功！')
+              tableStore.index()
+            })
+          }
+        },
+        {
+          name: 'edit',
+          title: '详情',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.dealState == 0
+          },
+
+          click: row => {
+            detailRef.value.open({
+              row: row,
+              title: '详情',
+
+            })
+
+          }
+        },
+        {
+          name: 'edit',
+          title: '查看告警单',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.problemType == null
+          },
+          click: row => {
+            push({
+              name: 'supervision/supervision/manage',
+              query: {
+                type: 1,
+                t: Date.now()
+              }
+            })
+          }
+        }
+      ]
+    }
+  ],
+
+  beforeSearchFun: () => {
+    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    tableStore.table.params.statveList = [2]
+    // tableStore.table.params.relationUserName = tableStore.table.params.userName
+  }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.dealState = ''
+provide('tableStore', tableStore)
+
+onMounted(() => {
+  tableStore.index()
+})
+const checkboxConfig = reactive<VxeTablePropTypes.CheckboxConfig>({
+  labelField: '',
+  checkMethod: ({ row }) => {
+    return !(row.testRunState == 1 || row.testRunState == 2)
+  }
+})
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    state: {
+      id: instanceId,
+      historyInstanceId
+    }
+  })
+}
+
+// 下载报告
+const downloadTheReport = (url: string) => {
+  getFileNameAndFilePath({ filePath: url }).then((res: any) => {
+    const link = document.createElement('a')
+    link.href = res.data.url
+    link.download = res.data.name
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+  })
+}
+
+const runTestSubmit = (type: number) => {
+  const start = new Date()
+  start.setDate(start.getDate() + 1)
+  start.setHours(0, 0, 0)
+
+  const end = new Date()
+  end.setDate(end.getDate() + 3)
+  end.setHours(23, 59, 59)
+  const startString = formatDate(start, 'YYYY-MM-DD') // 转换为 YYYY-MM-DD  格式
+  const endString = formatDate(end, 'YYYY-MM-DD')
+  const data = {
+    startTime: startString,
+    endTime: endString,
+    lineIds: monitorIds,
+    operateType: type
+  }
+  addRunTest(data).then((res: any) => {
+    if (res.code === 'A0000') {
+      ElMessage({
+        message: '发起试运行成功',
+        type: 'success'
+      })
+      tableStore.index()
+    }
+  })
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise_hn/harmonicSurvey/components/planAudits.vue b/src/views/pqs/supervise_hn/harmonicSurvey/components/planAudits.vue
index 081d3778..ad54ac2e 100644
--- a/src/views/pqs/supervise_hn/harmonicSurvey/components/planAudits.vue
+++ b/src/views/pqs/supervise_hn/harmonicSurvey/components/planAudits.vue
@@ -1,67 +1,67 @@
-<template>
-    <div>
-        <div>
-            <TableHeader area datePicker ref="TableHeaderRef" />
-            <Table ref="tableRef" />
-            <!-- 审核 -->
-            <planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
-        </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 planAdd from './planAdd.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useDictData } from '@/stores/dictData'
-
-const dictData = useDictData()
-
-const TableHeaderRef = ref()
-const planAddRef = ref()
-const tableStore = new TableStore({
-    url: '/process-boot/rGeneralSurveyPlan/queryPlanAudit',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        { field: 'orgName', title: '所属单位' },
-        { field: 'planNo', title: '普测计划编号' },
-        { field: 'planName', title: '普测计划名称' },
-        { field: 'planStartTime', title: '开始时间' },
-        { field: 'planEndTime', title: '结束时间' },
-        { field: 'subCount', title: '普测变电站数量' },
-        {
-            title: '操作',
-            width: '120',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '审核',
-                    type: 'primary',
-
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        planAddRef.value.open('计划审核', row)
-                    }
-                }
-            ]
-        }
-    ],
-
-    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
-    }
-})
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div>
+        <div>
+            <TableHeader area datePicker ref="TableHeaderRef" />
+            <Table ref="tableRef" />
+            <!-- 审核 -->
+            <planAdd ref="planAddRef" @onsubmit="tableStore.index()" />
+        </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 planAdd from './planAdd.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+
+const TableHeaderRef = ref()
+const planAddRef = ref()
+const tableStore = new TableStore({
+    url: '/process-boot/rGeneralSurveyPlan/queryPlanAudit',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        { field: 'orgName', title: '所属单位' },
+        { field: 'planNo', title: '普测计划编号' },
+        { field: 'planName', title: '普测计划名称' },
+        { field: 'planStartTime', title: '开始时间' },
+        { field: 'planEndTime', title: '结束时间' },
+        { field: 'subCount', title: '普测变电站数量' },
+        {
+             title: '操作',fixed: 'right',
+            width: '120',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '审核',
+                    type: 'primary',
+
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        planAddRef.value.open('计划审核', row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    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
+    }
+})
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise_hn/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise_hn/harmonicSurvey/components/planManage.vue
index 02a169dd..ff44981a 100644
--- a/src/views/pqs/supervise_hn/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise_hn/harmonicSurvey/components/planManage.vue
@@ -1,336 +1,336 @@
-<template>
-  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-    <template #select>
-      <el-form-item label="监督类型">
-        <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型">
-          <el-option v-for="item in supvTypeOptionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="流程状态">
-        <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-          <el-option v-for="item in statusSelect" :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-Delete" type="primary" @click="deleteEven">删除</el-button>
-    </template>
-  </TableHeader>
-  <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-  <!-- 新增 -->
-  <planAdd ref="planAddRef" @onsubmit="tableStore.index()" :openType="openType" />
-</template>
-<script setup lang="ts">
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-import { ref, onMounted, provide, watch, 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 { cancel, getById } from '@/api/process-boot/generalTest'
-import planAdd from './planAdd.vue'
-import { useRouter } from 'vue-router'
-import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
-import { getUserByRoleType } from '@/api/user-boot/user'
-import { useDictData } from '@/stores/dictData'
-import { deleteSurveyPlan } from '@/api/supervision-boot/delete/index'
-import { getUserReportById } from "@/api/supervision-boot/interfere";
-
-const dictData = useDictData()
-const supvTypeOptionList = dictData.getBasicData('supv_type')
-const statusSelect = dictData.statusSelect()
-const { push, options, currentRoute } = useRouter()
-const dialogVisible = ref(false)
-const tableRef = ref()
-const planAddRef = ref()
-const TableHeaderRef = ref()
-const auditList: any = ref([])
-const auditUser = ref('')
-const flag = ref(false)
-const openType = ref('create')
-const tableStore = new TableStore({
-  url: '/supervision-boot/surveyPlan/surveyPlanPage',
-  publicHeight: 65,
-  method: 'POST',
-  column: [
-    {
-      width: '60',
-      type: 'checkbox'
-    },
-    {
-      title: '序号',
-      width: 80,
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    {
-      field: 'planName',
-      title: '计划名称',
-      minWidth: 130
-    },
-    {
-      field: 'supvType',
-      title: '监督类型',
-      minWidth: 130,
-      formatter: (row: any) => {
-        return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
-      }
-    },
-    {
-      field: 'supvObjectName',
-      minWidth: 130,
-      title: '监督对象名称'
-    },
-    {
-      field: 'deptName',
-      minWidth: 130,
-      title: '负责单位'
-    },
-    {
-      field: 'substation',
-      title: '变电站',
-      minWidth: 110,
-      formatter: (row: any) => {
-        return row.cellValue
-      }
-    },
-
-    { field: 'planStartTime', minWidth: 130, title: '计划开始时间' },
-    { field: 'planEndTime', minWidth: 130, title: '计划结束时间' },
-    {
-      field: 'status',
-      title: '流程状态',
-      render: 'tag',
-      minWidth: 80,
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning'
-      },
-      replaceValue: {
-        0: '待提交审批',
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消'
-      }
-    },
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 80,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    {
-      title: '操作',
-      minWidth: '180',
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return !row.processInstanceId
-          },
-          click: row => {
-            flag.value = true
-            handleAudit(row.processInstanceId, row.historyInstanceId)
-          }
-        },
-        {
-          name: 'edit',
-          title: '编辑',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          showDisabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 0)
-          },
-          disabled: row => {
-            return !(row.status == 0)
-          },
-          click: row => {
-            planAddRef.value.open('编辑', row.id, false)
-          }
-        },
-        {
-          name: 'edit',
-          title: '重新发起',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-          },
-          click: row => {
-            // deviceQuitPopup.value.open('重新发起退运', row)
-            planAddRef.value.open('重新发起计划', row.id, false)
-          }
-        },
-        {
-          name: 'cancel',
-          title: '取消',
-          type: 'danger',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status != 1
-          },
-          click: row => {
-            cancelLeave(row)
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    tableStore.table.params.currentPage = tableStore.table.params.pageNum
-  }
-})
-
-tableStore.table.params.status = ''
-tableStore.table.params.supvType = ''
-provide('tableStore', tableStore)
-// 新增计划
-const add = () => {
-  // title.value = '普测计划新增'
-  planAddRef.value.open('计划新增')
-}
-// 禁止点击
-const checkboxConfig = reactive({
-  checkMethod: ({ row }) => {
-    return adminInfo.roleCode.includes('delete_info')
-      ? true
-      : row.createBy == adminInfo.$state.id && row.status == 0
-  }
-})
-const deleteEven = () => {
-  if (tableStore.table.selection.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: '请选择要删除的数据'
-    })
-  } else {
-
-    ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    })
-      .then(() => {
-        deleteSurveyPlan(tableStore.table.selection.map(item => item.id)).then(res => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功!'
-          })
-          tableStore.index()
-        })
-      })
-
-
-  }
-}
-const exportFn = () => {
-  let form = JSON.parse(JSON.stringify(tableStore.table.params))
-  form.pageNum = 1
-  form.pageSize = tableStore.table.total
-  queryPlan(form).then(res => {
-    tableRef.value.getRef().exportData({
-      filename: '计划', // 文件名字
-      sheetName: 'Sheet1',
-      type: 'xlsx', //导出文件类型 xlsx 和 csv
-      useStyle: true,
-      data: res.data.records, // 数据源 // 过滤那个字段导出
-      columnFilterMethod: function (column: any) {
-        return !(column.$columnIndex === 0)
-      }
-    })
-  })
-}
-
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-  // 二次确认
-  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    inputType: 'textarea',
-    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-    inputErrorMessage: '取消原因不能为空'
-  })
-  // 发起取消
-  let data = {
-    id: row.id,
-    processInstanceId: row.processInstanceId,
-    reason: value
-  }
-  await cancel(data)
-  ElMessage.success('取消成功')
-  // 加载数据
-  tableStore.index()
-}
-
-const handleClose = () => {
-  dialogVisible.value = false
-  auditUser.value = ''
-}
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: string, historyInstanceId: string) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    state: {
-      id: instanceId,
-      historyInstanceId
-    }
-  })
-}
-// 取消
-
-onMounted(() => {
-  tableStore.index()
-  getUserByRoleType(3).then(res => {
-    auditList.value = res.data
-  })
-})
-watch(
-  () => currentRoute.value.path,
-  () => {
-    if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-      tableStore.index()
-      flag.value = false
-    }
-  },
-  {
-    deep: true
-  }
-)
-
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-  if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-  const fullId = newValue.split('@')[0]
-  let nowTime = Date.now()
-  const routeTime = Number(newValue.split('@')[1])
-  if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-  nextTick(() => {
-    planAddRef.value.open('重新发起计划', fullId, false)
-  })
-}, { immediate: true })
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+  <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+    <template #select>
+      <el-form-item label="监督类型">
+        <el-select v-model="tableStore.table.params.supvType" clearable placeholder="请选择监督类型">
+          <el-option v-for="item in supvTypeOptionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="流程状态">
+        <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+          <el-option v-for="item in statusSelect" :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-Delete" type="primary" @click="deleteEven">删除</el-button>
+    </template>
+  </TableHeader>
+  <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+  <!-- 新增 -->
+  <planAdd ref="planAddRef" @onsubmit="tableStore.index()" :openType="openType" />
+</template>
+<script setup lang="ts">
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+import { ref, onMounted, provide, watch, 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 { cancel, getById } from '@/api/process-boot/generalTest'
+import planAdd from './planAdd.vue'
+import { useRouter } from 'vue-router'
+import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
+import { getUserByRoleType } from '@/api/user-boot/user'
+import { useDictData } from '@/stores/dictData'
+import { deleteSurveyPlan } from '@/api/supervision-boot/delete/index'
+import { getUserReportById } from "@/api/supervision-boot/interfere";
+
+const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
+const statusSelect = dictData.statusSelect()
+const { push, options, currentRoute } = useRouter()
+const dialogVisible = ref(false)
+const tableRef = ref()
+const planAddRef = ref()
+const TableHeaderRef = ref()
+const auditList: any = ref([])
+const auditUser = ref('')
+const flag = ref(false)
+const openType = ref('create')
+const tableStore = new TableStore({
+  url: '/supervision-boot/surveyPlan/surveyPlanPage',
+  publicHeight: 65,
+  method: 'POST',
+  column: [
+    {
+      width: '60',
+      type: 'checkbox'
+    },
+    {
+      title: '序号',
+      width: 80,
+      formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      }
+    },
+    {
+      field: 'planName',
+      title: '计划名称',
+      minWidth: 130
+    },
+    {
+      field: 'supvType',
+      title: '监督类型',
+      minWidth: 130,
+      formatter: (row: any) => {
+        return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
+      }
+    },
+    {
+      field: 'supvObjectName',
+      minWidth: 130,
+      title: '监督对象名称'
+    },
+    {
+      field: 'deptName',
+      minWidth: 130,
+      title: '负责单位'
+    },
+    {
+      field: 'substation',
+      title: '变电站',
+      minWidth: 110,
+      formatter: (row: any) => {
+        return row.cellValue
+      }
+    },
+
+    { field: 'planStartTime', minWidth: 130, title: '计划开始时间' },
+    { field: 'planEndTime', minWidth: 130, title: '计划结束时间' },
+    {
+      field: 'status',
+      title: '流程状态',
+      render: 'tag',
+      minWidth: 80,
+      custom: {
+        0: 'warning',
+        1: 'primary',
+        2: 'success',
+        3: 'danger',
+        4: 'warning'
+      },
+      replaceValue: {
+        0: '待提交审批',
+        1: '审批中',
+        2: '审批通过',
+        3: '审批不通过',
+        4: '已取消'
+      }
+    },
+    {
+      field: 'createBy',
+      title: '填报人',
+      minWidth: 80,
+      formatter: (row: any) => {
+        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+      }
+    },
+    {
+       title: '操作',fixed: 'right',
+      minWidth: '180',
+     
+      render: 'buttons',
+      buttons: [
+        {
+          name: 'productSetting',
+          title: '流程详情',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          disabled: row => {
+            return !row.processInstanceId
+          },
+          click: row => {
+            flag.value = true
+            handleAudit(row.processInstanceId, row.historyInstanceId)
+          }
+        },
+        {
+          name: 'edit',
+          title: '编辑',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          showDisabled: row => {
+            return row.createBy != adminInfo.$state.id || !(row.status == 0)
+          },
+          disabled: row => {
+            return !(row.status == 0)
+          },
+          click: row => {
+            planAddRef.value.open('编辑', row.id, false)
+          }
+        },
+        {
+          name: 'edit',
+          title: '重新发起',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+          },
+          click: row => {
+            // deviceQuitPopup.value.open('重新发起退运', row)
+            planAddRef.value.open('重新发起计划', row.id, false)
+          }
+        },
+        {
+          name: 'cancel',
+          title: '取消',
+          type: 'danger',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || row.status != 1
+          },
+          click: row => {
+            cancelLeave(row)
+          }
+        }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    tableStore.table.params.currentPage = tableStore.table.params.pageNum
+  }
+})
+
+tableStore.table.params.status = ''
+tableStore.table.params.supvType = ''
+provide('tableStore', tableStore)
+// 新增计划
+const add = () => {
+  // title.value = '普测计划新增'
+  planAddRef.value.open('计划新增')
+}
+// 禁止点击
+const checkboxConfig = reactive({
+  checkMethod: ({ row }) => {
+    return adminInfo.roleCode.includes('delete_info')
+      ? true
+      : row.createBy == adminInfo.$state.id && row.status == 0
+  }
+})
+const deleteEven = () => {
+  if (tableStore.table.selection.length == 0) {
+    ElMessage({
+      type: 'warning',
+      message: '请选择要删除的数据'
+    })
+  } else {
+
+    ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+      .then(() => {
+        deleteSurveyPlan(tableStore.table.selection.map(item => item.id)).then(res => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功!'
+          })
+          tableStore.index()
+        })
+      })
+
+
+  }
+}
+const exportFn = () => {
+  let form = JSON.parse(JSON.stringify(tableStore.table.params))
+  form.pageNum = 1
+  form.pageSize = tableStore.table.total
+  queryPlan(form).then(res => {
+    tableRef.value.getRef().exportData({
+      filename: '计划', // 文件名字
+      sheetName: 'Sheet1',
+      type: 'xlsx', //导出文件类型 xlsx 和 csv
+      useStyle: true,
+      data: res.data.records, // 数据源 // 过滤那个字段导出
+      columnFilterMethod: function (column: any) {
+        return !(column.$columnIndex === 0)
+      }
+    })
+  })
+}
+
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+  // 二次确认
+  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputType: 'textarea',
+    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+    inputErrorMessage: '取消原因不能为空'
+  })
+  // 发起取消
+  let data = {
+    id: row.id,
+    processInstanceId: row.processInstanceId,
+    reason: value
+  }
+  await cancel(data)
+  ElMessage.success('取消成功')
+  // 加载数据
+  tableStore.index()
+}
+
+const handleClose = () => {
+  dialogVisible.value = false
+  auditUser.value = ''
+}
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    state: {
+      id: instanceId,
+      historyInstanceId
+    }
+  })
+}
+// 取消
+
+onMounted(() => {
+  tableStore.index()
+  getUserByRoleType(3).then(res => {
+    auditList.value = res.data
+  })
+})
+watch(
+  () => currentRoute.value.path,
+  () => {
+    if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+      tableStore.index()
+      flag.value = false
+    }
+  },
+  {
+    deep: true
+  }
+)
+
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+  if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+  const fullId = newValue.split('@')[0]
+  let nowTime = Date.now()
+  const routeTime = Number(newValue.split('@')[1])
+  if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+  nextTick(() => {
+    planAddRef.value.open('重新发起计划', fullId, false)
+  })
+}, { immediate: true })
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise_hn/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise_hn/harmonicSurvey/components/testManage.vue
index 137945cb..9875b5e5 100644
--- a/src/views/pqs/supervise_hn/harmonicSurvey/components/testManage.vue
+++ b/src/views/pqs/supervise_hn/harmonicSurvey/components/testManage.vue
@@ -1,339 +1,339 @@
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
-        <template v-slot:select>
-            <el-form-item label='监督类型'>
-                <el-select v-model='tableStore.table.params.supvType' clearable placeholder='请选择监督类型'>
-                    <el-option v-for='item in supvTypeOptionList' :key='item.id' :label='item.name'
-                        :value='item.id'></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label='流程状态'>
-                <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
-                    <el-option v-for='item in statusSelect' :key='item.id' :label='item.name'
-                        :value='item.id'></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon='el-icon-Delete' type='primary' @click='deleteEven'>删除</el-button>
-        </template>
-    </TableHeader>
-    <Table ref='tableRef' :checkbox-config='checkboxConfig' />
-    <!-- 新增 -->
-    <planTest ref='planTestRef' @onsubmit='tableStore.index()' />
-</template>
-<script setup lang='ts'>
-import { ref, onMounted, provide, watch, nextTick } from 'vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-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 { cancelTest } from '@/api/process-boot/generalTest'
-import planTest from './planTest.vue'
-import { useRouter } from 'vue-router'
-import { deleteSurveyPlanTest } from '@/api/supervision-boot/delete/index'
-import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
-import { getUserByRoleType } from '@/api/user-boot/user'
-
-const { push } = useRouter()
-const tableRef = ref()
-import { useDictData } from '@/stores/dictData'
-
-const dictData = useDictData()
-const supvTypeOptionList = dictData.getBasicData('supv_type')
-const statusSelect = dictData.statusSelect()
-
-const planTestRef = ref()
-const TableHeaderRef = ref()
-const auditList: any = ref([])
-
-const tableStore = new TableStore({
-    url: '/supervision-boot/surveyTest/surveyTestPage',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            title: '序号',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'planName', title: '计划名称', minWidth: 140 },
-        {
-            field: 'supvType',
-            title: '监督类型',
-            minWidth: 130,
-            formatter: (row: any) => {
-                return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'supvObjectName',
-            minWidth: 130,
-            title: '监督对象名称'
-        },
-        { field: 'substationName', title: '变电站', minWidth: 140 },
-        { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
-        { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
-        {
-            field: 'problemFlag',
-            title: '是否存在问题',
-            minWidth: 120,
-            render: 'tag',
-            custom: {
-                0: 'success',
-                1: 'danger',
-                null: 'primary'
-            },
-            replaceValue: {
-                0: '合格',
-                1: '存在问题',
-                null: '待测试'
-            }
-        },
-        { field: 'deptName', title: '负责单位', minWidth: 140 },
-        { field: 'completeBy', title: '计划负责人', minWidth: 130 },
-        { field: 'completeTime', title: '实际完成时间', minWidth: 140 },
-        {
-            field: 'status',
-            title: '流程状态',
-            render: 'tag',
-            minWidth: 140,
-            custom: {
-                0: 'warning',
-
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                0: '待提交审批',
-
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 120,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 180,
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '测试填报',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.status != 6
-                    },
-                    click: row => {
-                        add(row.id)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.status == 6 || !row.processInstanceId
-                    },
-                    click: row => {
-                        // planTestRef.value.open('查看计划', row)
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.deptId != adminInfo.$state.deptId || !(row.status == 0)
-                    },
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-                    click: row => {
-                        planTestRef.value.open('编辑', row.id, false)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.deptId != adminInfo.$state.deptId || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        planTestRef.value.open('重新发起计划测试', row.id, false)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.deptId != adminInfo.$state.deptId || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.currentPage = tableStore.table.params.pageNum
-    }
-})
-
-tableStore.table.params.status = ''
-tableStore.table.params.supvType = ''
-
-provide('tableStore', tableStore)
-// 新增计划
-const add = (id: string) => {
-    planTestRef.value.open('计划测试填报', id, true)
-}
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        })
-            .then(() => {
-                deleteSurveyPlanTest(tableStore.table.selection.map(item => item.id)).then(res => {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除成功!'
-                    })
-                    tableStore.index()
-                })
-            })
-
-
-
-
-    }
-}
-const exportFn = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    queryPlan(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '计划', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelTest(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-// 取消
-
-onMounted(() => {
-    tableStore.index()
-    getUserByRoleType(3).then(res => {
-        auditList.value = res.data
-    })
-})
-
-const props = defineProps(['id', 'businessKey'])
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    const fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    nextTick(() => {
-        if (props.businessKey == '3') {
-            planTestRef.value.open('编辑', fullId, false)
-        } else {
-            planTestRef.value.open('重新发起计划测试', fullId, false)
-        }
-    })
-}, { immediate: true })
-</script>
-
-<style scoped lang='scss'></style>
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
+        <template v-slot:select>
+            <el-form-item label='监督类型'>
+                <el-select v-model='tableStore.table.params.supvType' clearable placeholder='请选择监督类型'>
+                    <el-option v-for='item in supvTypeOptionList' :key='item.id' :label='item.name'
+                        :value='item.id'></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label='流程状态'>
+                <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
+                    <el-option v-for='item in statusSelect' :key='item.id' :label='item.name'
+                        :value='item.id'></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon='el-icon-Delete' type='primary' @click='deleteEven'>删除</el-button>
+        </template>
+    </TableHeader>
+    <Table ref='tableRef' :checkbox-config='checkboxConfig' />
+    <!-- 新增 -->
+    <planTest ref='planTestRef' @onsubmit='tableStore.index()' />
+</template>
+<script setup lang='ts'>
+import { ref, onMounted, provide, watch, nextTick } from 'vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+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 { cancelTest } from '@/api/process-boot/generalTest'
+import planTest from './planTest.vue'
+import { useRouter } from 'vue-router'
+import { deleteSurveyPlanTest } from '@/api/supervision-boot/delete/index'
+import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
+import { getUserByRoleType } from '@/api/user-boot/user'
+
+const { push } = useRouter()
+const tableRef = ref()
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
+const statusSelect = dictData.statusSelect()
+
+const planTestRef = ref()
+const TableHeaderRef = ref()
+const auditList: any = ref([])
+
+const tableStore = new TableStore({
+    url: '/supervision-boot/surveyTest/surveyTestPage',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'planName', title: '计划名称', minWidth: 140 },
+        {
+            field: 'supvType',
+            title: '监督类型',
+            minWidth: 130,
+            formatter: (row: any) => {
+                return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'supvObjectName',
+            minWidth: 130,
+            title: '监督对象名称'
+        },
+        { field: 'substationName', title: '变电站', minWidth: 140 },
+        { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
+        { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
+        {
+            field: 'problemFlag',
+            title: '是否存在问题',
+            minWidth: 120,
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'danger',
+                null: 'primary'
+            },
+            replaceValue: {
+                0: '合格',
+                1: '存在问题',
+                null: '待测试'
+            }
+        },
+        { field: 'deptName', title: '负责单位', minWidth: 140 },
+        { field: 'completeBy', title: '计划负责人', minWidth: 130 },
+        { field: 'completeTime', title: '实际完成时间', minWidth: 140 },
+        {
+            field: 'status',
+            title: '流程状态',
+            render: 'tag',
+            minWidth: 140,
+            custom: {
+                0: 'warning',
+
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 120,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 180,
+            render: 'buttons',
+          
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '测试填报',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status != 6
+                    },
+                    click: row => {
+                        add(row.id)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.status == 6 || !row.processInstanceId
+                    },
+                    click: row => {
+                        // planTestRef.value.open('查看计划', row)
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.deptId != adminInfo.$state.deptId || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+                    click: row => {
+                        planTestRef.value.open('编辑', row.id, false)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.deptId != adminInfo.$state.deptId || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        planTestRef.value.open('重新发起计划测试', row.id, false)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.deptId != adminInfo.$state.deptId || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    }
+})
+
+tableStore.table.params.status = ''
+tableStore.table.params.supvType = ''
+
+provide('tableStore', tableStore)
+// 新增计划
+const add = (id: string) => {
+    planTestRef.value.open('计划测试填报', id, true)
+}
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+                deleteSurveyPlanTest(tableStore.table.selection.map(item => item.id)).then(res => {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除成功!'
+                    })
+                    tableStore.index()
+                })
+            })
+
+
+
+
+    }
+}
+const exportFn = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    queryPlan(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '计划', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelTest(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+// 取消
+
+onMounted(() => {
+    tableStore.index()
+    getUserByRoleType(3).then(res => {
+        auditList.value = res.data
+    })
+})
+
+const props = defineProps(['id', 'businessKey'])
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    const fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+    nextTick(() => {
+        if (props.businessKey == '3') {
+            planTestRef.value.open('编辑', fullId, false)
+        } else {
+            planTestRef.value.open('重新发起计划测试', fullId, false)
+        }
+    })
+}, { immediate: true })
+</script>
+
+<style scoped lang='scss'></style>
diff --git a/src/views/pqs/supervise_hn/interfere/components/network/index.vue b/src/views/pqs/supervise_hn/interfere/components/network/index.vue
index 12a20c63..a5adcc86 100644
--- a/src/views/pqs/supervise_hn/interfere/components/network/index.vue
+++ b/src/views/pqs/supervise_hn/interfere/components/network/index.vue
@@ -61,7 +61,7 @@ const tableStore = new TableStore({
         { field: 'recordTime', title: '建档时间' },
         { field: 'iuploadTime', title: '报告提交评估时间' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/supervise_hn/interfere/components/normal.vue b/src/views/pqs/supervise_hn/interfere/components/normal.vue
index 96dc7996..199262b7 100644
--- a/src/views/pqs/supervise_hn/interfere/components/normal.vue
+++ b/src/views/pqs/supervise_hn/interfere/components/normal.vue
@@ -1,129 +1,129 @@
-<template>
-    <div>
-        <div>
-            <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-input
-                            v-model="tableStore.table.params.relationUserName"
-                            clearable
-                            placeholder="请选择关联干扰源用户"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="是否已上传实测">
-                        <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>
-                <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>
-    </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 interferenceType = dictData.getBasicData('Interference_Source')
-const istatusList = dictData.getBasicData('On-network_Status')
-const TableHeaderRef = ref()
-
-const tableStore = new TableStore({
-    url: '/process-boot/loadTypeUserManage/getLoadTypeRelationList',
-    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: 'relationUserName', title: '关联干扰源用户名称' },
-        {
-            field: 'istatus',
-            title: '实测报告状态',
-            formatter: row => {
-                return istatusList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '查看',
-                    type: 'primary',
-
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {}
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = 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()
-})
-</script>
+<template>
+    <div>
+        <div>
+            <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-input
+                            v-model="tableStore.table.params.relationUserName"
+                            clearable
+                            placeholder="请选择关联干扰源用户"
+                        ></el-input>
+                    </el-form-item>
+
+                    <el-form-item label="是否已上传实测">
+                        <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>
+                <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>
+    </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 interferenceType = dictData.getBasicData('Interference_Source')
+const istatusList = dictData.getBasicData('On-network_Status')
+const TableHeaderRef = ref()
+
+const tableStore = new TableStore({
+    url: '/process-boot/loadTypeUserManage/getLoadTypeRelationList',
+    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: 'relationUserName', title: '关联干扰源用户名称' },
+        {
+            field: 'istatus',
+            title: '实测报告状态',
+            formatter: row => {
+                return istatusList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '查看',
+                    type: 'primary',
+
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {}
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = 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()
+})
+</script>
diff --git a/src/views/pqs/supervise_hn/interfere/components/normalizationManager/interferenceUserTable.vue b/src/views/pqs/supervise_hn/interfere/components/normalizationManager/interferenceUserTable.vue
index 7e2b6911..25181ac5 100644
--- a/src/views/pqs/supervise_hn/interfere/components/normalizationManager/interferenceUserTable.vue
+++ b/src/views/pqs/supervise_hn/interfere/components/normalizationManager/interferenceUserTable.vue
@@ -173,9 +173,9 @@ const tableStore = new TableStore({
     },
     // visible:!jb_pl.value && !jb_dky.value?true:false,
     {
-      title: '操作',
+       title: '操作',fixed: 'right',
       minWidth: 300,
-      fixed: 'right',
+    
       render: 'buttons',
 
       buttons: [
diff --git a/src/views/pqs/supervise_hn/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise_hn/interfere/components/normalizationManager/programReview.vue
index d345ccef..c1e5dce7 100644
--- a/src/views/pqs/supervise_hn/interfere/components/normalizationManager/programReview.vue
+++ b/src/views/pqs/supervise_hn/interfere/components/normalizationManager/programReview.vue
@@ -1,358 +1,358 @@
-<template>
-  <div class="default-main">
-    <!-- <TableHeader ref='TableHeaderRef'>
-        <template #select>
-            <el-form-item label='用户名称'>
-                <el-input v-model='tableStore.table.params.projectName' clearable></el-input>
-            </el-form-item>
-            <el-form-item label='所在地市'>
-                <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
-                    <el-option
-                        v-for='item in areaOptionList'
-                        :key='item.id'
-                        :label='item.name'
-                        :value='item.name'
-                    ></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-<template #operation>
-            <el-button icon='' type='primary' @click='toGoNet()'>{{ titleButton }}</el-button>
-
-            <el-button style='margin-left: 50px' :icon='Back'  @click='go(-1)'>返回</el-button>
-        </template>
-</TableHeader> -->
-    <div class="header_btn">
-      <el-button v-if="bussType == 0 && !(jb_pl || jb_dky)" icon="" type="primary" @click="toGoNet()">
-        {{ titleButton }}
-      </el-button>
-      <el-button v-if="bussType == 1 && needGovernance != '0' && !(jb_pl || jb_dky)" icon="" type="primary"
-        @click="toGoNet()">
-        {{ titleButton }}
-      </el-button>
-      <el-button style="margin-left: 50px" :icon="Back" @click="go(-1)">返回</el-button>
-    </div>
-    <Table ref="tableRef" />
-
-    <addForm v-if="dialogVisible" ref="addForms" :id="bussId" :bussType="bussType" :title="titleButton1"
-      openType="detail" @onSubmit="tableStore.index()"></addForm>
-  </div>
-</template>
-
-<script setup lang="ts">
-defineOptions({
-  name: 'ProgramReview'
-})
-
-import { ref, onMounted, provide, nextTick, onUnmounted } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import { cancel, userReportGoNetById } from '@/api/supervision-boot/interfere/index'
-import { useDictData } from '@/stores/dictData'
-import addForm from './addForm.vue'
-import { useRouter, useRoute } from 'vue-router'
-import { Back } from '@element-plus/icons-vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-
-const { go, currentRoute, push } = useRouter()
-const { query } = useRoute() // 查询参数
-import { ElMessage } from 'element-plus'
-import { ElMessageBox } from 'element-plus/es'
-
-const needGovernance = query.needGovernance as unknown as string // 从 URL 传递过来的 是否需要治理
-const dictData = useDictData()
-const areaOptionList = dictData.getBasicData('jibei_area')
-const adminInfo = useAdminInfo()
-const jb_pl = ref(false)
-const jb_dky = ref(false)
-jb_pl.value =
-  adminInfo.$state.roleCode.filter(item => {
-    return item == 'jb_pl'
-  }).length != 0
-    ? true
-    : false
-jb_dky.value =
-  adminInfo.$state.roleCode.filter(item => {
-    return item == 'jb_dky'
-  }).length != 0
-    ? true
-    : false
-const tableStore = new TableStore({
-  url: '/supervision-boot/userReportNormal/userReportGoNetPage',
-
-  method: 'POST',
-  column: [
-    {
-      title: '序号', width: 80, formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { 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 },
-    {
-      field: 'status',
-      title: '流程状态',
-      minWidth: 100,
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning'
-      },
-      replaceValue: {
-        0: '待提交审批',
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消'
-      }
-    },
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 80,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    { field: 'createTime', title: '创建时间', minWidth: 100 },
-    {
-      title: '操作',
-      minWidth: 180,
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return !row.processInstanceId
-          },
-          click: row => {
-            handleAudit(row.processInstanceId)
-          }
-        },
-        {
-          name: 'edit',
-          title: '编辑',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          showDisabled: row => {
-            return !(row.status == 0 || row.status == 3)
-          },
-          disabled: row => {
-            return !(row.status == 0 || row.status == 3)
-          },
-          click: row => {
-            dialogVisible.value = true
-            titleButton1.value = '编辑'
-            setTimeout(() => {
-              addForms.value.open(row)
-            }, 0)
-          }
-        },
-        {
-          name: 'edit',
-          title: '重新发起',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 4)
-          },
-          click: row => {
-            dialogVisible.value = true
-            titleButton1.value = '重新发起'
-            setTimeout(() => {
-              addForms.value.open(row)
-            }, 0)
-          }
-        },
-        {
-          name: 'cancel',
-          title: '取消',
-          type: 'danger',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status !== 1
-          },
-          click: row => {
-            cancelLeave(row)
-          }
-        }
-      ]
-    }
-  ],
-
-  beforeSearchFun: () => {
-    tableStore.table.params.userReportId = bussId.value
-    tableStore.table.params.type = bussType.value
-    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    tableStore.table.params.relationUserName = tableStore.table.params.userName
-  }
-})
-tableStore.table.params.city = ''
-tableStore.table.params.projectName = ''
-
-const dialogVisible = ref(false)
-const bussId = ref()
-bussId.value = currentRoute.value.query.id
-
-const bussType = ref()
-bussType.value = Number(currentRoute.value.query.type)
-
-const titleButton = ref()
-const titleButton1 = ref()
-
-provide('tableStore', tableStore)
-const handleVisibilityChange = async () => {
-  if (document.visibilityState === 'visible') {
-    // 在这里执行页面回到回到当前页签需要做的事情
-    await tableStore.index()
-  } else if (document.visibilityState === 'hidden') {
-    // 在这里执行页面离开时需要做的事情
-  }
-}
-onMounted(async () => {
-  tableStore.index()
-  document.addEventListener('visibilitychange', handleVisibilityChange)
-  if (query.fangAnId) {
-    //根据id查询待编辑的数据
-    await userReportGoNetById({ id: query.fangAnId }).then(res => {
-      if (res && res.code == 'A0000') {
-        dialogVisible.value = true
-        titleButton1.value = '重新发起'
-        setTimeout(() => {
-          res.data.id = query.fangAnId
-          addForms.value.open(res.data)
-        }, 0)
-      }
-    })
-
-  }
-
-})
-onUnmounted(() => {
-  document.removeEventListener('visibilitychange', handleVisibilityChange)
-})
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-  // 二次确认
-  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    inputType: 'textarea',
-    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-    inputErrorMessage: '取消原因不能为空'
-  })
-  // 发起取消
-  let data = {
-    id: row.id,
-    processInstanceId: row.processInstanceId,
-    reason: value
-  }
-  await cancel(data)
-  ElMessage.success('取消成功')
-  // 加载数据
-  tableStore.index()
-}
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    query: {
-      id: instanceId
-    }
-  })
-}
-if (bussType.value === 0) {
-  titleButton.value = '入网设计方案申请'
-} else {
-  titleButton.value = '治理工程申请'
-}
-const addForms = ref()
-const toGoNet = () => {
-  dialogVisible.value = true
-  if (bussType.value === 0) {
-    titleButton1.value = '入网设计方案申请'
-  } else {
-    titleButton1.value = '治理工程申请'
-  }
-  setTimeout(() => {
-    addForms.value.open()
-  }, 0)
-}
-
-/**获取用户性质*/
-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">
-.header_btn {
-  width: 100%;
-  height: 60px;
-  display: flex;
-  padding: 13px 15px;
-  justify-content: flex-end;
-  align-items: center;
-  border: 1px solid #dddfe6;
-}
-</style>
+<template>
+  <div class="default-main">
+    <!-- <TableHeader ref='TableHeaderRef'>
+        <template #select>
+            <el-form-item label='用户名称'>
+                <el-input v-model='tableStore.table.params.projectName' clearable></el-input>
+            </el-form-item>
+            <el-form-item label='所在地市'>
+                <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
+                    <el-option
+                        v-for='item in areaOptionList'
+                        :key='item.id'
+                        :label='item.name'
+                        :value='item.name'
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+<template #operation>
+            <el-button icon='' type='primary' @click='toGoNet()'>{{ titleButton }}</el-button>
+
+            <el-button style='margin-left: 50px' :icon='Back'  @click='go(-1)'>返回</el-button>
+        </template>
+</TableHeader> -->
+    <div class="header_btn">
+      <el-button v-if="bussType == 0 && !(jb_pl || jb_dky)" icon="" type="primary" @click="toGoNet()">
+        {{ titleButton }}
+      </el-button>
+      <el-button v-if="bussType == 1 && needGovernance != '0' && !(jb_pl || jb_dky)" icon="" type="primary"
+        @click="toGoNet()">
+        {{ titleButton }}
+      </el-button>
+      <el-button style="margin-left: 50px" :icon="Back" @click="go(-1)">返回</el-button>
+    </div>
+    <Table ref="tableRef" />
+
+    <addForm v-if="dialogVisible" ref="addForms" :id="bussId" :bussType="bussType" :title="titleButton1"
+      openType="detail" @onSubmit="tableStore.index()"></addForm>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: 'ProgramReview'
+})
+
+import { ref, onMounted, provide, nextTick, onUnmounted } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import { cancel, userReportGoNetById } from '@/api/supervision-boot/interfere/index'
+import { useDictData } from '@/stores/dictData'
+import addForm from './addForm.vue'
+import { useRouter, useRoute } from 'vue-router'
+import { Back } from '@element-plus/icons-vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+
+const { go, currentRoute, push } = useRouter()
+const { query } = useRoute() // 查询参数
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+
+const needGovernance = query.needGovernance as unknown as string // 从 URL 传递过来的 是否需要治理
+const dictData = useDictData()
+const areaOptionList = dictData.getBasicData('jibei_area')
+const adminInfo = useAdminInfo()
+const jb_pl = ref(false)
+const jb_dky = ref(false)
+jb_pl.value =
+  adminInfo.$state.roleCode.filter(item => {
+    return item == 'jb_pl'
+  }).length != 0
+    ? true
+    : false
+jb_dky.value =
+  adminInfo.$state.roleCode.filter(item => {
+    return item == 'jb_dky'
+  }).length != 0
+    ? true
+    : false
+const tableStore = new TableStore({
+  url: '/supervision-boot/userReportNormal/userReportGoNetPage',
+
+  method: 'POST',
+  column: [
+    {
+      title: '序号', width: 80, formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      }
+    },
+    { 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 },
+    {
+      field: 'status',
+      title: '流程状态',
+      minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+        2: 'success',
+        3: 'danger',
+        4: 'warning'
+      },
+      replaceValue: {
+        0: '待提交审批',
+        1: '审批中',
+        2: '审批通过',
+        3: '审批不通过',
+        4: '已取消'
+      }
+    },
+    {
+      field: 'createBy',
+      title: '填报人',
+      minWidth: 80,
+      formatter: (row: any) => {
+        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+      }
+    },
+    { field: 'createTime', title: '创建时间', minWidth: 100 },
+    {
+       title: '操作',fixed: 'right',
+      minWidth: 180,
+    
+      render: 'buttons',
+      buttons: [
+        {
+          name: 'productSetting',
+          title: '流程详情',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          disabled: row => {
+            return !row.processInstanceId
+          },
+          click: row => {
+            handleAudit(row.processInstanceId)
+          }
+        },
+        {
+          name: 'edit',
+          title: '编辑',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          showDisabled: row => {
+            return !(row.status == 0 || row.status == 3)
+          },
+          disabled: row => {
+            return !(row.status == 0 || row.status == 3)
+          },
+          click: row => {
+            dialogVisible.value = true
+            titleButton1.value = '编辑'
+            setTimeout(() => {
+              addForms.value.open(row)
+            }, 0)
+          }
+        },
+        {
+          name: 'edit',
+          title: '重新发起',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || !(row.status == 4)
+          },
+          click: row => {
+            dialogVisible.value = true
+            titleButton1.value = '重新发起'
+            setTimeout(() => {
+              addForms.value.open(row)
+            }, 0)
+          }
+        },
+        {
+          name: 'cancel',
+          title: '取消',
+          type: 'danger',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || row.status !== 1
+          },
+          click: row => {
+            cancelLeave(row)
+          }
+        }
+      ]
+    }
+  ],
+
+  beforeSearchFun: () => {
+    tableStore.table.params.userReportId = bussId.value
+    tableStore.table.params.type = bussType.value
+    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    tableStore.table.params.relationUserName = tableStore.table.params.userName
+  }
+})
+tableStore.table.params.city = ''
+tableStore.table.params.projectName = ''
+
+const dialogVisible = ref(false)
+const bussId = ref()
+bussId.value = currentRoute.value.query.id
+
+const bussType = ref()
+bussType.value = Number(currentRoute.value.query.type)
+
+const titleButton = ref()
+const titleButton1 = ref()
+
+provide('tableStore', tableStore)
+const handleVisibilityChange = async () => {
+  if (document.visibilityState === 'visible') {
+    // 在这里执行页面回到回到当前页签需要做的事情
+    await tableStore.index()
+  } else if (document.visibilityState === 'hidden') {
+    // 在这里执行页面离开时需要做的事情
+  }
+}
+onMounted(async () => {
+  tableStore.index()
+  document.addEventListener('visibilitychange', handleVisibilityChange)
+  if (query.fangAnId) {
+    //根据id查询待编辑的数据
+    await userReportGoNetById({ id: query.fangAnId }).then(res => {
+      if (res && res.code == 'A0000') {
+        dialogVisible.value = true
+        titleButton1.value = '重新发起'
+        setTimeout(() => {
+          res.data.id = query.fangAnId
+          addForms.value.open(res.data)
+        }, 0)
+      }
+    })
+
+  }
+
+})
+onUnmounted(() => {
+  document.removeEventListener('visibilitychange', handleVisibilityChange)
+})
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+  // 二次确认
+  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputType: 'textarea',
+    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+    inputErrorMessage: '取消原因不能为空'
+  })
+  // 发起取消
+  let data = {
+    id: row.id,
+    processInstanceId: row.processInstanceId,
+    reason: value
+  }
+  await cancel(data)
+  ElMessage.success('取消成功')
+  // 加载数据
+  tableStore.index()
+}
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    query: {
+      id: instanceId
+    }
+  })
+}
+if (bussType.value === 0) {
+  titleButton.value = '入网设计方案申请'
+} else {
+  titleButton.value = '治理工程申请'
+}
+const addForms = ref()
+const toGoNet = () => {
+  dialogVisible.value = true
+  if (bussType.value === 0) {
+    titleButton1.value = '入网设计方案申请'
+  } else {
+    titleButton1.value = '治理工程申请'
+  }
+  setTimeout(() => {
+    addForms.value.open()
+  }, 0)
+}
+
+/**获取用户性质*/
+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">
+.header_btn {
+  width: 100%;
+  height: 60px;
+  display: flex;
+  padding: 13px 15px;
+  justify-content: flex-end;
+  align-items: center;
+  border: 1px solid #dddfe6;
+}
+</style>
diff --git a/src/views/pqs/supervise_hn/interfere/components/undocumented/index.vue b/src/views/pqs/supervise_hn/interfere/components/undocumented/index.vue
index 3ac5c4e6..c69e8789 100644
--- a/src/views/pqs/supervise_hn/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise_hn/interfere/components/undocumented/index.vue
@@ -1,404 +1,404 @@
-<template>
-  <TableHeader datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
-    <template #select>
-      <el-form-item label='项目名称'>
-        <el-input v-model='tableStore.table.params.projectName' placeholder='请输入项目名称' clearable maxlength="32"  show-word-limit></el-input>
-      </el-form-item>
-      <el-form-item label='所在地市'>
-        <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
-          <el-option v-for='item in areaOptionList' :key='item.id' :label='item.name' :value='item.name'></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item label='流程状态'>
-        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
-          <el-option v-for='item in statusSelect' :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="addList">新增</el-button> -->
-      <el-button icon='el-icon-Plus' type='primary' @click='addFormModel'>新增</el-button>
-      <el-button icon='el-icon-Delete' type='primary' @click='deleteEven'>删除</el-button>
-      <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
-    </template>
-  </TableHeader>
-  <Table ref='tableRef' :checkbox-config='checkboxConfig' />
-  <!-- 新增 -->
-  <Add ref='addRef' @onSubmit='tableStore.index()' />
-  <!-- 上传 -->
-  <Audit ref='AuditRef' @onSubmit='tableStore.index()' />
-  <!-- 查看详情 detail 新增/修改 create-->
-  <addForm ref='addForms' @onSubmit='tableStore.index()'></addForm>
-</template>
-<script setup lang='ts'>
-import { ref, onMounted, provide, watch, reactive } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import Add from './add.vue'
-import Audit from './audit.vue'
-import addForm from './addForm.vue'
-import { useDictData } from '@/stores/dictData'
-import { getLoadTypeUserList } from '@/api/process-boot/interference'
-import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { deleteUserReport } from '@/api/supervision-boot/delete/index'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const { push, options, currentRoute } = useRouter()
-const TableHeaderRef = ref()
-const tableRef = ref()
-const areaOptionList = dictData
-  .getBasicData('jibei_area')
-  .filter(item => !(item.name == '超高压' || item.name == '风光储'))
-const statusSelect = dictData.statusSelect()
-const addRef = ref()
-const AuditRef = ref()
-const ruleFormRef = ref()
-const show: any = ref(false)
-const fileList = ref([])
-const flag = ref(false)
-const tableStore = new TableStore({
-  url: '/supervision-boot/userReport/getUserReport',
-  publicHeight: 65,
-  method: 'POST',
-  column: [
-    {
-      width: '60',
-      type: 'checkbox'
-    },
-    { title: '序号', width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-    // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
-    {
-      field: 'city',
-      title: '所在地市',
-      minWidth: 80
-      // formatter: (obj: any) => {
-      //     return areaOptionList.filter(item => item.id == obj.row.city)[0]?.name
-      // }
-    },
-    {
-      field: 'substation',
-      title: '厂站名称',
-      minWidth: 100,
-      formatter: (row: any) => {
-        row.cellValue = row.cellValue ? row.cellValue : '/'
-        return row.cellValue
-      }
-    },
-    { field: 'projectName', title: '项目名称', minWidth: 170 },
-    {
-      field: 'userType',
-      title: '用户性质',
-      minWidth: 150,
-      formatter: (obj: any) => {
-        const userType = obj.row.userType
-        return getUserTypeName(userType)
-      }
-    },
-    { 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: 'status',
-      title: '流程状态',
-      minWidth: 100,
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning'
-      },
-      replaceValue: {
-        0: '待提交审批',
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消'
-      }
-    },
-    { field: 'createTime', title: '开始时间', minWidth: 170 },
-    {
-      field: 'createBy',
-      title: '填报人',
-      minWidth: 80,
-      formatter: (row: any) => {
-        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-      }
-    },
-    {
-      title: '操作',
-      minWidth: 150,
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          disabled: row => {
-            return !row.processInstanceId
-          },
-          click: row => {
-            flag.value = true
-            handleAudit(row.processInstanceId, row.historyInstanceId)
-          }
-        },
-        {
-          name: 'edit',
-          title: '编辑',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          showDisabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 0)
-          },
-          disabled: row => {
-            return !(row.status == 0)
-          },
-          click: row => {
-            addForms.value.open({
-              title: '编辑',
-              row: row
-            })
-          }
-        },
-        {
-          name: 'edit',
-          title: '重新发起',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-          },
-          click: row => {
-            addForms.value.open({
-              title: '重新发起',
-              row: row
-            })
-          }
-        },
-        {
-          name: 'cancel',
-          title: '取消',
-          type: 'danger',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status != 1
-          },
-          click: row => {
-            cancelLeave(row)
-          }
-        }
-      ]
-    }
-  ],
-
-  beforeSearchFun: () => {
-    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    tableStore.table.params.relationUserName = tableStore.table.params.userName
-  }
-})
-tableStore.table.params.city = ''
-tableStore.table.params.projectName = ''
-tableStore.table.params.loadType = ''
-tableStore.table.params.userName = ''
-tableStore.table.params.fileUploadflag = ''
-tableStore.table.params.orgId = adminInfo.$state.deptId
-tableStore.table.params.status = ''
-
-provide('tableStore', tableStore)
-// 新增
-const addList = () => {
-  addRef.value.open()
-}
-// 禁止点击
-const checkboxConfig = reactive({
-  checkMethod: ({ row }) => {
-    return adminInfo.roleCode.includes('delete_info')
-      ? true
-      : row.createBy == adminInfo.$state.id && row.status == 0
-  }
-})
-const deleteEven = () => {
-  if (tableStore.table.selection.length == 0) {
-    ElMessage({
-      type: 'warning',
-      message: '请选择要删除的数据'
-    })
-  } else {
-    ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    })
-      .then(() => {
-
-        deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
-          ElMessage({
-            type: 'success',
-            message: '删除成功!'
-          })
-          tableStore.index()
-        })
-
-      })
-
-
-
-
-  }
-}
-
-const addForms = ref()
-const addFormModel = () => {
-  show.value = true
-  setTimeout(() => {
-    addForms.value.open({
-      title: '用户档案录入'
-    })
-  }, 0)
-}
-
-// 导出
-const exportEvent = () => {
-  let form = JSON.parse(JSON.stringify(tableStore.table.params))
-  form.pageNum = 1
-  form.pageSize = tableStore.table.total
-  getLoadTypeUserList(form).then(res => {
-    tableRef.value.getRef().exportData({
-      filename: '未建档非线性用户', // 文件名字
-      sheetName: 'Sheet1',
-      type: 'xlsx', //导出文件类型 xlsx 和 csv
-      useStyle: true,
-      data: res.data.records, // 数据源 // 过滤那个字段导出
-      columnFilterMethod: function (column: any) {
-        return !(column.$columnIndex === 0)
-      }
-    })
-  })
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-  // 二次确认
-  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    inputType: 'textarea',
-    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-    inputErrorMessage: '取消原因不能为空'
-  })
-  // 发起取消
-  let data = {
-    id: row.id,
-    processInstanceId: row.processInstanceId,
-    reason: value
-  }
-  await cancelFormData(data)
-  ElMessage.success('取消成功')
-  // 加载数据
-  tableStore.index()
-}
-
-onMounted(() => {
-  tableStore.index()
-})
-watch(
-  () => currentRoute.value.path,
-  () => {
-    if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-      tableStore.index()
-      flag.value = false
-    }
-  },
-  {
-    deep: true
-  }
-)
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    state: {
-      id: instanceId,
-      historyInstanceId
-    }
-  })
-}
-
-/**获取用户性质*/
-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 '新建电网工程'
-}
-
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-  if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-  const fullId = newValue.split('@')[0]
-  let nowTime = Date.now()
-  const routeTime = Number(newValue.split('@')[1])
-  if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-  await getUserReportById(fullId).then(res => {
-    if (res && res.code == 'A0000') {
-      addForms.value.open({
-        title: '重新发起',
-        row: res.data
-      })
-    }
-  })
-}, { immediate: true })
-
-</script>
-
-<style scoped lang='scss'></style>
+<template>
+  <TableHeader datePicker nextFlag theCurrentTime ref='TableHeaderRef'>
+    <template #select>
+      <el-form-item label='项目名称'>
+        <el-input v-model='tableStore.table.params.projectName' placeholder='请输入项目名称' clearable maxlength="32"  show-word-limit></el-input>
+      </el-form-item>
+      <el-form-item label='所在地市'>
+        <el-select v-model='tableStore.table.params.city' clearable placeholder='请选择所在地市'>
+          <el-option v-for='item in areaOptionList' :key='item.id' :label='item.name' :value='item.name'></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label='流程状态'>
+        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
+          <el-option v-for='item in statusSelect' :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="addList">新增</el-button> -->
+      <el-button icon='el-icon-Plus' type='primary' @click='addFormModel'>新增</el-button>
+      <el-button icon='el-icon-Delete' type='primary' @click='deleteEven'>删除</el-button>
+      <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
+    </template>
+  </TableHeader>
+  <Table ref='tableRef' :checkbox-config='checkboxConfig' />
+  <!-- 新增 -->
+  <Add ref='addRef' @onSubmit='tableStore.index()' />
+  <!-- 上传 -->
+  <Audit ref='AuditRef' @onSubmit='tableStore.index()' />
+  <!-- 查看详情 detail 新增/修改 create-->
+  <addForm ref='addForms' @onSubmit='tableStore.index()'></addForm>
+</template>
+<script setup lang='ts'>
+import { ref, onMounted, provide, watch, reactive } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import Add from './add.vue'
+import Audit from './audit.vue'
+import addForm from './addForm.vue'
+import { useDictData } from '@/stores/dictData'
+import { getLoadTypeUserList } from '@/api/process-boot/interference'
+import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { deleteUserReport } from '@/api/supervision-boot/delete/index'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const { push, options, currentRoute } = useRouter()
+const TableHeaderRef = ref()
+const tableRef = ref()
+const areaOptionList = dictData
+  .getBasicData('jibei_area')
+  .filter(item => !(item.name == '超高压' || item.name == '风光储'))
+const statusSelect = dictData.statusSelect()
+const addRef = ref()
+const AuditRef = ref()
+const ruleFormRef = ref()
+const show: any = ref(false)
+const fileList = ref([])
+const flag = ref(false)
+const tableStore = new TableStore({
+  url: '/supervision-boot/userReport/getUserReport',
+  publicHeight: 65,
+  method: 'POST',
+  column: [
+    {
+      width: '60',
+      type: 'checkbox'
+    },
+    { title: '序号', width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+    // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+    {
+      field: 'city',
+      title: '所在地市',
+      minWidth: 80
+      // formatter: (obj: any) => {
+      //     return areaOptionList.filter(item => item.id == obj.row.city)[0]?.name
+      // }
+    },
+    {
+      field: 'substation',
+      title: '厂站名称',
+      minWidth: 100,
+      formatter: (row: any) => {
+        row.cellValue = row.cellValue ? row.cellValue : '/'
+        return row.cellValue
+      }
+    },
+    { field: 'projectName', title: '项目名称', minWidth: 170 },
+    {
+      field: 'userType',
+      title: '用户性质',
+      minWidth: 150,
+      formatter: (obj: any) => {
+        const userType = obj.row.userType
+        return getUserTypeName(userType)
+      }
+    },
+    { 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: 'status',
+      title: '流程状态',
+      minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+        2: 'success',
+        3: 'danger',
+        4: 'warning'
+      },
+      replaceValue: {
+        0: '待提交审批',
+        1: '审批中',
+        2: '审批通过',
+        3: '审批不通过',
+        4: '已取消'
+      }
+    },
+    { field: 'createTime', title: '开始时间', minWidth: 170 },
+    {
+      field: 'createBy',
+      title: '填报人',
+      minWidth: 80,
+      formatter: (row: any) => {
+        return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+      }
+    },
+    {
+       title: '操作',fixed: 'right',
+      minWidth: 150,
+ 
+      render: 'buttons',
+      buttons: [
+        {
+          name: 'productSetting',
+          title: '流程详情',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          disabled: row => {
+            return !row.processInstanceId
+          },
+          click: row => {
+            flag.value = true
+            handleAudit(row.processInstanceId, row.historyInstanceId)
+          }
+        },
+        {
+          name: 'edit',
+          title: '编辑',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          showDisabled: row => {
+            return row.createBy != adminInfo.$state.id || !(row.status == 0)
+          },
+          disabled: row => {
+            return !(row.status == 0)
+          },
+          click: row => {
+            addForms.value.open({
+              title: '编辑',
+              row: row
+            })
+          }
+        },
+        {
+          name: 'edit',
+          title: '重新发起',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+          },
+          click: row => {
+            addForms.value.open({
+              title: '重新发起',
+              row: row
+            })
+          }
+        },
+        {
+          name: 'cancel',
+          title: '取消',
+          type: 'danger',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || row.status != 1
+          },
+          click: row => {
+            cancelLeave(row)
+          }
+        }
+      ]
+    }
+  ],
+
+  beforeSearchFun: () => {
+    tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    tableStore.table.params.relationUserName = tableStore.table.params.userName
+  }
+})
+tableStore.table.params.city = ''
+tableStore.table.params.projectName = ''
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.fileUploadflag = ''
+tableStore.table.params.orgId = adminInfo.$state.deptId
+tableStore.table.params.status = ''
+
+provide('tableStore', tableStore)
+// 新增
+const addList = () => {
+  addRef.value.open()
+}
+// 禁止点击
+const checkboxConfig = reactive({
+  checkMethod: ({ row }) => {
+    return adminInfo.roleCode.includes('delete_info')
+      ? true
+      : row.createBy == adminInfo.$state.id && row.status == 0
+  }
+})
+const deleteEven = () => {
+  if (tableStore.table.selection.length == 0) {
+    ElMessage({
+      type: 'warning',
+      message: '请选择要删除的数据'
+    })
+  } else {
+    ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+    })
+      .then(() => {
+
+        deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
+          ElMessage({
+            type: 'success',
+            message: '删除成功!'
+          })
+          tableStore.index()
+        })
+
+      })
+
+
+
+
+  }
+}
+
+const addForms = ref()
+const addFormModel = () => {
+  show.value = true
+  setTimeout(() => {
+    addForms.value.open({
+      title: '用户档案录入'
+    })
+  }, 0)
+}
+
+// 导出
+const exportEvent = () => {
+  let form = JSON.parse(JSON.stringify(tableStore.table.params))
+  form.pageNum = 1
+  form.pageSize = tableStore.table.total
+  getLoadTypeUserList(form).then(res => {
+    tableRef.value.getRef().exportData({
+      filename: '未建档非线性用户', // 文件名字
+      sheetName: 'Sheet1',
+      type: 'xlsx', //导出文件类型 xlsx 和 csv
+      useStyle: true,
+      data: res.data.records, // 数据源 // 过滤那个字段导出
+      columnFilterMethod: function (column: any) {
+        return !(column.$columnIndex === 0)
+      }
+    })
+  })
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+  // 二次确认
+  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputType: 'textarea',
+    inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+    inputErrorMessage: '取消原因不能为空'
+  })
+  // 发起取消
+  let data = {
+    id: row.id,
+    processInstanceId: row.processInstanceId,
+    reason: value
+  }
+  await cancelFormData(data)
+  ElMessage.success('取消成功')
+  // 加载数据
+  tableStore.index()
+}
+
+onMounted(() => {
+  tableStore.index()
+})
+watch(
+  () => currentRoute.value.path,
+  () => {
+    if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+      tableStore.index()
+      flag.value = false
+    }
+  },
+  {
+    deep: true
+  }
+)
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    state: {
+      id: instanceId,
+      historyInstanceId
+    }
+  })
+}
+
+/**获取用户性质*/
+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 '新建电网工程'
+}
+
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+  if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+  const fullId = newValue.split('@')[0]
+  let nowTime = Date.now()
+  const routeTime = Number(newValue.split('@')[1])
+  if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+  await getUserReportById(fullId).then(res => {
+    if (res && res.code == 'A0000') {
+      addForms.value.open({
+        title: '重新发起',
+        row: res.data
+      })
+    }
+  })
+}, { immediate: true })
+
+</script>
+
+<style scoped lang='scss'></style>
diff --git a/src/views/pqs/supervise_hn/plan/components/effectProblem/index.vue b/src/views/pqs/supervise_hn/plan/components/effectProblem/index.vue
index ec711a87..5d0690ac 100644
--- a/src/views/pqs/supervise_hn/plan/components/effectProblem/index.vue
+++ b/src/views/pqs/supervise_hn/plan/components/effectProblem/index.vue
@@ -1,217 +1,217 @@
-<template>
-    <div class="default-main">
-        <!-- <el-dialog
-        v-model="dialogFormVisible"
-        title="技术监督计划实施问题"
-        width="90%"
-        :append-to-body="true"
-        :before-close="close"
-        :close-on-click-modal="false"
-        draggable
-        custom-class="fixed-dialog"
-        @closed="close"
-    > -->
-        <TableHeader :showSearch="false" 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-Plus" type="primary" @click="addFormModel">新增</el-button>
-                <el-button icon="el-icon-Back" @click="go(-1)">返回</el-button>
-                <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
-            </template>
-        </TableHeader>
-        <Table ref="tableRefs" />
-        <!-- </el-dialog> -->
-        <addForm ref="addFormRef" :planId="planId" @onSubmit="effectTableStore.index()"></addForm>
-    </div>
-</template>
-<script lang="ts" setup>
-import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import addForm from './addForm.vue'
-import { queryByAllCode } from '@/api/system-boot/dictTree'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { uploadFile } from '@/api/system-boot/file'
-import { addPlanFormData, getUserByDeptId } from '@/api/supervision-boot/plan/index'
-import { getAreaList } from '@/api/common'
-import Area from '@/components/form/area/index.vue'
-defineOptions({
-    name: 'PlanEffectProblem'
-})
-const emits = defineEmits([''])
-const props = defineProps({
-    effectProblemForm: {
-        type: Object,
-        default: () => ({})
-    }
-})
-const planId: any = ref('')
-const dictData = useDictData()
-const dialogFormVisible = ref(false)
-const tableRefs = ref()
-//字典获取问题类型
-const problemTypeList = dictData.getBasicData('problem_type')
-//字典整改情况
-const rectificationStatusList = dictData.getBasicData('rectification_type')
-//字典问题等级
-const problemLevelList = dictData.getBasicData('problem_level_type')
-const effectTableStore = new TableStore({
-    url: '/supervision-boot/superProblem/pageProblem',
-    // publicHeight: 65,
-    method: 'POST',
-    column: [
-        { title: '序号', width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        {
-            field: 'problemDesc',
-            title: '问题描述',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        {
-            field: 'problemLevel',
-            title: '问题等级',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return problemLevelList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'problemLevelReason',
-            title: '定级依据',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        {
-            field: 'problemType',
-            title: '问题类型',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return problemTypeList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        { field: 'rectificationMeasure', title: '整改措施', minWidth: 170 },
-        { field: 'rectificationProgramme', title: '整改方案', minWidth: 170 },
-        {
-            field: 'rectificationStatus',
-            title: '整改情况',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return rectificationStatusList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'rectificationTime',
-            title: '整改时间',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue.replace('T', ' ')
-            }
-        },
-        { field: 'remark', title: '备注', minWidth: 170 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        handleDetail(row)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '修改',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return true
-                    },
-                    click: row => {
-                        handleEdit(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        effectTableStore.table.params.orgNo = effectTableStore.table.params.deptIndex
-    }
-})
-const { query } = useRoute() // 查询参数
-const { go } = useRouter() // 路由
-const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
-planId.value = queryId
-watch(
-    () => queryId,
-    (val, oldVal) => {
-        if (val) {
-            effectTableStore.table.params.planId = val
-            effectTableStore.index()
-        }
-    },
-    {
-        deep: true,
-        immediate: true
-    }
-)
-provide('tableStore', effectTableStore)
-const open = () => {
-    dialogFormVisible.value = true
-}
-const close = () => {
-    dialogFormVisible.value = false
-    // emits('onSubmit')
-}
-//新增
-const addFormRef = ref()
-const addFormModel = () => {
-    addFormRef.value.open({}, 'add')
-}
-//详情
-const handleDetail = (row: any) => {
-    addFormRef.value.open(row, 'detail')
-}
-//修改
-const handleEdit = (row: any) => {
-    console.log(row)
-}
-onMounted(() => {})
-defineExpose({ open })
-</script>
+<template>
+    <div class="default-main">
+        <!-- <el-dialog
+        v-model="dialogFormVisible"
+        title="技术监督计划实施问题"
+        width="90%"
+        :append-to-body="true"
+        :before-close="close"
+        :close-on-click-modal="false"
+        draggable
+        custom-class="fixed-dialog"
+        @closed="close"
+    > -->
+        <TableHeader :showSearch="false" 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-Plus" type="primary" @click="addFormModel">新增</el-button>
+                <el-button icon="el-icon-Back" @click="go(-1)">返回</el-button>
+                <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
+            </template>
+        </TableHeader>
+        <Table ref="tableRefs" />
+        <!-- </el-dialog> -->
+        <addForm ref="addFormRef" :planId="planId" @onSubmit="effectTableStore.index()"></addForm>
+    </div>
+</template>
+<script lang="ts" setup>
+import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch, onUnmounted } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import addForm from './addForm.vue'
+import { queryByAllCode } from '@/api/system-boot/dictTree'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { uploadFile } from '@/api/system-boot/file'
+import { addPlanFormData, getUserByDeptId } from '@/api/supervision-boot/plan/index'
+import { getAreaList } from '@/api/common'
+import Area from '@/components/form/area/index.vue'
+defineOptions({
+    name: 'PlanEffectProblem'
+})
+const emits = defineEmits([''])
+const props = defineProps({
+    effectProblemForm: {
+        type: Object,
+        default: () => ({})
+    }
+})
+const planId: any = ref('')
+const dictData = useDictData()
+const dialogFormVisible = ref(false)
+const tableRefs = ref()
+//字典获取问题类型
+const problemTypeList = dictData.getBasicData('problem_type')
+//字典整改情况
+const rectificationStatusList = dictData.getBasicData('rectification_type')
+//字典问题等级
+const problemLevelList = dictData.getBasicData('problem_level_type')
+const effectTableStore = new TableStore({
+    url: '/supervision-boot/superProblem/pageProblem',
+    // publicHeight: 65,
+    method: 'POST',
+    column: [
+        { title: '序号', width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        {
+            field: 'problemDesc',
+            title: '问题描述',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        {
+            field: 'problemLevel',
+            title: '问题等级',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return problemLevelList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'problemLevelReason',
+            title: '定级依据',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        {
+            field: 'problemType',
+            title: '问题类型',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return problemTypeList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        { field: 'rectificationMeasure', title: '整改措施', minWidth: 170 },
+        { field: 'rectificationProgramme', title: '整改方案', minWidth: 170 },
+        {
+            field: 'rectificationStatus',
+            title: '整改情况',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return rectificationStatusList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'rectificationTime',
+            title: '整改时间',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue.replace('T', ' ')
+            }
+        },
+        { field: 'remark', title: '备注', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+        
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        handleDetail(row)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '修改',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return true
+                    },
+                    click: row => {
+                        handleEdit(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        effectTableStore.table.params.orgNo = effectTableStore.table.params.deptIndex
+    }
+})
+const { query } = useRoute() // 查询参数
+const { go } = useRouter() // 路由
+const queryId = query.id as unknown as string // 从 URL 传递过来的 id 编号
+planId.value = queryId
+watch(
+    () => queryId,
+    (val, oldVal) => {
+        if (val) {
+            effectTableStore.table.params.planId = val
+            effectTableStore.index()
+        }
+    },
+    {
+        deep: true,
+        immediate: true
+    }
+)
+provide('tableStore', effectTableStore)
+const open = () => {
+    dialogFormVisible.value = true
+}
+const close = () => {
+    dialogFormVisible.value = false
+    // emits('onSubmit')
+}
+//新增
+const addFormRef = ref()
+const addFormModel = () => {
+    addFormRef.value.open({}, 'add')
+}
+//详情
+const handleDetail = (row: any) => {
+    addFormRef.value.open(row, 'detail')
+}
+//修改
+const handleEdit = (row: any) => {
+    console.log(row)
+}
+onMounted(() => {})
+defineExpose({ open })
+</script>
diff --git a/src/views/pqs/supervise_hn/plan/index.vue b/src/views/pqs/supervise_hn/plan/index.vue
index 347ea60f..1a7e2157 100644
--- a/src/views/pqs/supervise_hn/plan/index.vue
+++ b/src/views/pqs/supervise_hn/plan/index.vue
@@ -1,391 +1,391 @@
-<!---技术监督计划-->
-<template>
-    <div class="default-main">
-        <TableHeader area datePicker ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="流程状态">
-                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                        <el-option
-                            v-for="item in statusSelect"
-                            :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="addFormModel">新增</el-button>
-                <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <!-- 新增弹框 -->
-        <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
-        <!-- 实施问题弹框 -->
-        <effectProblem
-            ref="effectProblemList"
-            @onSubmit="tableStore.index()"
-            :effectProblemForm="effectProblemForm"
-        ></effectProblem>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, nextTick } from 'vue'
-import { mainHeight } from '@/utils/layout'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { getLoadTypeUserList } from '@/api/process-boot/interference'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage } from 'element-plus'
-import { ElMessageBox } from 'element-plus/es'
-const dictData = useDictData()
-const statusSelect = dictData.statusSelect()
-import addForm from './components/addForm.vue'
-import effectProblem from './components/effectProblem/index.vue'
-import { planDetailsAudit, sendAlarm } from '@/api/supervision-boot/plan/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { cancelPlanFormData } from '@/api/supervision-boot/plan/index'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-defineOptions({
-    name: 'plan'
-})
-const flag = ref(false)
-// const layout = mainHeight(120) as any
-
-const { push, options, currentRoute } = useRouter()
-const router = useRouter() // 路由对象
-const TableHeaderRef = ref()
-const tableRef = ref()
-//字典获取监督类型
-const supvTypeList = dictData.getBasicData('supv_type')
-//字典获取监督阶段
-const supvStageList = dictData.getBasicData('supv_stage')
-//字典获取监督对象类型
-const supvObjTypeList = dictData.getBasicData('supv_obj_type')
-const tableStore = new TableStore({
-    url: '/supervision-boot/superPlan/pagePlan',
-    // publicHeight: 65,
-    method: 'POST',
-    column: [
-        { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        {
-            field: 'province',
-            title: '所属省份',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        {
-            field: 'city',
-            title: '所在地市',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        {
-            field: 'county',
-            title: '所属县区',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        {
-            field: 'supvOrgName',
-            title: '监督单位',
-            minWidth: 170
-        },
-        { field: 'workPlanName', title: '计划名称', minWidth: 170 },
-        {
-            field: 'planSupvDate',
-            title: '计划监督时间',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue.replace('T', ' ')
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            field: 'supvType',
-            title: '监督类型',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return supvTypeList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'supvStage',
-            title: '监督阶段',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return supvStageList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'supvObjType',
-            title: '监督对象类型',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return supvObjTypeList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'objType',
-            title: '监督对象属性',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue == '1' ? '在运站' : '新（改、扩）建站'
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 300,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        flag.value = true
-                        handleDetails(row.processInstanceId, row.historyInstanceId)
-                    },
-                    disabled: row => {
-                        return !row.processInstanceId
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '实施问题',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 3
-                    },
-                    click: row => {
-                        handleEffectProblem(row)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '提交审核',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.processInstanceId
-                    },
-                    click: row => {
-                        handleAudit(row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        addForms.value.open({
-                            title: '重新发起',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        // return row.createBy != adminInfo.$state.id || row.status != 1 || !row.processInstanceId
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '发起告警单',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.isUploadHead == 1
-                    },
-                    click: row => {
-                        handleAlarmForm(row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '查看告警单',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.isUploadHead == 0
-                    },
-                    click: row => {
-                        router.push({
-                            name: 'supervision/supervision/manage',
-                            query: {
-                                type: 1
-                            }
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        // tableStore.table.params.relationUserName = tableStore.table.params.userName
-    }
-})
-tableStore.table.params.status = ''
-// tableStore.table.params.loadType = ''
-// tableStore.table.params.userName = ''
-// tableStore.table.params.fileUploadflag = ''
-provide('tableStore', tableStore)
-const addForms = ref()
-const addFormModel = () => {
-    setTimeout(() => {
-        addForms.value.open({
-            title: '技术监督计划'
-        })
-    }, 0)
-}
-const exportEvent = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    getLoadTypeUserList(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '未建档非线性用户', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-onMounted(() => {
-    tableStore.index()
-})
-//
-const handleDetails = (id: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: id,
-            historyInstanceId
-        }
-    })
-}
-/** 提交审核按钮 */
-const handleAudit = (row: any) => {
-    planDetailsAudit({ id: row.planId }).then(res => {
-        ElMessage.success('提交审核成功！')
-        tableStore.index()
-    })
-}
-//发起告警单
-const handleAlarmForm = (row: any) => {
-    sendAlarm({ id: row.planId }).then(res => {
-        ElMessage.success('发起告警单成功！')
-        tableStore.index()
-    })
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.planId,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelPlanFormData(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-// 实施问题按钮
-const effectProblemList = ref()
-const effectProblemForm: any = ref({})
-const handleEffectProblem = (row: any) => {
-    // effectProblemForm.value = row
-    // effectProblemList.value.open()
-    push({
-        name: 'PlanEffectProblem',
-        query: {
-            id: row.planId
-        }
-    })
-}
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-</script>
+<!---技术监督计划-->
+<template>
+    <div class="default-main">
+        <TableHeader area datePicker ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="流程状态">
+                    <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                        <el-option
+                            v-for="item in statusSelect"
+                            :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="addFormModel">新增</el-button>
+                <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <!-- 新增弹框 -->
+        <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
+        <!-- 实施问题弹框 -->
+        <effectProblem
+            ref="effectProblemList"
+            @onSubmit="tableStore.index()"
+            :effectProblemForm="effectProblemForm"
+        ></effectProblem>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick } from 'vue'
+import { mainHeight } from '@/utils/layout'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { getLoadTypeUserList } from '@/api/process-boot/interference'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+const dictData = useDictData()
+const statusSelect = dictData.statusSelect()
+import addForm from './components/addForm.vue'
+import effectProblem from './components/effectProblem/index.vue'
+import { planDetailsAudit, sendAlarm } from '@/api/supervision-boot/plan/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { cancelPlanFormData } from '@/api/supervision-boot/plan/index'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+defineOptions({
+    name: 'plan'
+})
+const flag = ref(false)
+// const layout = mainHeight(120) as any
+
+const { push, options, currentRoute } = useRouter()
+const router = useRouter() // 路由对象
+const TableHeaderRef = ref()
+const tableRef = ref()
+//字典获取监督类型
+const supvTypeList = dictData.getBasicData('supv_type')
+//字典获取监督阶段
+const supvStageList = dictData.getBasicData('supv_stage')
+//字典获取监督对象类型
+const supvObjTypeList = dictData.getBasicData('supv_obj_type')
+const tableStore = new TableStore({
+    url: '/supervision-boot/superPlan/pagePlan',
+    // publicHeight: 65,
+    method: 'POST',
+    column: [
+        { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        {
+            field: 'province',
+            title: '所属省份',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        {
+            field: 'city',
+            title: '所在地市',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        {
+            field: 'county',
+            title: '所属县区',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        {
+            field: 'supvOrgName',
+            title: '监督单位',
+            minWidth: 170
+        },
+        { field: 'workPlanName', title: '计划名称', minWidth: 170 },
+        {
+            field: 'planSupvDate',
+            title: '计划监督时间',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue.replace('T', ' ')
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+            field: 'supvType',
+            title: '监督类型',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return supvTypeList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'supvStage',
+            title: '监督阶段',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return supvStageList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'supvObjType',
+            title: '监督对象类型',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return supvObjTypeList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'objType',
+            title: '监督对象属性',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue == '1' ? '在运站' : '新（改、扩）建站'
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 300,
+         
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        flag.value = true
+                        handleDetails(row.processInstanceId, row.historyInstanceId)
+                    },
+                    disabled: row => {
+                        return !row.processInstanceId
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '实施问题',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 3
+                    },
+                    click: row => {
+                        handleEffectProblem(row)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '提交审核',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.processInstanceId
+                    },
+                    click: row => {
+                        handleAudit(row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        // return row.createBy != adminInfo.$state.id || row.status != 1 || !row.processInstanceId
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '发起告警单',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.isUploadHead == 1
+                    },
+                    click: row => {
+                        handleAlarmForm(row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '查看告警单',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.isUploadHead == 0
+                    },
+                    click: row => {
+                        router.push({
+                            name: 'supervision/supervision/manage',
+                            query: {
+                                type: 1
+                            }
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
+    }
+})
+tableStore.table.params.status = ''
+// tableStore.table.params.loadType = ''
+// tableStore.table.params.userName = ''
+// tableStore.table.params.fileUploadflag = ''
+provide('tableStore', tableStore)
+const addForms = ref()
+const addFormModel = () => {
+    setTimeout(() => {
+        addForms.value.open({
+            title: '技术监督计划'
+        })
+    }, 0)
+}
+const exportEvent = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    getLoadTypeUserList(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '未建档非线性用户', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+onMounted(() => {
+    tableStore.index()
+})
+//
+const handleDetails = (id: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: id,
+            historyInstanceId
+        }
+    })
+}
+/** 提交审核按钮 */
+const handleAudit = (row: any) => {
+    planDetailsAudit({ id: row.planId }).then(res => {
+        ElMessage.success('提交审核成功！')
+        tableStore.index()
+    })
+}
+//发起告警单
+const handleAlarmForm = (row: any) => {
+    sendAlarm({ id: row.planId }).then(res => {
+        ElMessage.success('发起告警单成功！')
+        tableStore.index()
+    })
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.planId,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelPlanFormData(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+// 实施问题按钮
+const effectProblemList = ref()
+const effectProblemForm: any = ref({})
+const handleEffectProblem = (row: any) => {
+    // effectProblemForm.value = row
+    // effectProblemList.value.open()
+    push({
+        name: 'PlanEffectProblem',
+        query: {
+            id: row.planId
+        }
+    })
+}
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+</script>
diff --git a/src/views/pqs/supervise_hn/retire/monitor.vue b/src/views/pqs/supervise_hn/retire/monitor.vue
index 5d03181e..9258a1ed 100644
--- a/src/views/pqs/supervise_hn/retire/monitor.vue
+++ b/src/views/pqs/supervise_hn/retire/monitor.vue
@@ -148,10 +148,10 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             minWidth: '150',
-            fixed: 'right',
+       
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/supervise_hn/retire/terminal.vue b/src/views/pqs/supervise_hn/retire/terminal.vue
index 992100a9..139b7286 100644
--- a/src/views/pqs/supervise_hn/retire/terminal.vue
+++ b/src/views/pqs/supervise_hn/retire/terminal.vue
@@ -144,10 +144,10 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             minWidth: '150',
-            fixed: 'right',
+        
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/supervise_hn/technology/components/alarm.vue b/src/views/pqs/supervise_hn/technology/components/alarm.vue
index 4a37eed4..a8ef7b2a 100644
--- a/src/views/pqs/supervise_hn/technology/components/alarm.vue
+++ b/src/views/pqs/supervise_hn/technology/components/alarm.vue
@@ -1,531 +1,531 @@
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                    <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
-                        :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="是否解决">
-                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
-                    <el-option label="未解决" value="0"></el-option>
-                    <!-- <el-option label="全部" value="1"></el-option> -->
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-        </template>
-    </TableHeader>
-    <!--表格-->
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-    <!--弹框-->
-    <feedback-popup ref="feedbackPopup" />
-
-    <!-- 详情 -->
-    <el-dialog draggable v-model="dialogVisible" v-if="dialogVisible" title="详情" width="1000">
-        <detail :id="detailId" />
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, nextTick, watch } 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 FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
-import { useRouter } from 'vue-router'
-import { cancelFeedback, getById } from '@/api/supervision-boot/leaflet'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { useDictData } from '@/stores/dictData'
-import { getFileNameAndFilePath } from '@/api/system-boot/file'
-import { deleteWarningLeaflet } from '@/api/supervision-boot/delete/index'
-import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
-const dictData = useDictData()
-
-const statusSelect = [
-    { name: '待提交审批', id: 0 },
-    { name: '审批中', id: 1 },
-    { name: '审批通过', id: 2 },
-    { name: '审批不通过', id: 3 },
-    { name: '已取消', id: 4 },
-    { name: '新增', id: 5 }
-]
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const { push } = useRouter()
-
-const feedbackPopup = ref()
-const tableRef = ref()
-const dialogVisible = ref(false)
-const detailId = ref('')
-const TableHeaderRef = ref()
-const tableStore = new TableStore({
-    url: '/supervision-boot/warningLeaflet/alarmPageData',
-    publicHeight: 65,
-    method: 'POST',
-    filename:'预警单列表',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            title: '序号',
-
-            align: 'center',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        {
-            field: 'problemType',
-            title: '告警单问题来源',
-            minWidth: '150',
-            render: 'tag',
-            custom: {
-                1: 'warning',
-                2: 'warning',
-                3: 'warning',
-                4: 'warning'
-            },
-            replaceValue: {
-                1: '技术监督计划',
-                2: '在线监测超标问题',
-                3: '用户投诉问题',
-                4: '试运行监测点问题'
-            }
-        },
-        { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
-        { field: 'leafletName', title: '单据名称', minWidth: '150' },
-        { field: 'issueDetail', title: '告警内容', minWidth: '150' },
-        { field: 'reformAdvice', title: '整改意见', minWidth: '150' },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: '150',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning',
-                5: 'primary'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消',
-                5: '新增'
-            }
-        },
-
-        { field: 'createTime', title: '创建时间', minWidth: '150' },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'dealState',
-            title: '是否解决',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                null: 'info'
-            },
-            replaceValue: {
-                0: '未解决',
-                1: '已解决',
-                null: '/'
-            }
-        },
-        // {
-        //     title: '报告',
-        //     minWidth: '150',
-        //     align: 'center',
-        //     render: 'buttons',
-        //     fixed: 'right',
-        //     buttons: [
-        //         {
-        //             name: 'productSetting',
-        //             title: '查看报告',
-        //             type: 'primary',
-        //             icon: 'el-icon-EditPen',
-        //             render: 'basicButton',
-        //             disabled: row => {
-        //                 return !(row.problemType == 2 || row.problemType == 4)
-        //             },
-        //             click: row => {
-        //                 if (row.problemType == 2) {
-        //                     const match = row.filePath.match(/excelreport(\/[^?#]*)/)
-
-        //                     window.open(window.location.origin + '/#/previewFile?' + match[1])
-        //                 } else {
-        //                     if (row.problemPath == null) {
-        //                         ElMessage({
-        //                             message: '暂无报告!',
-        //                             type: 'warning'
-        //                         })
-        //                     } else {
-        //                         getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
-        //                             // window.open(res.data.url)
-        //                         })
-        //                     }
-        //                 }
-        //             }
-        //         },
-        //         {
-        //             name: 'productSetting',
-        //             title: '报告下载',
-        //             type: 'primary',
-        //             icon: 'el-icon-EditPen',
-        //             render: 'basicButton',
-        //             disabled: row => {
-        //                 return !(row.problemType == 2 || row.problemType == 4)
-        //             },
-        //             click: row => {
-        //                 if (row.problemType == 2) {
-        //                     window.open(row.filePath)
-        //                 } else {
-        //                     if (row.problemPath == null) {
-        //                         ElMessage({
-        //                             message: '暂无报告!',
-        //                             type: 'warning'
-        //                         })
-        //                     } else {
-        //                         getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
-        //                             window.open(res.data.url)
-        //                         })
-        //                     }
-        //                 }
-        //             }
-        //         }
-        //     ]
-        // },
-
-        {
-            title: '操作',
-            minWidth: '220',
-            align: 'center',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '查看报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !(row.problemType == 2 || row.problemType == 4)
-                    },
-                    click: row => {
-                        if (row.problemType == 2) {
-                            const match = row.filePath.match(/excelreport(\/[^?#]*)/)
-
-                            window.open(window.location.origin + '/#/previewFile?' + match[1])
-                        } else {
-                            if (row.problemPath == null) {
-                                ElMessage({
-                                    message: '暂无报告!',
-                                    type: 'warning'
-                                })
-                            } else {
-                                window.open(window.location.origin + '/#/previewFile?/' + row.problemPath)
-                                // getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
-                                //     // window.open(res.data.url)
-                                // })
-                            }
-                        }
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '报告下载',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !(row.problemType == 2 || row.problemType == 4)
-                    },
-                    click: row => {
-                        if (row.problemType == 2) {
-                            window.open(row.filePath)
-                        } else {
-                            if (row.problemPath == null) {
-                                ElMessage({
-                                    message: '暂无报告!',
-                                    type: 'warning'
-                                })
-                            } else {
-                                getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
-                                    window.open(res.data.url)
-                                })
-                            }
-                        }
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '查看信息',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.problemId || row.problemType != 1
-                    },
-                    click: async row => {
-                        dialogVisible.value = true
-                        detailId.value = row.problemId
-                    }
-                },
-                // {
-                //     name: 'productSetting',
-                //     title: '发送督办单',
-                //     type: 'primary',
-                //     icon: 'el-icon-EditPen',
-                //     render: 'basicButton',
-                //     click: row => {
-                //         // handleAudit(row.processInstanceId)
-                //         ElMessage.warning('待打通生成管理系统接口！')
-                //     }
-                // },
-                {
-                    name: 'productSetting',
-                    title: '问题反馈',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.dutyOrgId != adminInfo.$state.deptId || row.status !== 5
-                    },
-                    click: row => {
-                        feedbackPopup.value.open(
-                            '填报告警反馈单',
-                            row.id,
-                            row.status,
-                            row.issueDetail,
-                            row.problemPath,
-                            row.supervisionReport,
-                            row.reformAdvice
-                        )
-                    }
-                },
-
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
-                    click: row => {
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.dutyOrgId != adminInfo.$state.deptId || !(row.status == 0)
-                    },
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-                    click: row => {
-                        feedbackPopup.value.open(
-                            '编辑告警反馈单',
-                            row.id,
-                            row.status,
-                            row.issueDetail,
-                            row.problemPath,
-                            row.supervisionReport,
-
-                            row.reformAdvice,
-                            row.takeStep,
-                            row.reportPath
-                        )
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        // deviceQuitPopup.value.open('重新发起', row)
-                        feedbackPopup.value.open(
-                            '重新填报告警反馈单',
-                            row.id,
-                            row.status,
-                            row.issueDetail,
-                            row.problemPath,
-                            row.supervisionReport,
-                            row.reformAdvice,
-                            row.takeStep,
-                            row.reportPath,
-                            row.reformAdvice
-                        )
-                    }
-                },
-
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.currentPage = tableStore.table.params.pageNum
-    }
-})
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        })
-            .then(() => {
-                deleteWarningLeaflet(tableStore.table.selection.map(item => item.id)).then(res => {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除成功!'
-                    })
-                    tableStore.index()
-                })
-
-            })
-
-
-    }
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelFeedback(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-tableStore.table.params.status = ''
-tableStore.table.params.dealState = ''
-
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    tableStore.index()
-})
-
-/** 流程实例详情 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-
-const props = defineProps(['id', 'businessKey'])
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    let fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-
-
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT || fullId == 'null') return // 路由时间超过500ms，则不执行
-    await getById(fullId).then(res => {
-        if (res && res.code == 'A0000') {
-            if (res && res.code == 'A0000') {
-                if (props.businessKey == '3') {
-                    feedbackPopup.value.open(
-                        '填报告警反馈单',
-                        res.data.id,
-                        res.data.status,
-                        res.data.issueDetail,
-                        res.data.problemPath,
-                        res.data.supervisionReport,
-                        res.data.reformAdvice
-                    )
-                } else {
-                    feedbackPopup.value.open(
-                        '重新填报告警反馈单',
-                        res.data.id,
-                        res.data.status,
-                        res.data.issueDetail,
-                        res.data.problemPath,
-                        res.data.supervisionReport,
-                        res.data.reformAdvice,
-                        res.data.takeStep,
-                        res.data.reportPath,
-                        res.data.reformAdvice
-                    )
-                }
-            }
-
-        }
-    })
-}, { immediate: true })
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
+                        :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="是否解决">
+                <el-select v-model="tableStore.table.params.dealState" clearable placeholder="请选择是否解决">
+                    <el-option label="未解决" value="0"></el-option>
+                    <!-- <el-option label="全部" value="1"></el-option> -->
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+        </template>
+    </TableHeader>
+    <!--表格-->
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+    <!--弹框-->
+    <feedback-popup ref="feedbackPopup" />
+
+    <!-- 详情 -->
+    <el-dialog draggable v-model="dialogVisible" v-if="dialogVisible" title="详情" width="1000">
+        <detail :id="detailId" />
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick, watch } 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 FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
+import { useRouter } from 'vue-router'
+import { cancelFeedback, getById } from '@/api/supervision-boot/leaflet'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+import { deleteWarningLeaflet } from '@/api/supervision-boot/delete/index'
+import detail from '@/views/pqs/supervise/harmonicSurvey/test/detail.vue'
+const dictData = useDictData()
+
+const statusSelect = [
+    { name: '待提交审批', id: 0 },
+    { name: '审批中', id: 1 },
+    { name: '审批通过', id: 2 },
+    { name: '审批不通过', id: 3 },
+    { name: '已取消', id: 4 },
+    { name: '新增', id: 5 }
+]
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const { push } = useRouter()
+
+const feedbackPopup = ref()
+const tableRef = ref()
+const dialogVisible = ref(false)
+const detailId = ref('')
+const TableHeaderRef = ref()
+const tableStore = new TableStore({
+    url: '/supervision-boot/warningLeaflet/alarmPageData',
+    publicHeight: 65,
+    method: 'POST',
+    filename:'预警单列表',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            title: '序号',
+
+            align: 'center',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        {
+            field: 'problemType',
+            title: '告警单问题来源',
+            minWidth: '150',
+            render: 'tag',
+            custom: {
+                1: 'warning',
+                2: 'warning',
+                3: 'warning',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '技术监督计划',
+                2: '在线监测超标问题',
+                3: '用户投诉问题',
+                4: '试运行监测点问题'
+            }
+        },
+        { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
+        { field: 'leafletName', title: '单据名称', minWidth: '150' },
+        { field: 'issueDetail', title: '告警内容', minWidth: '150' },
+        { field: 'reformAdvice', title: '整改意见', minWidth: '150' },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: '150',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning',
+                5: 'primary'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消',
+                5: '新增'
+            }
+        },
+
+        { field: 'createTime', title: '创建时间', minWidth: '150' },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'dealState',
+            title: '是否解决',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                null: 'info'
+            },
+            replaceValue: {
+                0: '未解决',
+                1: '已解决',
+                null: '/'
+            }
+        },
+        // {
+        //     title: '报告',
+        //     minWidth: '150',
+        //     align: 'center',
+        //     render: 'buttons',
+        //     fixed: 'right',
+        //     buttons: [
+        //         {
+        //             name: 'productSetting',
+        //             title: '查看报告',
+        //             type: 'primary',
+        //             icon: 'el-icon-EditPen',
+        //             render: 'basicButton',
+        //             disabled: row => {
+        //                 return !(row.problemType == 2 || row.problemType == 4)
+        //             },
+        //             click: row => {
+        //                 if (row.problemType == 2) {
+        //                     const match = row.filePath.match(/excelreport(\/[^?#]*)/)
+
+        //                     window.open(window.location.origin + '/#/previewFile?' + match[1])
+        //                 } else {
+        //                     if (row.problemPath == null) {
+        //                         ElMessage({
+        //                             message: '暂无报告!',
+        //                             type: 'warning'
+        //                         })
+        //                     } else {
+        //                         getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
+        //                             // window.open(res.data.url)
+        //                         })
+        //                     }
+        //                 }
+        //             }
+        //         },
+        //         {
+        //             name: 'productSetting',
+        //             title: '报告下载',
+        //             type: 'primary',
+        //             icon: 'el-icon-EditPen',
+        //             render: 'basicButton',
+        //             disabled: row => {
+        //                 return !(row.problemType == 2 || row.problemType == 4)
+        //             },
+        //             click: row => {
+        //                 if (row.problemType == 2) {
+        //                     window.open(row.filePath)
+        //                 } else {
+        //                     if (row.problemPath == null) {
+        //                         ElMessage({
+        //                             message: '暂无报告!',
+        //                             type: 'warning'
+        //                         })
+        //                     } else {
+        //                         getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
+        //                             window.open(res.data.url)
+        //                         })
+        //                     }
+        //                 }
+        //             }
+        //         }
+        //     ]
+        // },
+
+        {
+             title: '操作',fixed: 'right',
+            minWidth: '220',
+            align: 'center',
+            render: 'buttons',
+          
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '查看报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !(row.problemType == 2 || row.problemType == 4)
+                    },
+                    click: row => {
+                        if (row.problemType == 2) {
+                            const match = row.filePath.match(/excelreport(\/[^?#]*)/)
+
+                            window.open(window.location.origin + '/#/previewFile?' + match[1])
+                        } else {
+                            if (row.problemPath == null) {
+                                ElMessage({
+                                    message: '暂无报告!',
+                                    type: 'warning'
+                                })
+                            } else {
+                                window.open(window.location.origin + '/#/previewFile?/' + row.problemPath)
+                                // getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
+                                //     // window.open(res.data.url)
+                                // })
+                            }
+                        }
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '报告下载',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !(row.problemType == 2 || row.problemType == 4)
+                    },
+                    click: row => {
+                        if (row.problemType == 2) {
+                            window.open(row.filePath)
+                        } else {
+                            if (row.problemPath == null) {
+                                ElMessage({
+                                    message: '暂无报告!',
+                                    type: 'warning'
+                                })
+                            } else {
+                                getFileNameAndFilePath({ filePath: '/' + row.problemPath }).then(res => {
+                                    window.open(res.data.url)
+                                })
+                            }
+                        }
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '查看信息',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.problemId || row.problemType != 1
+                    },
+                    click: async row => {
+                        dialogVisible.value = true
+                        detailId.value = row.problemId
+                    }
+                },
+                // {
+                //     name: 'productSetting',
+                //     title: '发送督办单',
+                //     type: 'primary',
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+                //     click: row => {
+                //         // handleAudit(row.processInstanceId)
+                //         ElMessage.warning('待打通生成管理系统接口！')
+                //     }
+                // },
+                {
+                    name: 'productSetting',
+                    title: '问题反馈',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.dutyOrgId != adminInfo.$state.deptId || row.status !== 5
+                    },
+                    click: row => {
+                        feedbackPopup.value.open(
+                            '填报告警反馈单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+                            row.reformAdvice
+                        )
+                    }
+                },
+
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.dutyOrgId != adminInfo.$state.deptId || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+                    click: row => {
+                        feedbackPopup.value.open(
+                            '编辑告警反馈单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+
+                            row.reformAdvice,
+                            row.takeStep,
+                            row.reportPath
+                        )
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        // deviceQuitPopup.value.open('重新发起', row)
+                        feedbackPopup.value.open(
+                            '重新填报告警反馈单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+                            row.reformAdvice,
+                            row.takeStep,
+                            row.reportPath,
+                            row.reformAdvice
+                        )
+                    }
+                },
+
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    }
+})
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+                deleteWarningLeaflet(tableStore.table.selection.map(item => item.id)).then(res => {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除成功!'
+                    })
+                    tableStore.index()
+                })
+
+            })
+
+
+    }
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelFeedback(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+tableStore.table.params.status = ''
+tableStore.table.params.dealState = ''
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+
+/** 流程实例详情 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+const props = defineProps(['id', 'businessKey'])
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    let fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+
+
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT || fullId == 'null') return // 路由时间超过500ms，则不执行
+    await getById(fullId).then(res => {
+        if (res && res.code == 'A0000') {
+            if (res && res.code == 'A0000') {
+                if (props.businessKey == '3') {
+                    feedbackPopup.value.open(
+                        '填报告警反馈单',
+                        res.data.id,
+                        res.data.status,
+                        res.data.issueDetail,
+                        res.data.problemPath,
+                        res.data.supervisionReport,
+                        res.data.reformAdvice
+                    )
+                } else {
+                    feedbackPopup.value.open(
+                        '重新填报告警反馈单',
+                        res.data.id,
+                        res.data.status,
+                        res.data.issueDetail,
+                        res.data.problemPath,
+                        res.data.supervisionReport,
+                        res.data.reformAdvice,
+                        res.data.takeStep,
+                        res.data.reportPath,
+                        res.data.reformAdvice
+                    )
+                }
+            }
+
+        }
+    })
+}, { immediate: true })
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise_hn/technology/components/earlyWarn.vue b/src/views/pqs/supervise_hn/technology/components/earlyWarn.vue
index ee79423d..86832017 100644
--- a/src/views/pqs/supervise_hn/technology/components/earlyWarn.vue
+++ b/src/views/pqs/supervise_hn/technology/components/earlyWarn.vue
@@ -112,11 +112,11 @@ const tableStore = new TableStore({
         //     ]
         // },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: '220',
             align: 'center',
             render: 'buttons',
-            fixed: 'right',
+      
             buttons: [
                 {
                     name: 'productSetting',
diff --git a/src/views/pqs/supervise_hn/technology/components/overview.vue b/src/views/pqs/supervise_hn/technology/components/overview.vue
index 72dcd6c0..600883fb 100644
--- a/src/views/pqs/supervise_hn/technology/components/overview.vue
+++ b/src/views/pqs/supervise_hn/technology/components/overview.vue
@@ -1,214 +1,214 @@
-<template>
-    <div>
-        <div>
-            <TableHeader datePicker ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="筛选数据">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            clearable
-                            placeholder="请选择筛选数据"
-                        ></el-input>
-                    </el-form-item>
-                </template>
-            </TableHeader>
-            <div class="box">
-                <MyEChart style="flex: 1.2" :options="options1" />
-                <MyEChart style="flex: 2" :options="options2" />
-            </div>
-            <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 MyEChart from '@/components/echarts/MyEchart.vue'
-import { info } from 'console'
-
-const dictData = useDictData()
-
-const dialogVisible = ref(false)
-const TableHeaderRef = ref()
-const title = ref('')
-const options1 = ref({})
-const options2 = ref({})
-
-const ruleFormRef = ref()
-const tableStore = new TableStore({
-    url: '/system-boot/area/areaSelect',
-    publicHeight: 345,
-    method: 'POST',
-    column: [
-        { field: 'name', title: '事务名称' },
-        { field: 'type', title: '事务类型' },
-        { field: 'createUser', title: '创建人员' },
-        { field: 'companyName', title: '创建部门' },
-        { field: 'modifyUser', title: '处理人员' },
-        { field: 'modifyTime', title: '处理时间' },
-        { field: 'progressTime', title: '进行时间(天)' },
-        { field: 'progress', title: '流程状态' },
-        { field: 'alertType', 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 => {}
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        tableStore.table.data = []
-    }
-})
-
-tableStore.table.params.searchState = ''
-tableStore.table.params.searchValue = ''
-tableStore.table.params.type = ''
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-    info()
-})
-//渲染图表
-const info = () => {
-    options1.value = {
-        title: {
-            text: '商务类型',
-            x: 'center',
-            textStyle: {
-                fontWeight: 'normal'
-            }
-        },
-        xAxis: [
-            {
-                data: ['全部', '预警单', '告警单']
-            }
-        ],
-        yAxis: [{}],
-        series: [
-            {
-                name: '数量',
-                type: 'bar',
-                barMaxWidth: 30, //最大宽度
-                data: [
-                    {
-                        value: 9,
-                        id: ''
-                    },
-                    {
-                        value: 4,
-                        id: '0'
-                    },
-                    {
-                        value: 5,
-                        id: '1'
-                    }
-                ]
-            }
-        ]
-    }
-    options2.value = {
-        title: {
-            text: '事务流程',
-            x: 'center',
-            textStyle: {
-                fontWeight: 'normal'
-            }
-        },
-        xAxis: [
-            {
-                data: [
-                    '全部',
-                    '开始',
-                    '预/告警单下发',
-                    '预/告警单反馈',
-                    '现场测试',
-                    '整改通知单下发',
-                    '整改通知单反馈',
-                    '完结'
-                ]
-            }
-        ],
-        yAxis: [{}],
-        series: [
-            {
-                name: '数量',
-                type: 'bar',
-                barMaxWidth: 30, //最大宽度
-                data: [
-                    {
-                        value: 9,
-                        id: ''
-                    },
-                    {
-                        value: 4,
-                        id: '0'
-                    },
-                    {
-                        value: 5,
-                        id: '1'
-                    },
-                    {
-                        value: 5,
-                        id: '2'
-                    },
-                    {
-                        value: 5,
-                        id: '3'
-                    },
-                    {
-                        value: 5,
-                        id: '4'
-                    },
-                    {
-                        value: 5,
-                        id: '5'
-                    },
-                    {
-                        value: 5,
-                        id: '6'
-                    }
-                ]
-            }
-        ]
-    }
-}
-// 新增
-const add = () => {
-    title.value = '新增告警单'
-    dialogVisible.value = true
-}
-</script>
-<style lang="scss" scoped>
-.box {
-    height: 280px;
-    display: flex;
-    justify-content: space-between;
-}
-</style>
+<template>
+    <div>
+        <div>
+            <TableHeader datePicker ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="筛选数据">
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            clearable
+                            placeholder="请选择筛选数据"
+                        ></el-input>
+                    </el-form-item>
+                </template>
+            </TableHeader>
+            <div class="box">
+                <MyEChart style="flex: 1.2" :options="options1" />
+                <MyEChart style="flex: 2" :options="options2" />
+            </div>
+            <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 MyEChart from '@/components/echarts/MyEchart.vue'
+import { info } from 'console'
+
+const dictData = useDictData()
+
+const dialogVisible = ref(false)
+const TableHeaderRef = ref()
+const title = ref('')
+const options1 = ref({})
+const options2 = ref({})
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/area/areaSelect',
+    publicHeight: 345,
+    method: 'POST',
+    column: [
+        { field: 'name', title: '事务名称' },
+        { field: 'type', title: '事务类型' },
+        { field: 'createUser', title: '创建人员' },
+        { field: 'companyName', title: '创建部门' },
+        { field: 'modifyUser', title: '处理人员' },
+        { field: 'modifyTime', title: '处理时间' },
+        { field: 'progressTime', title: '进行时间(天)' },
+        { field: 'progress', title: '流程状态' },
+        { field: 'alertType', title: '预警类型' },
+
+        {
+             title: '操作',fixed: 'right',
+            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 => {}
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data = []
+    }
+})
+
+tableStore.table.params.searchState = ''
+tableStore.table.params.searchValue = ''
+tableStore.table.params.type = ''
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+    info()
+})
+//渲染图表
+const info = () => {
+    options1.value = {
+        title: {
+            text: '商务类型',
+            x: 'center',
+            textStyle: {
+                fontWeight: 'normal'
+            }
+        },
+        xAxis: [
+            {
+                data: ['全部', '预警单', '告警单']
+            }
+        ],
+        yAxis: [{}],
+        series: [
+            {
+                name: '数量',
+                type: 'bar',
+                barMaxWidth: 30, //最大宽度
+                data: [
+                    {
+                        value: 9,
+                        id: ''
+                    },
+                    {
+                        value: 4,
+                        id: '0'
+                    },
+                    {
+                        value: 5,
+                        id: '1'
+                    }
+                ]
+            }
+        ]
+    }
+    options2.value = {
+        title: {
+            text: '事务流程',
+            x: 'center',
+            textStyle: {
+                fontWeight: 'normal'
+            }
+        },
+        xAxis: [
+            {
+                data: [
+                    '全部',
+                    '开始',
+                    '预/告警单下发',
+                    '预/告警单反馈',
+                    '现场测试',
+                    '整改通知单下发',
+                    '整改通知单反馈',
+                    '完结'
+                ]
+            }
+        ],
+        yAxis: [{}],
+        series: [
+            {
+                name: '数量',
+                type: 'bar',
+                barMaxWidth: 30, //最大宽度
+                data: [
+                    {
+                        value: 9,
+                        id: ''
+                    },
+                    {
+                        value: 4,
+                        id: '0'
+                    },
+                    {
+                        value: 5,
+                        id: '1'
+                    },
+                    {
+                        value: 5,
+                        id: '2'
+                    },
+                    {
+                        value: 5,
+                        id: '3'
+                    },
+                    {
+                        value: 5,
+                        id: '4'
+                    },
+                    {
+                        value: 5,
+                        id: '5'
+                    },
+                    {
+                        value: 5,
+                        id: '6'
+                    }
+                ]
+            }
+        ]
+    }
+}
+// 新增
+const add = () => {
+    title.value = '新增告警单'
+    dialogVisible.value = true
+}
+</script>
+<style lang="scss" scoped>
+.box {
+    height: 280px;
+    display: flex;
+    justify-content: space-between;
+}
+</style>
diff --git a/src/views/pqs/supervise_hn/technology/components/technology.vue b/src/views/pqs/supervise_hn/technology/components/technology.vue
index 5f43352f..3a7e0651 100644
--- a/src/views/pqs/supervise_hn/technology/components/technology.vue
+++ b/src/views/pqs/supervise_hn/technology/components/technology.vue
@@ -122,7 +122,7 @@ const tableStore = new TableStore({
         },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/supervise_hn/terminal/components/cycleTab.vue b/src/views/pqs/supervise_hn/terminal/components/cycleTab.vue
index f8c9ba59..5d07f6ca 100644
--- a/src/views/pqs/supervise_hn/terminal/components/cycleTab.vue
+++ b/src/views/pqs/supervise_hn/terminal/components/cycleTab.vue
@@ -1,302 +1,302 @@
-<template>
-    <div>
-        <div>
-            <TableHeader area ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="终端名称">
-                        <el-input
-                            v-model="tableStore.table.params.name"
-                            clearable
-                            placeholder="请输入终端名称"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="生产厂家">
-                        <el-select
-                            v-model="tableStore.table.params.manufacture"
-                            placeholder="请选择生产厂家"
-                            multiple
-                            collapse-tags
-                            clearable
-                            class="select"
-                        >
-                            <el-option
-                                v-for="item in manufactorList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-
-                    <el-form-item label="检测结果">
-                        <el-select
-                            v-model="tableStore.table.params.testResults"
-                            placeholder="请选择检测结果"
-                            clearable
-                            class="select"
-                        >
-                            <el-option
-                                v-for="item in testResultsList"
-                                :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-upload
-                        ref="uploadRef"
-                        action=""
-                        accept=".xls"
-                        :on-change="choose"
-                        :show-file-list="false"
-                        :auto-upload="false"
-                    >
-                        <template #trigger>
-                            <el-button
-                                icon="el-icon-Upload"
-                                type="primary"
-                                style="margin-left: 12px; margin-right: 12px"
-                            >
-                                excel导入
-                            </el-button>
-                        </template>
-                    </el-upload>
-                    <el-button icon="el-icon-Upload" type="primary" @click="UploadOriginal">上传检测报告</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-            <!-- 上传检测报告 -->
-            <el-dialog
-                draggable
-                title="上传检测报告__支持批量上传"
-                v-model="showBatchUpload"
-                width="30%"
-                :before-close="handleClose"
-            >
-                <el-upload
-                    multiple
-                    action=""
-                    :auto-upload="false"
-                    :limit="999"
-                    accept=".doc,.docx"
-                    :file-list="fileList"
-                    :on-remove="handleRemove"
-                    :on-change="chooseBatch"
-                    ref="upload"
-                >
-                    <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
-                    <span :style="`color:#f58003`">
-                        　　(*传入的检测报告文件格式(终端编号-检测报告(yyyy-MM-dd).docx))
-                    </span>
-                </el-upload>
-                <template #footer>
-                    <el-button @click="handleClose">取 消</el-button>
-                    <el-button type="primary" @click="BatchUpload">上 传</el-button>
-                </template>
-            </el-dialog>
-        </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 { DownloadExport, reportDownload, batchTerminal, importReport } from '@/api/process-boot/terminal'
-import { useDictData } from '@/stores/dictData'
-
-const dictData = useDictData()
-const manufactorList = dictData.getBasicData('Dev_Manufacturers')
-const testResultsList = [
-    {
-        id: 0,
-        name: '未展开'
-    },
-    {
-        id: 1,
-        name: '已展开'
-    }
-]
-
-const TableHeaderRef = ref()
-const showBatchUpload = ref(false)
-const fileList: any = ref([])
-const tableStore = new TableStore({
-    url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
-    publicHeight: 85,
-    method: 'POST',
-    column: [
-        { field: 'id', title: '终端编号' },
-        {
-            field: 'manufacture',
-            title: '生产厂家',
-            formatter(row: any) {
-                return manufactorList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        { field: 'installPlace', title: '安装位置' },
-        { field: 'inspectionUnit', title: '送检单位' },
-        {
-            field: 'testResults',
-            title: '检测结果',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success'
-            },
-            replaceValue: {
-                0: '未展开',
-                1: '已展开'
-            }
-            // formatter(row: any) {
-            //     return row.cellValue == 0 ? '未展开' : '已展开'
-            // }
-        },
-        { field: 'nextInspectionTime', title: '下次检测时间' },
-        {
-            title: '操作',
-            width: '250',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '下载原始数据报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.originalReport == null
-                    },
-                    click: row => {
-                        download(row, 0)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '下载检测报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.inspectionReport == null
-                    },
-                    click: row => {
-                        download(row, 1)
-                    }
-                }
-            ]
-        }
-    ]
-})
-
-tableStore.table.params.name = ''
-tableStore.table.params.id = dictData.state.area[0].id
-tableStore.table.params.testResults = ''
-tableStore.table.params.manufacture = []
-tableStore.table.params.type = 1
-
-provide('tableStore', tableStore)
-
-// 关闭弹窗查询
-const onsubmit = () => {}
-// 下载模版
-const Export = () => {
-    DownloadExport().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        link.download = '终端入网检测录入模板' // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-    })
-}
-// 下载报告
-const download = (row: any, type: number) => {
-    reportDownload({
-        id: row.id,
-        type: type
-    }).then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
-        })
-
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        link.download = type == 1 ? row.inspectionName : row.originalName // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-    })
-}
-// excel导入
-const choose = (e: any) => {
-    batchTerminal(e.raw).then((res: any) => {
-        if (res.type == 'application/json') {
-            ElMessage.success('上传成功,无错误数据!')
-            tableStore.index()
-        } else {
-            ElMessage.warning('上传成功,有错误数据  自动下载 请查看')
-            let blob = new Blob([res], {
-                type: 'application/vnd.ms-excel'
-            })
-            const url = window.URL.createObjectURL(blob)
-            const link = document.createElement('a') // 创建a标签
-            link.href = url
-            link.download = '模板错误信息' // 设置下载的文件名
-            document.body.appendChild(link)
-            link.click() //执行下载
-            document.body.removeChild(link)
-        }
-    })
-}
-// 上传原始报告
-const UploadOriginal = () => {
-    showBatchUpload.value = true
-}
-// 上传
-const BatchUpload = () => {
-    let form = new FormData()
-    form.append('type', '1')
-    fileList.value.forEach((item: any) => {
-        form.append('files', item.raw)
-    })
-    importReport(form)
-        .then((res: any) => {
-            if (res.type == 'application/json') {
-                ElMessage.success('上传成功!')
-                handleClose()
-                tableStore.index()
-            } else {
-                ElMessage.error('上传失败!')
-            }
-        })
-        .catch(response => {
-            // console.log(response);
-        })
-    // fileList.value
-}
-const chooseBatch = (e: any) => {
-    fileList.value.push(e)
-}
-const handleRemove = (e: any) => {
-    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
-}
-const handleClose = () => {
-    fileList.value = []
-    showBatchUpload.value = false
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div>
+        <div>
+            <TableHeader area ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="终端名称">
+                        <el-input
+                            v-model="tableStore.table.params.name"
+                            clearable
+                            placeholder="请输入终端名称"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="生产厂家">
+                        <el-select
+                            v-model="tableStore.table.params.manufacture"
+                            placeholder="请选择生产厂家"
+                            multiple
+                            collapse-tags
+                            clearable
+                            class="select"
+                        >
+                            <el-option
+                                v-for="item in manufactorList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="检测结果">
+                        <el-select
+                            v-model="tableStore.table.params.testResults"
+                            placeholder="请选择检测结果"
+                            clearable
+                            class="select"
+                        >
+                            <el-option
+                                v-for="item in testResultsList"
+                                :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-upload
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls"
+                        :on-change="choose"
+                        :show-file-list="false"
+                        :auto-upload="false"
+                    >
+                        <template #trigger>
+                            <el-button
+                                icon="el-icon-Upload"
+                                type="primary"
+                                style="margin-left: 12px; margin-right: 12px"
+                            >
+                                excel导入
+                            </el-button>
+                        </template>
+                    </el-upload>
+                    <el-button icon="el-icon-Upload" type="primary" @click="UploadOriginal">上传检测报告</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+            <!-- 上传检测报告 -->
+            <el-dialog
+                draggable
+                title="上传检测报告__支持批量上传"
+                v-model="showBatchUpload"
+                width="30%"
+                :before-close="handleClose"
+            >
+                <el-upload
+                    multiple
+                    action=""
+                    :auto-upload="false"
+                    :limit="999"
+                    accept=".doc,.docx"
+                    :file-list="fileList"
+                    :on-remove="handleRemove"
+                    :on-change="chooseBatch"
+                    ref="upload"
+                >
+                    <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
+                    <span :style="`color:#f58003`">
+                        　　(*传入的检测报告文件格式(终端编号-检测报告(yyyy-MM-dd).docx))
+                    </span>
+                </el-upload>
+                <template #footer>
+                    <el-button @click="handleClose">取 消</el-button>
+                    <el-button type="primary" @click="BatchUpload">上 传</el-button>
+                </template>
+            </el-dialog>
+        </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 { DownloadExport, reportDownload, batchTerminal, importReport } from '@/api/process-boot/terminal'
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+const manufactorList = dictData.getBasicData('Dev_Manufacturers')
+const testResultsList = [
+    {
+        id: 0,
+        name: '未展开'
+    },
+    {
+        id: 1,
+        name: '已展开'
+    }
+]
+
+const TableHeaderRef = ref()
+const showBatchUpload = ref(false)
+const fileList: any = ref([])
+const tableStore = new TableStore({
+    url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
+    publicHeight: 85,
+    method: 'POST',
+    column: [
+        { field: 'id', title: '终端编号' },
+        {
+            field: 'manufacture',
+            title: '生产厂家',
+            formatter(row: any) {
+                return manufactorList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        { field: 'installPlace', title: '安装位置' },
+        { field: 'inspectionUnit', title: '送检单位' },
+        {
+            field: 'testResults',
+            title: '检测结果',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '未展开',
+                1: '已展开'
+            }
+            // formatter(row: any) {
+            //     return row.cellValue == 0 ? '未展开' : '已展开'
+            // }
+        },
+        { field: 'nextInspectionTime', title: '下次检测时间' },
+        {
+             title: '操作',fixed: 'right',
+            width: '250',
+            render: 'buttons',
+        
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '下载原始数据报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.originalReport == null
+                    },
+                    click: row => {
+                        download(row, 0)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '下载检测报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.inspectionReport == null
+                    },
+                    click: row => {
+                        download(row, 1)
+                    }
+                }
+            ]
+        }
+    ]
+})
+
+tableStore.table.params.name = ''
+tableStore.table.params.id = dictData.state.area[0].id
+tableStore.table.params.testResults = ''
+tableStore.table.params.manufacture = []
+tableStore.table.params.type = 1
+
+provide('tableStore', tableStore)
+
+// 关闭弹窗查询
+const onsubmit = () => {}
+// 下载模版
+const Export = () => {
+    DownloadExport().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = '终端入网检测录入模板' // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+// 下载报告
+const download = (row: any, type: number) => {
+    reportDownload({
+        id: row.id,
+        type: type
+    }).then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = type == 1 ? row.inspectionName : row.originalName // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+// excel导入
+const choose = (e: any) => {
+    batchTerminal(e.raw).then((res: any) => {
+        if (res.type == 'application/json') {
+            ElMessage.success('上传成功,无错误数据!')
+            tableStore.index()
+        } else {
+            ElMessage.warning('上传成功,有错误数据  自动下载 请查看')
+            let blob = new Blob([res], {
+                type: 'application/vnd.ms-excel'
+            })
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download = '模板错误信息' // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+        }
+    })
+}
+// 上传原始报告
+const UploadOriginal = () => {
+    showBatchUpload.value = true
+}
+// 上传
+const BatchUpload = () => {
+    let form = new FormData()
+    form.append('type', '1')
+    fileList.value.forEach((item: any) => {
+        form.append('files', item.raw)
+    })
+    importReport(form)
+        .then((res: any) => {
+            if (res.type == 'application/json') {
+                ElMessage.success('上传成功!')
+                handleClose()
+                tableStore.index()
+            } else {
+                ElMessage.error('上传失败!')
+            }
+        })
+        .catch(response => {
+            // console.log(response);
+        })
+    // fileList.value
+}
+const chooseBatch = (e: any) => {
+    fileList.value.push(e)
+}
+const handleRemove = (e: any) => {
+    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
+}
+const handleClose = () => {
+    fileList.value = []
+    showBatchUpload.value = false
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise_hn/terminal/components/deviceLedgerTable.vue b/src/views/pqs/supervise_hn/terminal/components/deviceLedgerTable.vue
index 0b06750c..1ee0c6a8 100644
--- a/src/views/pqs/supervise_hn/terminal/components/deviceLedgerTable.vue
+++ b/src/views/pqs/supervise_hn/terminal/components/deviceLedgerTable.vue
@@ -94,7 +94,7 @@ const tableStore = new TableStore({
         }
 
         /*   {
-               title: '操作',
+                title: '操作',fixed: 'right',
                minWidth: 150,
                fixed: 'right',
                render: 'buttons',
diff --git a/src/views/pqs/supervise_hn/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise_hn/terminal/components/interferenceUserTable.vue
index dd2a4d4c..756a99c6 100644
--- a/src/views/pqs/supervise_hn/terminal/components/interferenceUserTable.vue
+++ b/src/views/pqs/supervise_hn/terminal/components/interferenceUserTable.vue
@@ -1,390 +1,390 @@
-<template>
-    <div>
-        <TableHeader ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="项目名称">
-                    <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
-                        clearable maxlength="32" show-word-limit></el-input>
-                </el-form-item>
-                <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
-                        <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
-                            :value="item.name"></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"
-                    :loading="loading">模板下载</el-button>
-                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-
-        <el-dialog title="详情" width="80%" v-model="dialogShow" v-if="dialogShow">
-            <DetailInfo :id="userId" :openType="'sourcesOfInterference'"></DetailInfo>
-        </el-dialog>
-        <!-- 批量导入 -->
-        <sensitive-user-popup ref="sensitiveUserPopup" />
-
-        <!-- 查看详情 detail 新增/修改 create-->
-        <addForm ref="addForms" @onSubmit="tableStore.index()" :openType="'sourcesOfInterference'"></addForm>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, nextTick, watch } 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 addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
-import SensitiveUserPopup from './sensitiveUserPopup.vue'
-import { useDictData } from '@/stores/dictData'
-import { useRouter } from 'vue-router'
-import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form'
-import DetailInfo from '../../interfere/components/undocumented/detail.vue'
-import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
-import { deleteUserReport } from '@/api/supervision-boot/delete/index'
-const addForms = ref()
-const dictData = useDictData()
-const sensitiveUserPopup = ref()
-const TableHeaderRef = ref()
-const loading = ref(false)
-const areaOptionList = dictData.getBasicData('jibei_area')
-const { push, options, currentRoute } = useRouter()
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const tableStore = new TableStore({
-    url: '/supervision-boot/userReport/getInterferenceUserPage',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            title: '序号', width: 80, formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'city', title: '所在地市', minWidth: 80 },
-        { field: 'substation', title: '厂站名称', minWidth: 100 },
-        { field: 'projectName', title: '项目名称', minWidth: 170 },
-        {
-            field: 'userType',
-            title: '用户性质',
-            minWidth: 150,
-            formatter: (obj: any) => {
-                const userType = obj.row.userType
-                return getUserTypeName(userType)
-            }
-        },
-
-        { 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: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '详细信息',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        lookInfo(row.id)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
-                    click: row => {
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    // showDisabled: row => {
-                    //     return (
-                    //         (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
-                    //         !(row.dataType == 1)
-                    //     )
-                    // },
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-
-                    click: row => {
-                        addForms.value.filterUsers([6])
-
-                        addForms.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        addForms.value.setcontroFlag()
-                        addForms.value.open({
-                            title: '重新发起',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    }
-})
-tableStore.table.params.city = ''
-tableStore.table.params.orgId = adminInfo.$state.deptId
-tableStore.table.params.projectName = ''
-tableStore.table.params.loadType = ''
-tableStore.table.params.userName = ''
-tableStore.table.params.relationUserName = ''
-tableStore.table.params.aisFileUpload = ''
-
-const userId = ref()
-const dialogShow = ref(false)
-
-const lookInfo = (id: string) => {
-    userId.value = id
-    dialogShow.value = true
-}
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        })
-            .then(() => {
-
-                deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除成功!'
-                    })
-                    tableStore.index()
-                })
-            })
-
-    }
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        dataType: 1,
-        reason: value
-    }
-    await cancelFormData(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-// 新增
-const addFormModel = () => {
-    addForms.value.filterUsers([6])
-
-    setTimeout(() => {
-        addForms.value.open({
-            title: '用户档案录入'
-        })
-    })
-}
-/**获取用户性质*/
-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 '新建电网工程'
-}
-//导出模板
-const exportExcelTemplate = async () => {
-    loading.value = true
-    await downloadSensitiveReportTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '干扰源用户台账模板'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-
-//批量导入用户数据
-const importUserData = () => {
-    sensitiveUserPopup.value.open('导入干扰源用户')
-}
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    const fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    await getUserReportById(fullId).then(res => {
-        if (res && res.code == 'A0000') {
-            addForms.value.setcontroFlag()
-            addForms.value.open({
-                title: '重新发起',
-                row: res.data
-            })
-        }
-    })
-}, { immediate: true })
-</script>
+<template>
+    <div>
+        <TableHeader ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="项目名称">
+                    <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
+                        clearable maxlength="32" show-word-limit></el-input>
+                </el-form-item>
+                <el-form-item label="所在地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                        <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
+                            :value="item.name"></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
+                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"
+                    :loading="loading">模板下载</el-button>
+                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+
+        <el-dialog title="详情" width="80%" v-model="dialogShow" v-if="dialogShow">
+            <DetailInfo :id="userId" :openType="'sourcesOfInterference'"></DetailInfo>
+        </el-dialog>
+        <!-- 批量导入 -->
+        <sensitive-user-popup ref="sensitiveUserPopup" />
+
+        <!-- 查看详情 detail 新增/修改 create-->
+        <addForm ref="addForms" @onSubmit="tableStore.index()" :openType="'sourcesOfInterference'"></addForm>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, nextTick, watch } 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 addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
+import SensitiveUserPopup from './sensitiveUserPopup.vue'
+import { useDictData } from '@/stores/dictData'
+import { useRouter } from 'vue-router'
+import { downloadSensitiveReportTemplate } from '@/api/supervision-boot/userReport/form'
+import DetailInfo from '../../interfere/components/undocumented/detail.vue'
+import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
+import { deleteUserReport } from '@/api/supervision-boot/delete/index'
+const addForms = ref()
+const dictData = useDictData()
+const sensitiveUserPopup = ref()
+const TableHeaderRef = ref()
+const loading = ref(false)
+const areaOptionList = dictData.getBasicData('jibei_area')
+const { push, options, currentRoute } = useRouter()
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const tableStore = new TableStore({
+    url: '/supervision-boot/userReport/getInterferenceUserPage',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            title: '序号', width: 80, formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'city', title: '所在地市', minWidth: 80 },
+        { field: 'substation', title: '厂站名称', minWidth: 100 },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
+        {
+            field: 'userType',
+            title: '用户性质',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                const userType = obj.row.userType
+                return getUserTypeName(userType)
+            }
+        },
+
+        { 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: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+          
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详细信息',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        lookInfo(row.id)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    // showDisabled: row => {
+                    //     return (
+                    //         (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
+                    //         !(row.dataType == 1)
+                    //     )
+                    // },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+
+                    click: row => {
+                        addForms.value.filterUsers([6])
+
+                        addForms.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        addForms.value.setcontroFlag()
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    }
+})
+tableStore.table.params.city = ''
+tableStore.table.params.orgId = adminInfo.$state.deptId
+tableStore.table.params.projectName = ''
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.relationUserName = ''
+tableStore.table.params.aisFileUpload = ''
+
+const userId = ref()
+const dialogShow = ref(false)
+
+const lookInfo = (id: string) => {
+    userId.value = id
+    dialogShow.value = true
+}
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+
+                deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除成功!'
+                    })
+                    tableStore.index()
+                })
+            })
+
+    }
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        dataType: 1,
+        reason: value
+    }
+    await cancelFormData(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+// 新增
+const addFormModel = () => {
+    addForms.value.filterUsers([6])
+
+    setTimeout(() => {
+        addForms.value.open({
+            title: '用户档案录入'
+        })
+    })
+}
+/**获取用户性质*/
+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 '新建电网工程'
+}
+//导出模板
+const exportExcelTemplate = async () => {
+    loading.value = true
+    await downloadSensitiveReportTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '干扰源用户台账模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+
+//批量导入用户数据
+const importUserData = () => {
+    sensitiveUserPopup.value.open('导入干扰源用户')
+}
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    const fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+    await getUserReportById(fullId).then(res => {
+        if (res && res.code == 'A0000') {
+            addForms.value.setcontroFlag()
+            addForms.value.open({
+                title: '重新发起',
+                row: res.data
+            })
+        }
+    })
+}, { immediate: true })
+</script>
diff --git a/src/views/pqs/supervise_hn/terminal/components/monitorLedgerTable.vue b/src/views/pqs/supervise_hn/terminal/components/monitorLedgerTable.vue
index c5692d47..61f47b18 100644
--- a/src/views/pqs/supervise_hn/terminal/components/monitorLedgerTable.vue
+++ b/src/views/pqs/supervise_hn/terminal/components/monitorLedgerTable.vue
@@ -113,7 +113,7 @@ const tableStore = new TableStore({
 
 
         /*   {
-               title: '操作',
+                title: '操作',fixed: 'right',
                minWidth: 150,
                fixed: 'right',
                render: 'buttons',
diff --git a/src/views/pqs/supervise_hn/terminal/components/networkTab.vue b/src/views/pqs/supervise_hn/terminal/components/networkTab.vue
index 4cf60870..7ad49c6d 100644
--- a/src/views/pqs/supervise_hn/terminal/components/networkTab.vue
+++ b/src/views/pqs/supervise_hn/terminal/components/networkTab.vue
@@ -1,372 +1,372 @@
-<template>
-    <div>
-        <div>
-            <TableHeader area ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="终端名称">
-                        <el-input
-                            v-model="tableStore.table.params.name"
-                            clearable
-                            placeholder="请输入终端名称"
-                        ></el-input>
-                    </el-form-item>
-                    <el-form-item label="生产厂家">
-                        <el-select
-                            v-model="tableStore.table.params.manufacture"
-                            placeholder="请选择生产厂家"
-                            multiple
-                            collapse-tags
-                            clearable
-                            class="select"
-                        >
-                            <el-option
-                                v-for="item in manufactorList"
-                                :key="item.id"
-                                :label="item.name"
-                                :value="item.id"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-
-                    <el-form-item label="检测结果">
-                        <el-select
-                            v-model="tableStore.table.params.testResults"
-                            placeholder="请选择检测结果"
-                            clearable
-                            class="select"
-                        >
-                            <el-option
-                                v-for="item in testResultsList"
-                                :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-Download" type="primary" @click="exportEvent">导出</el-button>
-                    <el-button icon="el-icon-Download" type="primary" @click="Export">下载模板</el-button>
-                    <el-upload
-                        ref="uploadRef"
-                        action=""
-                        accept=".xls"
-                        :on-change="choose"
-                        :show-file-list="false"
-                        :auto-upload="false"
-                    >
-                        <template #trigger>
-                            <el-button
-                                icon="el-icon-Upload"
-                                type="primary"
-                                style="margin-left: 12px; margin-right: 12px"
-                            >
-                                excel导入
-                            </el-button>
-                        </template>
-                    </el-upload>
-                    <el-button icon="el-icon-Upload" type="primary" @click="UploadOriginal">上传原始报告</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-            <!-- 新增 -->
-            <newlyIncreased ref="addRef" @onsubmit="tableStore.index()" />
-            <!-- 上传原始报告 -->
-            <el-dialog
-                draggable
-                title="上传原始报告__支持批量上传"
-                v-model="showBatchUpload"
-                width="30%"
-                :before-close="handleClose"
-            >
-                <el-upload
-                    multiple
-                    action=""
-                    :auto-upload="false"
-                    :limit="999"
-                    accept=".doc,.docx"
-                    :file-list="fileList"
-                    :on-remove="handleRemove"
-                    :on-change="chooseBatch"
-                    ref="upload"
-                >
-                    <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
-                    <span :style="`color:#f58003`">　　(*传入的原始数据文件格式(终端编号-原始数据报告.docx))</span>
-                </el-upload>
-                <template #footer>
-                    <el-button @click="handleClose">取 消</el-button>
-                    <el-button type="primary" @click="BatchUpload">上 传</el-button>
-                </template>
-            </el-dialog>
-        </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 newlyIncreased from './add.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import {
-    DownloadExport,
-    reportDownload,
-    batchTerminal,
-    delTerminal,
-    getTerminalPage,
-    importReport
-} from '@/api/process-boot/terminal'
-import { useDictData } from '@/stores/dictData'
-
-const dictData = useDictData()
-const manufactorList = dictData.getBasicData('Dev_Manufacturers')
-const testResultsList = [
-    {
-        id: 0,
-        name: '未展开'
-    },
-    {
-        id: 1,
-        name: '已展开'
-    }
-]
-
-const fileList: any = ref([])
-const TableHeaderRef = ref()
-const addRef = ref()
-const showBatchUpload = ref(false)
-const tableRef = ref()
-
-const ruleFormRef = ref()
-const tableStore = new TableStore({
-    url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
-    publicHeight: 85,
-    method: 'POST',
-    column: [
-        // { width: '60', type: 'checkbox' },
-
-        { field: 'orgName', title: '所属单位' },
-        { field: 'id', title: '终端编号' },
-        { field: 'name', title: '终端名称' },
-        {
-            field: 'manufacture',
-            title: '生产厂家',
-            formatter(row: any) {
-                return manufactorList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        { field: 'installPlace', title: '安装位置' },
-        { field: 'inspectionUnit', title: '送检单位' },
-        {
-            field: 'testResults',
-            title: '检测结果',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success'
-            },
-            replaceValue: {
-                0: '未展开',
-                1: '已展开'
-            }
-        },
-        { field: 'inspectionTime', title: '检测时间' },
-        { field: 'nextInspectionTime', title: '下次检测时间' },
-        {
-            title: '操作',
-            width: '250',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        addRef.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗?'
-                    },
-                    click: row => {
-                        delTerminal([row.id]).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '下载原始数据报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.originalReport == null
-                    },
-                    click: row => {
-                        download(row, 0)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '下载检测报告',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.inspectionReport == null
-                    },
-                    click: row => {
-                        download(row, 1)
-                    }
-                }
-            ]
-        }
-    ]
-})
-
-tableStore.table.params.name = ''
-tableStore.table.params.id = dictData.state.area[0].id
-tableStore.table.params.testResults = ''
-tableStore.table.params.manufacture = []
-tableStore.table.params.type = 0
-
-provide('tableStore', tableStore)
-
-const add = () => {
-    addRef.value.open({
-        title: '新增'
-    })
-}
-
-// 下载模版
-const Export = () => {
-    DownloadExport().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        link.download = '终端入网检测录入模板' // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-    })
-}
-// 下载报告
-const download = (row: any, type: number) => {
-    reportDownload({
-        id: row.id,
-        type: type
-    }).then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
-        })
-
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        link.download = type == 1 ? row.inspectionName : row.originalName // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-    })
-}
-// excel导入
-const choose = (e: any) => {
-    batchTerminal(e.raw).then((res: any) => {
-        if (res.type == 'application/json') {
-            ElMessage.success('上传成功,无错误数据!')
-            tableStore.index()
-        } else {
-            ElMessage.warning('上传成功,有错误数据  自动下载 请查看')
-            let blob = new Blob([res], {
-                type: 'application/vnd.ms-excel'
-            })
-            const url = window.URL.createObjectURL(blob)
-            const link = document.createElement('a') // 创建a标签
-            link.href = url
-            link.download = '模板错误信息' // 设置下载的文件名
-            document.body.appendChild(link)
-            link.click() //执行下载
-            document.body.removeChild(link)
-        }
-    })
-}
-// 导出
-const exportEvent = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    getTerminalPage(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '终端入网检测', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-// 上传原始报告
-const UploadOriginal = () => {
-    showBatchUpload.value = true
-}
-// 上传
-const BatchUpload = () => {
-    let form = new FormData()
-    form.append('type', '0')
-    fileList.value.forEach((item: any) => {
-        form.append('files', item.raw)
-    })
-    importReport(form)
-        .then((res: any) => {
-            if (res.type == 'application/json') {
-                ElMessage.success('上传成功!')
-                handleClose()
-                tableStore.index()
-            } else {
-                ElMessage.error('上传失败!')
-            }
-        })
-        .catch(response => {
-            // console.log(response);
-        })
-    // fileList.value
-}
-const chooseBatch = (e: any) => {
-    fileList.value.push(e)
-}
-const handleRemove = (e: any) => {
-    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
-}
-const handleClose = () => {
-    fileList.value = []
-    showBatchUpload.value = false
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div>
+        <div>
+            <TableHeader area ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="终端名称">
+                        <el-input
+                            v-model="tableStore.table.params.name"
+                            clearable
+                            placeholder="请输入终端名称"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="生产厂家">
+                        <el-select
+                            v-model="tableStore.table.params.manufacture"
+                            placeholder="请选择生产厂家"
+                            multiple
+                            collapse-tags
+                            clearable
+                            class="select"
+                        >
+                            <el-option
+                                v-for="item in manufactorList"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item label="检测结果">
+                        <el-select
+                            v-model="tableStore.table.params.testResults"
+                            placeholder="请选择检测结果"
+                            clearable
+                            class="select"
+                        >
+                            <el-option
+                                v-for="item in testResultsList"
+                                :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-Download" type="primary" @click="exportEvent">导出</el-button>
+                    <el-button icon="el-icon-Download" type="primary" @click="Export">下载模板</el-button>
+                    <el-upload
+                        ref="uploadRef"
+                        action=""
+                        accept=".xls"
+                        :on-change="choose"
+                        :show-file-list="false"
+                        :auto-upload="false"
+                    >
+                        <template #trigger>
+                            <el-button
+                                icon="el-icon-Upload"
+                                type="primary"
+                                style="margin-left: 12px; margin-right: 12px"
+                            >
+                                excel导入
+                            </el-button>
+                        </template>
+                    </el-upload>
+                    <el-button icon="el-icon-Upload" type="primary" @click="UploadOriginal">上传原始报告</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+            <!-- 新增 -->
+            <newlyIncreased ref="addRef" @onsubmit="tableStore.index()" />
+            <!-- 上传原始报告 -->
+            <el-dialog
+                draggable
+                title="上传原始报告__支持批量上传"
+                v-model="showBatchUpload"
+                width="30%"
+                :before-close="handleClose"
+            >
+                <el-upload
+                    multiple
+                    action=""
+                    :auto-upload="false"
+                    :limit="999"
+                    accept=".doc,.docx"
+                    :file-list="fileList"
+                    :on-remove="handleRemove"
+                    :on-change="chooseBatch"
+                    ref="upload"
+                >
+                    <el-button type="primary" icon="el-icon-Upload">选择文件</el-button>
+                    <span :style="`color:#f58003`">　　(*传入的原始数据文件格式(终端编号-原始数据报告.docx))</span>
+                </el-upload>
+                <template #footer>
+                    <el-button @click="handleClose">取 消</el-button>
+                    <el-button type="primary" @click="BatchUpload">上 传</el-button>
+                </template>
+            </el-dialog>
+        </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 newlyIncreased from './add.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import {
+    DownloadExport,
+    reportDownload,
+    batchTerminal,
+    delTerminal,
+    getTerminalPage,
+    importReport
+} from '@/api/process-boot/terminal'
+import { useDictData } from '@/stores/dictData'
+
+const dictData = useDictData()
+const manufactorList = dictData.getBasicData('Dev_Manufacturers')
+const testResultsList = [
+    {
+        id: 0,
+        name: '未展开'
+    },
+    {
+        id: 1,
+        name: '已展开'
+    }
+]
+
+const fileList: any = ref([])
+const TableHeaderRef = ref()
+const addRef = ref()
+const showBatchUpload = ref(false)
+const tableRef = ref()
+
+const ruleFormRef = ref()
+const tableStore = new TableStore({
+    url: '/process-boot/process/pmsTerminalDetection/getTerminalPage',
+    publicHeight: 85,
+    method: 'POST',
+    column: [
+        // { width: '60', type: 'checkbox' },
+
+        { field: 'orgName', title: '所属单位' },
+        { field: 'id', title: '终端编号' },
+        { field: 'name', title: '终端名称' },
+        {
+            field: 'manufacture',
+            title: '生产厂家',
+            formatter(row: any) {
+                return manufactorList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        { field: 'installPlace', title: '安装位置' },
+        { field: 'inspectionUnit', title: '送检单位' },
+        {
+            field: 'testResults',
+            title: '检测结果',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '未展开',
+                1: '已展开'
+            }
+        },
+        { field: 'inspectionTime', title: '检测时间' },
+        { field: 'nextInspectionTime', title: '下次检测时间' },
+        {
+             title: '操作',fixed: 'right',
+            width: '250',
+            render: 'buttons',
+          
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        addRef.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗?'
+                    },
+                    click: row => {
+                        delTerminal([row.id]).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '下载原始数据报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.originalReport == null
+                    },
+                    click: row => {
+                        download(row, 0)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '下载检测报告',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.inspectionReport == null
+                    },
+                    click: row => {
+                        download(row, 1)
+                    }
+                }
+            ]
+        }
+    ]
+})
+
+tableStore.table.params.name = ''
+tableStore.table.params.id = dictData.state.area[0].id
+tableStore.table.params.testResults = ''
+tableStore.table.params.manufacture = []
+tableStore.table.params.type = 0
+
+provide('tableStore', tableStore)
+
+const add = () => {
+    addRef.value.open({
+        title: '新增'
+    })
+}
+
+// 下载模版
+const Export = () => {
+    DownloadExport().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = '终端入网检测录入模板' // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+// 下载报告
+const download = (row: any, type: number) => {
+    reportDownload({
+        id: row.id,
+        type: type
+    }).then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+        })
+
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a') // 创建a标签
+        link.href = url
+        link.download = type == 1 ? row.inspectionName : row.originalName // 设置下载的文件名
+        document.body.appendChild(link)
+        link.click() //执行下载
+        document.body.removeChild(link)
+    })
+}
+// excel导入
+const choose = (e: any) => {
+    batchTerminal(e.raw).then((res: any) => {
+        if (res.type == 'application/json') {
+            ElMessage.success('上传成功,无错误数据!')
+            tableStore.index()
+        } else {
+            ElMessage.warning('上传成功,有错误数据  自动下载 请查看')
+            let blob = new Blob([res], {
+                type: 'application/vnd.ms-excel'
+            })
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            link.download = '模板错误信息' // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+        }
+    })
+}
+// 导出
+const exportEvent = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    getTerminalPage(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '终端入网检测', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+// 上传原始报告
+const UploadOriginal = () => {
+    showBatchUpload.value = true
+}
+// 上传
+const BatchUpload = () => {
+    let form = new FormData()
+    form.append('type', '0')
+    fileList.value.forEach((item: any) => {
+        form.append('files', item.raw)
+    })
+    importReport(form)
+        .then((res: any) => {
+            if (res.type == 'application/json') {
+                ElMessage.success('上传成功!')
+                handleClose()
+                tableStore.index()
+            } else {
+                ElMessage.error('上传失败!')
+            }
+        })
+        .catch(response => {
+            // console.log(response);
+        })
+    // fileList.value
+}
+const chooseBatch = (e: any) => {
+    fileList.value.push(e)
+}
+const handleRemove = (e: any) => {
+    fileList.value = fileList.value.filter((item: any) => item.uid !== e.uid)
+}
+const handleClose = () => {
+    fileList.value = []
+    showBatchUpload.value = false
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/pqs/supervise_hn/terminal/components/sensitiveUserTable.vue b/src/views/pqs/supervise_hn/terminal/components/sensitiveUserTable.vue
index f5ba1822..f1b43241 100644
--- a/src/views/pqs/supervise_hn/terminal/components/sensitiveUserTable.vue
+++ b/src/views/pqs/supervise_hn/terminal/components/sensitiveUserTable.vue
@@ -1,285 +1,285 @@
-<template>
-    <div>
-        <TableHeader ref="TableHeaderRef">
-            <template #select>
-                <el-form-item label="项目名称">
-                    <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
-                    clearable maxlength="32"  show-word-limit></el-input>
-                </el-form-item>
-                <el-form-item label="所在地市">
-                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
-                        <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
-                            :value="item.name"></el-option>
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
-                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"  :loading="loading">模版下载</el-button>
-                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-        <el-dialog title="详情" width="80%" v-model="dialogShow">
-            <DetailInfo :id="userId"></DetailInfo>
-        </el-dialog>
-        <sensitive-user-popup ref="sensitiveUserPopup" />
-
-        <!-- 查看详情 detail 新增/修改 create-->
-        <addForm ref="addForms" @onSubmit="tableStore.index()" openType="create" :submissionControl="false"></addForm>
-    </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 { useDictData } from '@/stores/dictData'
-import DetailInfo from '../../interfere/components/undocumented/detail.vue'
-import { downloadSensitiveUserTemplate } from '@/api/supervision-boot/userReport/form'
-import SensitiveUserPopup from './sensitiveUserPopup.vue'
-import addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
-import { deleteUserReport } from '@/api/supervision-boot/delete/index'
-import { ElMessage } from 'element-plus'
-const dictData = useDictData()
-const sensitiveUserPopup = ref()
-const TableHeaderRef = ref()
-const loading = ref(false)
-const areaOptionList = dictData.getBasicData('jibei_area')
-const loadLevelOptionList = dictData.getBasicData('load_level')
-const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const tableStore = new TableStore({
-    url: '/supervision-boot/userReport/getSensitiveUserPage',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        {
-            title: '序号',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'city', title: '所在地市', minWidth: 80 },
-        {
-            field: 'substation',
-            title: '厂站名称',
-            minWidth: 100,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        { field: 'projectName', title: '项目名称', minWidth: 170 },
-
-        // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
-
-        {
-            field: 'userReportSensitivePO.loadLevel',
-            title: '负荷级别',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return loadLevelOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'userReportSensitivePO.powerSupplyInfo',
-            title: '供电电源情况',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'userStatus',
-            title: '用户状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'primary',
-                1: 'primary',
-                2: 'success',
-                3: 'warning'
-            },
-            replaceValue: {
-                0: '可研',
-                1: '建设',
-                2: '运行',
-                3: '退运'
-            }
-        },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '详细信息',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        lookInfo(row.id)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return (
-                            (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
-                            !(row.dataType == 1)
-                        )
-                    },
-                    // disabled: row => {
-                    //     return !(row.status == 0)
-                    // },
-                    click: row => {
-                        addForms.value.filterUsers([5, 4, 3, 2, 1, 0])
-                        addForms.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-    }
-})
-tableStore.table.params.city = ''
-tableStore.table.params.projectName = ''
-tableStore.table.params.loadType = ''
-tableStore.table.params.userName = ''
-tableStore.table.params.orgId = adminInfo.$state.deptId
-tableStore.table.params.relationUserName = ''
-tableStore.table.params.aisFileUpload = ''
-const addForms = ref()
-const userId = ref()
-const dialogShow = ref(false)
-
-const lookInfo = (id: string) => {
-    userId.value = id
-    dialogShow.value = true
-}
-
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    })
-        .then(() => {
-          
-            deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                ElMessage({
-                    type: 'success',
-                    message: '删除成功!'
-                })
-                tableStore.index()
-            })
-        })
-
-    }
-}
-
-// 新增
-const addFormModel = () => {
-    addForms.value.filterUsers([5, 4, 3, 2, 1, 0])
-
-    addForms.value.open({
-        title: '用户档案录入'
-    })
-}
-/**获取用户性质*/
-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 '新建电网工程'
-}
-
-//导出模板
-const exportExcelTemplate = async () => {
-    loading.value = true
-  await  downloadSensitiveUserTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '敏感及重要用户模板'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-
-//批量导入用户数据
-const importUserData = () => {
-    sensitiveUserPopup.value.open('导入敏感及重要用户')
-}
-</script>
+<template>
+    <div>
+        <TableHeader ref="TableHeaderRef">
+            <template #select>
+                <el-form-item label="项目名称">
+                    <el-input style="width: 200px" placeholder="请输入项目名称" v-model="tableStore.table.params.projectName"
+                    clearable maxlength="32"  show-word-limit></el-input>
+                </el-form-item>
+                <el-form-item label="所在地市">
+                    <el-select v-model="tableStore.table.params.city" clearable placeholder="请选择所在地市">
+                        <el-option v-for="item in areaOptionList" :key="item.id" :label="item.name"
+                            :value="item.name"></el-option>
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button>
+                <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+                <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"  :loading="loading">模版下载</el-button>
+                <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+        <el-dialog title="详情" width="80%" v-model="dialogShow">
+            <DetailInfo :id="userId"></DetailInfo>
+        </el-dialog>
+        <sensitive-user-popup ref="sensitiveUserPopup" />
+
+        <!-- 查看详情 detail 新增/修改 create-->
+        <addForm ref="addForms" @onSubmit="tableStore.index()" openType="create" :submissionControl="false"></addForm>
+    </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 { useDictData } from '@/stores/dictData'
+import DetailInfo from '../../interfere/components/undocumented/detail.vue'
+import { downloadSensitiveUserTemplate } from '@/api/supervision-boot/userReport/form'
+import SensitiveUserPopup from './sensitiveUserPopup.vue'
+import addForm from '@/views/pqs/supervise/interfere/components/undocumented/addForm.vue'
+import { deleteUserReport } from '@/api/supervision-boot/delete/index'
+import { ElMessage } from 'element-plus'
+const dictData = useDictData()
+const sensitiveUserPopup = ref()
+const TableHeaderRef = ref()
+const loading = ref(false)
+const areaOptionList = dictData.getBasicData('jibei_area')
+const loadLevelOptionList = dictData.getBasicData('load_level')
+const powerSupplyInfoOptionList = dictData.getBasicData('supply_condition')
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const tableStore = new TableStore({
+    url: '/supervision-boot/userReport/getSensitiveUserPage',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        {
+            title: '序号',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'city', title: '所在地市', minWidth: 80 },
+        {
+            field: 'substation',
+            title: '厂站名称',
+            minWidth: 100,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'projectName', title: '项目名称', minWidth: 170 },
+
+        // { field: 'responsibleDepartment', title: '归口管理部门', minWidth: 130 },
+
+        {
+            field: 'userReportSensitivePO.loadLevel',
+            title: '负荷级别',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return loadLevelOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'userReportSensitivePO.powerSupplyInfo',
+            title: '供电电源情况',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return powerSupplyInfoOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'userStatus',
+            title: '用户状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'primary',
+                1: 'primary',
+                2: 'success',
+                3: 'warning'
+            },
+            replaceValue: {
+                0: '可研',
+                1: '建设',
+                2: '运行',
+                3: '退运'
+            }
+        },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+          
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详细信息',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        lookInfo(row.id)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return (
+                            (row.city != adminInfo.$state.deptName && row.createBy != adminInfo.$state.id) ||
+                            !(row.dataType == 1)
+                        )
+                    },
+                    // disabled: row => {
+                    //     return !(row.status == 0)
+                    // },
+                    click: row => {
+                        addForms.value.filterUsers([5, 4, 3, 2, 1, 0])
+                        addForms.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+    }
+})
+tableStore.table.params.city = ''
+tableStore.table.params.projectName = ''
+tableStore.table.params.loadType = ''
+tableStore.table.params.userName = ''
+tableStore.table.params.orgId = adminInfo.$state.deptId
+tableStore.table.params.relationUserName = ''
+tableStore.table.params.aisFileUpload = ''
+const addForms = ref()
+const userId = ref()
+const dialogShow = ref(false)
+
+const lookInfo = (id: string) => {
+    userId.value = id
+    dialogShow.value = true
+}
+
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    })
+        .then(() => {
+          
+            deleteUserReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                ElMessage({
+                    type: 'success',
+                    message: '删除成功!'
+                })
+                tableStore.index()
+            })
+        })
+
+    }
+}
+
+// 新增
+const addFormModel = () => {
+    addForms.value.filterUsers([5, 4, 3, 2, 1, 0])
+
+    addForms.value.open({
+        title: '用户档案录入'
+    })
+}
+/**获取用户性质*/
+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 '新建电网工程'
+}
+
+//导出模板
+const exportExcelTemplate = async () => {
+    loading.value = true
+  await  downloadSensitiveUserTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '敏感及重要用户模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+
+//批量导入用户数据
+const importUserData = () => {
+    sensitiveUserPopup.value.open('导入敏感及重要用户')
+}
+</script>
diff --git a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/cycleDetection/index.vue b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/cycleDetection/index.vue
index c5e56d1a..81f67f08 100644
--- a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/cycleDetection/index.vue
+++ b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/cycleDetection/index.vue
@@ -1,286 +1,286 @@
-<!---终端入网检测-->
-<template>
-  <TableHeader area ref='TableHeaderRef'>
-    <template #select>
-      <el-form-item label='搜索'>
-        <el-input
-            v-model='tableStore.table.params.searchValue'
-            placeholder='输入变电站.终端名称'
-            clearable maxlength="32"  show-word-limit
-        ></el-input>
-      </el-form-item>
-      <el-form-item label='流程状态'>
-        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
-          <el-option
-              v-for='item in statusSelect'
-              :key='item.id'
-              :label='item.name'
-              :value='item.id'
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label='处理状态'>
-        <el-select v-model='tableStore.table.params.state' clearable placeholder='请选处理状态'>
-          <el-option
-              v-for='item in stateSelect'
-              :key='item.id'
-              :label='item.name'
-              :value='item.id'
-          ></el-option>
-        </el-select>
-      </el-form-item>
-    </template>
-  </TableHeader>
-  <Table ref='tableRef' />
-  <Form ref='FormRef' @onSubmit='tableStore.index()' />
-</template>
-<script setup lang='ts'>
-import { ref, onMounted, provide, watch } from 'vue'
-import TableStore from '@/utils/tableStore'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import Form from './form.vue'
-import { cancel, getInfoById } from '@/api/supervision-boot/cycleDetection/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-const TableHeaderRef = ref()
-const tableRef = ref()
-const FormRef = ref()
-const statusSelect = dictData.statusSelect()
-const stateSelect = [
-  {
-    id: 0,
-    name: '未处理'
-  },
-  {
-    id: 1,
-    name: '处理中'
-  },
-  {
-    id: 2,
-    name: '已处理'
-  }
-]
-//申请联调
-const debugForms = ref()
-const tableStore = new TableStore({
-  url: '/supervision-boot/checkDevice/list',
-  publicHeight: 65,
-  method: 'POST',
-  column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-    { field: 'substation', title: '变电站' },
-
-    { field: 'dept', title: '供电公司' },
-    {
-      field: 'deviceName',
-      title: '终端名称'
-    },
-    {
-      field: 'thisTimeCheck',
-      title: '本次定检时间'
-    },
-    {
-      field: 'nextTimeCheck',
-      title: '下次定检时间'
-    },
-    {
-      field: 'overdueDay',
-      title: '逾期天数',
-      type: 'html',
-      formatter: (row: any) => {
-
-        let text = row.row.status == 2
-            ? '/'
-            : `<span style='color: ${
-                row.row.overdueDay > 10 ? 'red' : row.row.overdueDay > 3 ? 'yellow' : ''
-            };text-decoration: none'>${row.row.overdueDay}</span>`
-
-        return text
-      }
-    },
-
-    {
-      field: 'status',
-      title: '流程状态',
-      minWidth: 100,
-      render: 'tag',
-      custom: {
-        0: 'warning',
-        1: 'primary',
-        2: 'success',
-        3: 'danger',
-        4: 'warning',
-        5: 'primary'
-      },
-      replaceValue: {
-        0: '待提交审批',
-        1: '审批中',
-        2: '审批通过',
-        3: '审批不通过',
-        4: '已取消',
-        5: '同步台账成功',
-        null: '/'
-      }
-    },
-    {
-      title: '操作',
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            flag.value = true
-            handleAudit(row.processInstanceId, row.historyInstanceId)
-          },
-          disabled: row => {
-            return !row.processInstanceId
-          }
-        },
-
-        {
-          name: 'edit',
-          title: '报告上传',
-          type: 'primary',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.status != null
-          },
-          click: row => {
-            FormRef.value.open('报告上传', row)
-          }
-        },
-
-        {
-          name: 'edit',
-          title: '重新发起',
-          type: 'warning',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-          },
-          click: row => {
-            FormRef.value.open('重新发起', row)
-          }
-        },
-        {
-          name: 'cancel',
-          title: '取消',
-          type: 'danger',
-          icon: 'el-icon-Open',
-          render: 'basicButton',
-          disabled: row => {
-            return row.createBy != adminInfo.$state.id || row.status != 1
-          },
-          click: async row => {
-            // cancelLeave(row)
-            const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              inputType: 'textarea',
-              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-              inputErrorMessage: '取消原因不能为空'
-            })
-            // 发起取消
-            let data = {
-              id: row.id,
-              processInstanceId: row.processInstanceId,
-              reason: value
-            }
-            await cancel(data)
-            ElMessage.success('取消成功')
-            // 加载数据
-            tableStore.index()
-          }
-        }
-      ]
-    }
-  ],
-
-  beforeSearchFun: () => {
-    tableStore.table.params.deptId = tableStore.table.params.deptIndex
-    tableStore.table.params.statveList = [2]
-    // tableStore.table.params.relationUserName = tableStore.table.params.userName
-  }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.state = ''
-tableStore.table.params.searchValue = ''
-
-provide('tableStore', tableStore)
-
-onMounted(() => {
-  tableStore.index()
-})
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    state: {
-      id: instanceId,
-      historyInstanceId
-    }
-  })
-}
-
-const addFormModel = () => {
-}
-
-watch(
-    () => currentRoute.value.path,
-    () => {
-      if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-        tableStore.index()
-        flag.value = false
-      }
-    },
-    {
-      deep: true
-    }
-)
-const props = defineProps(['id', 'businessKey'])
-watch(() => props.id, async (newValue, oldValue) => {
-  if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-  const fullId = newValue.split('@')[0]
-  let nowTime = Date.now()
-  const routeTime = Number(newValue.split('@')[1])
-  if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-  await getInfoById({ id: fullId }).then(res => {
-    if (res && res.code == 'A0000') {
-      if (props.businessKey == '3') {
-        FormRef.value.open('报告上传', res.data)
-      } else {
-        FormRef.value.open('重新发起', res.data)
-      }
-
-    }
-  })
-}, { immediate: true })
-</script>
-
-<style scoped lang='scss'>
-:deep(.el-upload-list__item) {
-  width: 400px;
-}
-
-::v-deep .el-input__wrapper {
-  // width: 200px !important;
-}
-</style>
+<!---终端入网检测-->
+<template>
+  <TableHeader area ref='TableHeaderRef'>
+    <template #select>
+      <el-form-item label='搜索'>
+        <el-input
+            v-model='tableStore.table.params.searchValue'
+            placeholder='输入变电站.终端名称'
+            clearable maxlength="32"  show-word-limit
+        ></el-input>
+      </el-form-item>
+      <el-form-item label='流程状态'>
+        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择流程状态'>
+          <el-option
+              v-for='item in statusSelect'
+              :key='item.id'
+              :label='item.name'
+              :value='item.id'
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label='处理状态'>
+        <el-select v-model='tableStore.table.params.state' clearable placeholder='请选处理状态'>
+          <el-option
+              v-for='item in stateSelect'
+              :key='item.id'
+              :label='item.name'
+              :value='item.id'
+          ></el-option>
+        </el-select>
+      </el-form-item>
+    </template>
+  </TableHeader>
+  <Table ref='tableRef' />
+  <Form ref='FormRef' @onSubmit='tableStore.index()' />
+</template>
+<script setup lang='ts'>
+import { ref, onMounted, provide, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import Form from './form.vue'
+import { cancel, getInfoById } from '@/api/supervision-boot/cycleDetection/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+const TableHeaderRef = ref()
+const tableRef = ref()
+const FormRef = ref()
+const statusSelect = dictData.statusSelect()
+const stateSelect = [
+  {
+    id: 0,
+    name: '未处理'
+  },
+  {
+    id: 1,
+    name: '处理中'
+  },
+  {
+    id: 2,
+    name: '已处理'
+  }
+]
+//申请联调
+const debugForms = ref()
+const tableStore = new TableStore({
+  url: '/supervision-boot/checkDevice/list',
+  publicHeight: 65,
+  method: 'POST',
+  column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+    { field: 'substation', title: '变电站' },
+
+    { field: 'dept', title: '供电公司' },
+    {
+      field: 'deviceName',
+      title: '终端名称'
+    },
+    {
+      field: 'thisTimeCheck',
+      title: '本次定检时间'
+    },
+    {
+      field: 'nextTimeCheck',
+      title: '下次定检时间'
+    },
+    {
+      field: 'overdueDay',
+      title: '逾期天数',
+      type: 'html',
+      formatter: (row: any) => {
+
+        let text = row.row.status == 2
+            ? '/'
+            : `<span style='color: ${
+                row.row.overdueDay > 10 ? 'red' : row.row.overdueDay > 3 ? 'yellow' : ''
+            };text-decoration: none'>${row.row.overdueDay}</span>`
+
+        return text
+      }
+    },
+
+    {
+      field: 'status',
+      title: '流程状态',
+      minWidth: 100,
+      render: 'tag',
+      custom: {
+        0: 'warning',
+        1: 'primary',
+        2: 'success',
+        3: 'danger',
+        4: 'warning',
+        5: 'primary'
+      },
+      replaceValue: {
+        0: '待提交审批',
+        1: '审批中',
+        2: '审批通过',
+        3: '审批不通过',
+        4: '已取消',
+        5: '同步台账成功',
+        null: '/'
+      }
+    },
+    {
+       title: '操作',fixed: 'right',
+
+      render: 'buttons',
+      buttons: [
+        {
+          name: 'productSetting',
+          title: '流程详情',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            flag.value = true
+            handleAudit(row.processInstanceId, row.historyInstanceId)
+          },
+          disabled: row => {
+            return !row.processInstanceId
+          }
+        },
+
+        {
+          name: 'edit',
+          title: '报告上传',
+          type: 'primary',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.status != null
+          },
+          click: row => {
+            FormRef.value.open('报告上传', row)
+          }
+        },
+
+        {
+          name: 'edit',
+          title: '重新发起',
+          type: 'warning',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+          },
+          click: row => {
+            FormRef.value.open('重新发起', row)
+          }
+        },
+        {
+          name: 'cancel',
+          title: '取消',
+          type: 'danger',
+          icon: 'el-icon-Open',
+          render: 'basicButton',
+          disabled: row => {
+            return row.createBy != adminInfo.$state.id || row.status != 1
+          },
+          click: async row => {
+            // cancelLeave(row)
+            const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              inputType: 'textarea',
+              inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+              inputErrorMessage: '取消原因不能为空'
+            })
+            // 发起取消
+            let data = {
+              id: row.id,
+              processInstanceId: row.processInstanceId,
+              reason: value
+            }
+            await cancel(data)
+            ElMessage.success('取消成功')
+            // 加载数据
+            tableStore.index()
+          }
+        }
+      ]
+    }
+  ],
+
+  beforeSearchFun: () => {
+    tableStore.table.params.deptId = tableStore.table.params.deptIndex
+    tableStore.table.params.statveList = [2]
+    // tableStore.table.params.relationUserName = tableStore.table.params.userName
+  }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.state = ''
+tableStore.table.params.searchValue = ''
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+  tableStore.index()
+})
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+  push({
+    name: 'BpmProcessInstanceDetail',
+    state: {
+      id: instanceId,
+      historyInstanceId
+    }
+  })
+}
+
+const addFormModel = () => {
+}
+
+watch(
+    () => currentRoute.value.path,
+    () => {
+      if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+        tableStore.index()
+        flag.value = false
+      }
+    },
+    {
+      deep: true
+    }
+)
+const props = defineProps(['id', 'businessKey'])
+watch(() => props.id, async (newValue, oldValue) => {
+  if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+  const fullId = newValue.split('@')[0]
+  let nowTime = Date.now()
+  const routeTime = Number(newValue.split('@')[1])
+  if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+  await getInfoById({ id: fullId }).then(res => {
+    if (res && res.code == 'A0000') {
+      if (props.businessKey == '3') {
+        FormRef.value.open('报告上传', res.data)
+      } else {
+        FormRef.value.open('重新发起', res.data)
+      }
+
+    }
+  })
+}, { immediate: true })
+</script>
+
+<style scoped lang='scss'>
+:deep(.el-upload-list__item) {
+  width: 400px;
+}
+
+::v-deep .el-input__wrapper {
+  // width: 200px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/jointDebugList/index.vue b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/jointDebugList/index.vue
index 2028d293..8d08a501 100644
--- a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/jointDebugList/index.vue
+++ b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/jointDebugList/index.vue
@@ -1,361 +1,361 @@
-<!---终端入网检测-->
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="搜索">
-                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                clearable maxlength="32"  show-word-limit style="width: 230px"></el-input>
-            </el-form-item>
-            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                    <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
-                        :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-        </template>
-        <template #operation>
-            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
-            <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-    <!-- 申请联调弹框 -->
-    <debug ref="debugForms" @onSubmit="tableStore.index()" :debugId="debugId"></debug>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, watch } from 'vue'
-import TableStore from '@/utils/tableStore'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import { getLoadTypeUserList } from '@/api/process-boot/interference'
-import {
-    getMointorPointTempLinedebugDetail,
-    setTempLinedebugLedgerSync
-} from '@/api/supervision-boot/jointDebugList/index'
-import debug from './debug.vue'
-import { cancelMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { deleteTempLineDebugReport } from '@/api/supervision-boot/delete/index'
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-const TableHeaderRef = ref()
-const tableRef = ref()
-const statusSelect = dictData.statusSelect()
-statusSelect.push({ name: '同步台账成功', id: 5 })
-const tableStore = new TableStore({
-    url: '/supervision-boot/tempLinedebug/list',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        {
-            field: 'powerSubstationName',
-            title: '电网侧变电站',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        { field: 'lineName', title: '监测点名称', minWidth: 170 },
-        {
-            field: 'reason',
-            title: '调试原因',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        { field: 'lineId', title: '监测点编号', minWidth: 170 },
-        // { field: 'monitoringTerminalCode', title: '终端编码', minWidth: 170 },
-        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning',
-                5: 'primary'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消',
-                5: '同步台账成功',
-                null: '/'
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    },
-                    disabled: row => {
-                        return !row.processInstanceId
-                    }
-                },
-                // {
-                //     name: 'edit',
-                //     title: '编辑',
-                //     type: 'primary',
-                //     icon: 'el-icon-Open',
-                //     render: 'basicButton',
-                //     showDisabled: row => {
-                //         return row.createBy != adminInfo.$state.id || !(row.status == 0)
-                //     },
-                //     disabled: row => {
-                //         return !(row.status == 0)
-                //     },
-                //     click: row => {
-                //         debugForms.value.open('编辑', row)
-                //     }
-                // },
-                {
-                    name: 'productSetting',
-                    title: '申请联调',
-                    type: 'primary',
-                    icon: 'el-icon-add',
-                    render: 'basicButton',
-                    click: row => {
-                        // handleDebug(row)
-                        debugForms.value.open('申请联调', row)
-                    },
-                    disabled: row => {
-                        return row.reason
-                    }
-                },
-
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        debugForms.value.open('重新发起', row)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '同步台账',
-                    type: 'primary',
-                    icon: 'el-icon-add',
-                    render: 'basicButton',
-                    click: row => {
-                        setTempLinedebugLedgerSync({ id: row.id }).then(res => {
-                            if (res.code == 'A0000') {
-                                ElMessage({
-                                    message: '台账同步成功',
-                                    type: 'success'
-                                })
-                                tableStore.index()
-                            }
-                        })
-                    },
-                    disabled: row => {
-                        return row.status != 2
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        tableStore.table.params.statveList = [2]
-        // tableStore.table.params.relationUserName = tableStore.table.params.userName
-    }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.searchValue = ''
-// tableStore.table.params.loadType = ''
-// tableStore.table.params.userName = ''
-// tableStore.table.params.fileUploadflag = ''
-
-provide('tableStore', tableStore)
-
-const exportEvent = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    getLoadTypeUserList(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '未建档非线性用户', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        })
-            .then(() => {
-
-                deleteTempLineDebugReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除成功!'
-                    })
-                    tableStore.index()
-                })
-
-            })
-    }
-}
-onMounted(() => {
-    tableStore.index()
-})
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-//申请联调
-const debugForms = ref()
-const debugId = ref('')
-const handleDebug = (row: any) => {
-    debugId.value = row.id
-    console.log(debugId.value)
-    debugForms.value.open('申请联调', row)
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelMointorPointTempLinedebug(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    const fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    await getMointorPointTempLinedebugDetail({ id: fullId }).then(res => {
-        if (res && res.code == 'A0000') {
-            debugForms.value.open('重新发起', res.data)
-        }
-    })
-}, { immediate: true })
-</script>
-
-<style scoped lang="scss">
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-
-::v-deep .el-input__wrapper {
-    // width: 200px !important;
-}
-</style>
+<!---终端入网检测-->
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="搜索">
+                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
+                clearable maxlength="32"  show-word-limit style="width: 230px"></el-input>
+            </el-form-item>
+            <el-form-item label="流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-option v-for="item in statusSelect" :key="item.id" :label="item.name"
+                        :value="item.id"></el-option>
+                </el-select>
+            </el-form-item>
+        </template>
+        <template #operation>
+            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            <!-- <el-button icon="el-icon-Plus" type="primary" @click="addFormModel">新增</el-button> -->
+            <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+    <!-- 申请联调弹框 -->
+    <debug ref="debugForms" @onSubmit="tableStore.index()" :debugId="debugId"></debug>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { getLoadTypeUserList } from '@/api/process-boot/interference'
+import {
+    getMointorPointTempLinedebugDetail,
+    setTempLinedebugLedgerSync
+} from '@/api/supervision-boot/jointDebugList/index'
+import debug from './debug.vue'
+import { cancelMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { deleteTempLineDebugReport } from '@/api/supervision-boot/delete/index'
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+const TableHeaderRef = ref()
+const tableRef = ref()
+const statusSelect = dictData.statusSelect()
+statusSelect.push({ name: '同步台账成功', id: 5 })
+const tableStore = new TableStore({
+    url: '/supervision-boot/tempLinedebug/list',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        {
+            field: 'powerSubstationName',
+            title: '电网侧变电站',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'lineName', title: '监测点名称', minWidth: 170 },
+        {
+            field: 'reason',
+            title: '调试原因',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'lineId', title: '监测点编号', minWidth: 170 },
+        // { field: 'monitoringTerminalCode', title: '终端编码', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning',
+                5: 'primary'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消',
+                5: '同步台账成功',
+                null: '/'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+          
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    },
+                    disabled: row => {
+                        return !row.processInstanceId
+                    }
+                },
+                // {
+                //     name: 'edit',
+                //     title: '编辑',
+                //     type: 'primary',
+                //     icon: 'el-icon-Open',
+                //     render: 'basicButton',
+                //     showDisabled: row => {
+                //         return row.createBy != adminInfo.$state.id || !(row.status == 0)
+                //     },
+                //     disabled: row => {
+                //         return !(row.status == 0)
+                //     },
+                //     click: row => {
+                //         debugForms.value.open('编辑', row)
+                //     }
+                // },
+                {
+                    name: 'productSetting',
+                    title: '申请联调',
+                    type: 'primary',
+                    icon: 'el-icon-add',
+                    render: 'basicButton',
+                    click: row => {
+                        // handleDebug(row)
+                        debugForms.value.open('申请联调', row)
+                    },
+                    disabled: row => {
+                        return row.reason
+                    }
+                },
+
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        debugForms.value.open('重新发起', row)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '同步台账',
+                    type: 'primary',
+                    icon: 'el-icon-add',
+                    render: 'basicButton',
+                    click: row => {
+                        setTempLinedebugLedgerSync({ id: row.id }).then(res => {
+                            if (res.code == 'A0000') {
+                                ElMessage({
+                                    message: '台账同步成功',
+                                    type: 'success'
+                                })
+                                tableStore.index()
+                            }
+                        })
+                    },
+                    disabled: row => {
+                        return row.status != 2
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        tableStore.table.params.statveList = [2]
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
+    }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.searchValue = ''
+// tableStore.table.params.loadType = ''
+// tableStore.table.params.userName = ''
+// tableStore.table.params.fileUploadflag = ''
+
+provide('tableStore', tableStore)
+
+const exportEvent = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    getLoadTypeUserList(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '未建档非线性用户', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+
+                deleteTempLineDebugReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除成功!'
+                    })
+                    tableStore.index()
+                })
+
+            })
+    }
+}
+onMounted(() => {
+    tableStore.index()
+})
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+//申请联调
+const debugForms = ref()
+const debugId = ref('')
+const handleDebug = (row: any) => {
+    debugId.value = row.id
+    console.log(debugId.value)
+    debugForms.value.open('申请联调', row)
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelMointorPointTempLinedebug(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    const fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+    await getMointorPointTempLinedebugDetail({ id: fullId }).then(res => {
+        if (res && res.code == 'A0000') {
+            debugForms.value.open('重新发起', res.data)
+        }
+    })
+}, { immediate: true })
+</script>
+
+<style scoped lang="scss">
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+
+::v-deep .el-input__wrapper {
+    // width: 200px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/monitorpoint/index.vue
index e7931523..2d14a7fb 100644
--- a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -1,328 +1,328 @@
-<!---终端入网检测-->
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="搜索">
-                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
-                clearable maxlength="32"  show-word-limit style="width: 230px"></el-input>
-            </el-form-item>
-            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                    <el-option v-for="item in statusSelect" :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="addFormModel">新增</el-button>
-            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-
-    <!-- 新增弹框 -->
-    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, watch } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import { getLoadTypeUserList } from '@/api/process-boot/interference'
-import addForm from './addForm.vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { ElMessage } from 'element-plus'
-import { ElMessageBox } from 'element-plus/es'
-import { cancelMointorPointFormData, getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
-import { deleteTempLineReport } from '@/api/supervision-boot/delete/index'
-import { getTerminalDetailsById } from "@/api/supervision-boot/terminal";
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-const TableHeaderRef = ref()
-const tableRef = ref()
-const areaOptionList = dictData.getBasicData('jibei_area')
-const statusSelect = dictData.statusSelect()
-
-const ruleFormRef = ref()
-const show: any = ref(false)
-const fileList = ref([])
-const tableStore = new TableStore({
-    url: '/supervision-boot/tempLine/list',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        // { field: 'orgName', title: '填报部门名称', minWidth: 170 },
-        {
-            field: 'powerSubstationName',
-            title: '电网侧电站',
-            minWidth: 170,
-            formatter: (row: any) => {
-                return row.cellValue ? row.cellValue : '/'
-            }
-        },
-        { field: 'connectedBus', title: '关联母线', minWidth: 170 },
-        { field: 'monitoringTerminalName', title: '所属终端', minWidth: 170 },
-        { field: 'lineName', title: '监测点名称', minWidth: 150 },
-        { field: 'reportDate', title: '填报日期', minWidth: 150 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
-                    },
-
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-                    click: row => {
-                        addForms.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        addForms.value.open({
-                            title: '重新发起',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        // tableStore.table.params.relationUserName = tableStore.table.params.userName
-    }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.searchValue = ''
-// tableStore.table.params.loadType = ''
-// tableStore.table.params.userName = ''
-// tableStore.table.params.fileUploadflag = ''
-
-provide('tableStore', tableStore)
-
-const addForms = ref()
-const addFormModel = () => {
-    setTimeout(() => {
-        addForms.value.open({
-            title: '监测点信息'
-        })
-    }, 0)
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelMointorPointFormData(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        })
-            .then(() => {
-
-                deleteTempLineReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除成功!'
-                    })
-                    tableStore.index()
-                })
-            })
-
-    }
-}
-
-const exportEvent = () => {
-    let form = JSON.parse(JSON.stringify(tableStore.table.params))
-    form.pageNum = 1
-    form.pageSize = tableStore.table.total
-    getLoadTypeUserList(form).then(res => {
-        tableRef.value.getRef().exportData({
-            filename: '未建档非线性用户', // 文件名字
-            sheetName: 'Sheet1',
-            type: 'xlsx', //导出文件类型 xlsx 和 csv
-            useStyle: true,
-            data: res.data.records, // 数据源 // 过滤那个字段导出
-            columnFilterMethod: function (column: any) {
-                return !(column.$columnIndex === 0)
-            }
-        })
-    })
-}
-onMounted(() => {
-    tableStore.index()
-})
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    const fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    await getTempLineDetailsById({ id: fullId }).then(res => {
-        if (res && res.code == 'A0000') {
-            addForms.value.open({
-                title: '重新发起',
-                row: res.data
-            })
-        }
-    })
-}, { immediate: true })
-</script>
-
-<style scoped lang="scss">
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-
-::v-deep .el-input__wrapper {
-    // width: 200px !important;
-}
-</style>
+<!---终端入网检测-->
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="搜索">
+                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端、监测点名称"
+                clearable maxlength="32"  show-word-limit style="width: 230px"></el-input>
+            </el-form-item>
+            <el-form-item label="流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-option v-for="item in statusSelect" :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="addFormModel">新增</el-button>
+            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            <!-- <el-button icon="el-icon-Download" @click="exportEvent" type="primary">导出</el-button> -->
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+
+    <!-- 新增弹框 -->
+    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { getLoadTypeUserList } from '@/api/process-boot/interference'
+import addForm from './addForm.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+import { cancelMointorPointFormData, getTempLineDetailsById } from '@/api/supervision-boot/monitorpoint/index'
+import { deleteTempLineReport } from '@/api/supervision-boot/delete/index'
+import { getTerminalDetailsById } from "@/api/supervision-boot/terminal";
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+const TableHeaderRef = ref()
+const tableRef = ref()
+const areaOptionList = dictData.getBasicData('jibei_area')
+const statusSelect = dictData.statusSelect()
+
+const ruleFormRef = ref()
+const show: any = ref(false)
+const fileList = ref([])
+const tableStore = new TableStore({
+    url: '/supervision-boot/tempLine/list',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        // { field: 'orgName', title: '填报部门名称', minWidth: 170 },
+        {
+            field: 'powerSubstationName',
+            title: '电网侧电站',
+            minWidth: 170,
+            formatter: (row: any) => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        { field: 'connectedBus', title: '关联母线', minWidth: 170 },
+        { field: 'monitoringTerminalName', title: '所属终端', minWidth: 170 },
+        { field: 'lineName', title: '监测点名称', minWidth: 150 },
+        { field: 'reportDate', title: '填报日期', minWidth: 150 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+          
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 0)
+                    },
+
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
+    }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.searchValue = ''
+// tableStore.table.params.loadType = ''
+// tableStore.table.params.userName = ''
+// tableStore.table.params.fileUploadflag = ''
+
+provide('tableStore', tableStore)
+
+const addForms = ref()
+const addFormModel = () => {
+    setTimeout(() => {
+        addForms.value.open({
+            title: '监测点信息'
+        })
+    }, 0)
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelMointorPointFormData(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+
+                deleteTempLineReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除成功!'
+                    })
+                    tableStore.index()
+                })
+            })
+
+    }
+}
+
+const exportEvent = () => {
+    let form = JSON.parse(JSON.stringify(tableStore.table.params))
+    form.pageNum = 1
+    form.pageSize = tableStore.table.total
+    getLoadTypeUserList(form).then(res => {
+        tableRef.value.getRef().exportData({
+            filename: '未建档非线性用户', // 文件名字
+            sheetName: 'Sheet1',
+            type: 'xlsx', //导出文件类型 xlsx 和 csv
+            useStyle: true,
+            data: res.data.records, // 数据源 // 过滤那个字段导出
+            columnFilterMethod: function (column: any) {
+                return !(column.$columnIndex === 0)
+            }
+        })
+    })
+}
+onMounted(() => {
+    tableStore.index()
+})
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    const fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+    await getTempLineDetailsById({ id: fullId }).then(res => {
+        if (res && res.code == 'A0000') {
+            addForms.value.open({
+                title: '重新发起',
+                row: res.data
+            })
+        }
+    })
+}, { immediate: true })
+</script>
+
+<style scoped lang="scss">
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+
+::v-deep .el-input__wrapper {
+    // width: 200px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/index.vue
index 86b40a16..b2d1eb92 100644
--- a/src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise_hn/terminalNetworkDetection/components/terminainal/index.vue
@@ -1,372 +1,372 @@
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-        <template #select>
-            <el-form-item label="搜索">
-                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端名称"
-                clearable maxlength="32"  show-word-limit style="width: 180px"></el-input>
-            </el-form-item>
-            <el-form-item label="流程状态">
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
-                    <el-option v-for="item in statusSelect" :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="addFormModel">新增</el-button>
-            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
-            <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"
-                :loading="loading">模版下载</el-button>
-            <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
-        </template>
-    </TableHeader>
-    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
-
-    <!-- 新增弹框 -->
-    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
-    <!-- 上传模版 -->
-    <uploadATemplate ref="uploadATemplateRef" />
-
-    <!-- 上传模版 详情 -->
-    <el-dialog title="详情" width="80%" v-model="dialogShow" v-if="dialogShow">
-        <DetailInfo :id="userId"></DetailInfo>
-    </el-dialog>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, watch } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-import { downloadDevTemplate } from '@/api/supervision-boot/userReport/form'
-import { ElMessage } from 'element-plus'
-import { ElMessageBox } from 'element-plus/es'
-import DetailInfo from '@/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue'
-import { cancelTerminalFormData, getTerminalDetailsById } from '@/api/supervision-boot/terminal/index'
-import uploadATemplate from './uploadATemplate.vue'
-import addForm from './addForm.vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { deleteDevReport } from '@/api/supervision-boot/delete/index'
-import { getUserReportById } from "@/api/supervision-boot/interfere";
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const { push, options, currentRoute } = useRouter()
-const TableHeaderRef = ref()
-const userId = ref()
-const loading = ref(false)
-const tableRef = ref()
-const areaOptionList = dictData.getBasicData('jibei_area')
-const statusSelect = dictData.statusSelect()
-const ruleFormRef = ref()
-const uploadATemplateRef = ref()
-const show: any = ref(false)
-const fileList = ref([])
-const dialogShow = ref(false)
-const flag = ref(false)
-const tableStore = new TableStore({
-    url: '/supervision-boot/deVReport/list',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            width: '60',
-            type: 'checkbox'
-        },
-        { title: '序号', width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        {
-            field: 'orgName',
-            title: '填报部门名称',
-            minWidth: 170,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : ''
-                return row.cellValue
-            }
-        },
-        {
-            field: 'substationName',
-            title: '所属变电站',
-            minWidth: 170,
-            formatter: (row: any) => {
-                row.cellValue = row.cellValue ? row.cellValue : '/'
-                return row.cellValue
-            }
-        },
-        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
-        { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 170 },
-        { field: 'reportDate', title: '填报日期', minWidth: 170 },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        {
-            title: '操作',
-            minWidth: 150,
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.importType != 0 || !row.processInstanceId
-                    },
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-
-                {
-                    name: 'productSetting',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.importType != 1
-                    },
-                    click: row => {
-                        userId.value = row.id
-                        dialogShow.value = true
-                    }
-                },
-
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.importType == 1 ? false : row.createBy != adminInfo.$state.id || !(row.status == 0)
-                    },
-                    disabled: row => {
-                        return row.importType == 1 ? false : !(row.status == 0)
-                    },
-                    click: row => {
-                        addForms.value.open({
-                            title: '编辑',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        addForms.value.open({
-                            title: '重新发起',
-                            row: row
-                        })
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-
-    beforeSearchFun: () => {
-        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
-        // tableStore.table.params.relationUserName = tableStore.table.params.userName
-    }
-})
-tableStore.table.params.status = ''
-tableStore.table.params.searchValue = ''
-// tableStore.table.params.loadType = ''
-// tableStore.table.params.userName = ''
-// tableStore.table.params.fileUploadflag = ''
-
-provide('tableStore', tableStore)
-
-const addForms = ref()
-const addFormModel = () => {
-    setTimeout(() => {
-        addForms.value.open({
-            title: '终端信息'
-        })
-    }, 0)
-}
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelTerminalFormData(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-// 禁止点击
-const checkboxConfig = reactive({
-    checkMethod: ({ row }) => {
-        return adminInfo.roleCode.includes('delete_info')
-            ? true
-            : row.createBy == adminInfo.$state.id && row.status == 0
-    }
-})
-const deleteEven = () => {
-    if (tableStore.table.selection.length == 0) {
-        ElMessage({
-            type: 'warning',
-            message: '请选择要删除的数据'
-        })
-    } else {
-        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-        })
-            .then(() => {
-                deleteDevReport(tableStore.table.selection.map(item => item.id)).then(res => {
-                    ElMessage({
-                        type: 'success',
-                        message: '删除成功!'
-                    })
-                    tableStore.index()
-                })
-            })
-
-
-
-
-    }
-}
-
-//导出模板
-const exportExcelTemplate = async () => {
-    loading.value = true
-    downloadDevTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '终端入网检测模板'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-//批量导入用户数据
-const importUserData = () => {
-    uploadATemplateRef.value.open('导入终端入网检测')
-}
-onMounted(() => {
-    tableStore.index()
-})
-
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-/** 处理审批按钮 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-
-const props = defineProps({ id: { type: String, default: 'null' } })
-watch(() => props.id, async (newValue, oldValue) => {
-    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
-    const fullId = newValue.split('@')[0]
-    let nowTime = Date.now()
-    const routeTime = Number(newValue.split('@')[1])
-    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
-    await getTerminalDetailsById({ id: fullId }).then(res => {
-        if (res && res.code == 'A0000') {
-            addForms.value.open({
-                title: '重新发起',
-                row: res.data
-            })
-        }
-    })
-}, { immediate: true })
-
-</script>
-
-<style scoped lang="scss">
-:deep(.el-upload-list__item) {
-    width: 400px;
-}
-
-::v-deep .el-input__wrapper {
-    // width: 200px !important;
-}
-</style>
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+        <template #select>
+            <el-form-item label="搜索">
+                <el-input v-model="tableStore.table.params.searchValue" placeholder="输入变电站、终端名称"
+                clearable maxlength="32"  show-word-limit style="width: 180px"></el-input>
+            </el-form-item>
+            <el-form-item label="流程状态">
+                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择流程状态">
+                    <el-option v-for="item in statusSelect" :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="addFormModel">新增</el-button>
+            <el-button icon="el-icon-Delete" type="primary" @click="deleteEven">删除</el-button>
+            <el-button icon="el-icon-Download" type="primary" @click="exportExcelTemplate"
+                :loading="loading">模版下载</el-button>
+            <el-button icon="el-icon-Upload" type="primary" @click="importUserData">批量导入</el-button>
+        </template>
+    </TableHeader>
+    <Table ref="tableRef" :checkbox-config="checkboxConfig" />
+
+    <!-- 新增弹框 -->
+    <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
+    <!-- 上传模版 -->
+    <uploadATemplate ref="uploadATemplateRef" />
+
+    <!-- 上传模版 详情 -->
+    <el-dialog title="详情" width="80%" v-model="dialogShow" v-if="dialogShow">
+        <DetailInfo :id="userId"></DetailInfo>
+    </el-dialog>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, watch } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+import { downloadDevTemplate } from '@/api/supervision-boot/userReport/form'
+import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus/es'
+import DetailInfo from '@/views/pqs/supervise/terminalNetworkDetection/components/terminainal/detail.vue'
+import { cancelTerminalFormData, getTerminalDetailsById } from '@/api/supervision-boot/terminal/index'
+import uploadATemplate from './uploadATemplate.vue'
+import addForm from './addForm.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { deleteDevReport } from '@/api/supervision-boot/delete/index'
+import { getUserReportById } from "@/api/supervision-boot/interfere";
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const { push, options, currentRoute } = useRouter()
+const TableHeaderRef = ref()
+const userId = ref()
+const loading = ref(false)
+const tableRef = ref()
+const areaOptionList = dictData.getBasicData('jibei_area')
+const statusSelect = dictData.statusSelect()
+const ruleFormRef = ref()
+const uploadATemplateRef = ref()
+const show: any = ref(false)
+const fileList = ref([])
+const dialogShow = ref(false)
+const flag = ref(false)
+const tableStore = new TableStore({
+    url: '/supervision-boot/deVReport/list',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            width: '60',
+            type: 'checkbox'
+        },
+        { title: '序号', width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        {
+            field: 'orgName',
+            title: '填报部门名称',
+            minWidth: 170,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : ''
+                return row.cellValue
+            }
+        },
+        {
+            field: 'substationName',
+            title: '所属变电站',
+            minWidth: 170,
+            formatter: (row: any) => {
+                row.cellValue = row.cellValue ? row.cellValue : '/'
+                return row.cellValue
+            }
+        },
+        { field: 'monitoringTerminalName', title: '终端名称', minWidth: 170 },
+        { field: 'monitoringTerminalCode', title: '终端编号', minWidth: 170 },
+        { field: 'reportDate', title: '填报日期', minWidth: 170 },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: 100,
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: 150,
+           
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.importType != 0 || !row.processInstanceId
+                    },
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+
+                {
+                    name: 'productSetting',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.importType != 1
+                    },
+                    click: row => {
+                        userId.value = row.id
+                        dialogShow.value = true
+                    }
+                },
+
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.importType == 1 ? false : row.createBy != adminInfo.$state.id || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return row.importType == 1 ? false : !(row.status == 0)
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '编辑',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        addForms.value.open({
+                            title: '重新发起',
+                            row: row
+                        })
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+
+    beforeSearchFun: () => {
+        tableStore.table.params.orgNo = tableStore.table.params.deptIndex
+        // tableStore.table.params.relationUserName = tableStore.table.params.userName
+    }
+})
+tableStore.table.params.status = ''
+tableStore.table.params.searchValue = ''
+// tableStore.table.params.loadType = ''
+// tableStore.table.params.userName = ''
+// tableStore.table.params.fileUploadflag = ''
+
+provide('tableStore', tableStore)
+
+const addForms = ref()
+const addFormModel = () => {
+    setTimeout(() => {
+        addForms.value.open({
+            title: '终端信息'
+        })
+    }, 0)
+}
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelTerminalFormData(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+// 禁止点击
+const checkboxConfig = reactive({
+    checkMethod: ({ row }) => {
+        return adminInfo.roleCode.includes('delete_info')
+            ? true
+            : row.createBy == adminInfo.$state.id && row.status == 0
+    }
+})
+const deleteEven = () => {
+    if (tableStore.table.selection.length == 0) {
+        ElMessage({
+            type: 'warning',
+            message: '请选择要删除的数据'
+        })
+    } else {
+        ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        })
+            .then(() => {
+                deleteDevReport(tableStore.table.selection.map(item => item.id)).then(res => {
+                    ElMessage({
+                        type: 'success',
+                        message: '删除成功!'
+                    })
+                    tableStore.index()
+                })
+            })
+
+
+
+
+    }
+}
+
+//导出模板
+const exportExcelTemplate = async () => {
+    loading.value = true
+    downloadDevTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '终端入网检测模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+//批量导入用户数据
+const importUserData = () => {
+    uploadATemplateRef.value.open('导入终端入网检测')
+}
+onMounted(() => {
+    tableStore.index()
+})
+
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+/** 处理审批按钮 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+const props = defineProps({ id: { type: String, default: 'null' } })
+watch(() => props.id, async (newValue, oldValue) => {
+    if (newValue === 'null') return // 直接返回，避免后续逻辑执行
+    const fullId = newValue.split('@')[0]
+    let nowTime = Date.now()
+    const routeTime = Number(newValue.split('@')[1])
+    if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms，则不执行
+    await getTerminalDetailsById({ id: fullId }).then(res => {
+        if (res && res.code == 'A0000') {
+            addForms.value.open({
+                title: '重新发起',
+                row: res.data
+            })
+        }
+    })
+}, { immediate: true })
+
+</script>
+
+<style scoped lang="scss">
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+
+::v-deep .el-input__wrapper {
+    // width: 200px !important;
+}
+</style>
diff --git a/src/views/pqs/supervise_hn/testRun/testRun.vue b/src/views/pqs/supervise_hn/testRun/testRun.vue
index d0a69979..30b939b6 100644
--- a/src/views/pqs/supervise_hn/testRun/testRun.vue
+++ b/src/views/pqs/supervise_hn/testRun/testRun.vue
@@ -138,9 +138,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             minWidth: 230,
-            fixed: 'right',
+           
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/pqs/task/myTask/index.vue b/src/views/pqs/task/myTask/index.vue
index bb40f70c..49e6077f 100644
--- a/src/views/pqs/task/myTask/index.vue
+++ b/src/views/pqs/task/myTask/index.vue
@@ -1,143 +1,143 @@
-<!--业务用户管理界面-->
-<template>
-    <div class="default-main">
-        <TableHeader>
-            <template v-slot:select>
-                <el-form-item label='流程名称'>
-                    <el-input v-model='tableStore.table.params.name' clearable placeholder='流程名称' />
-                </el-form-item>
-                <el-form-item label='流程分类'>
-                    <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择流程分类">
-                        <el-option v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id" />
-                    </el-select>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref="tableRef"></Table>
-        <!-- 详情 -->
-        <Detail ref="detailRef" />
-    </div>
-</template>
-
-<script setup lang='ts'>
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
-import { useDictData } from '@/stores/dictData'
-import { pageTable } from '@/api/harmonic-boot/luckyexcel'
-import Detail from './components/detail.vue'
-
-defineOptions({
-    name: '/flowTask/mytask'
-})
-const dictData = useDictData()
-const tableRef = ref()
-const detailRef = ref()
-
-const tableStore = new TableStore({
-    url: '/process-boot/flowable/task/myProcess',
-    method: 'GET',
-    column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { title: '流程名称', field: 'procDefName', width: 200 },
-        { title: '流程类别', field: 'category', width: 200 },
-        { title: '流程版本', field: 'procDefVersion' },
-        { title: '提交时间', field: 'createTime' },
-        {
-            title: '流程状态', field: 'finishTime',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success'
-            },
-            formatter(row: any) {
-                return row.finishTime == null ? 0 : 1
-            }
-        },
-        { title: '流程名称', field: 'procDefName', width: 200 },
-        { title: '流程类别', field: 'category' },
-        {
-            title: '流程版本',
-            field: 'procDefVersion'
-        },
-        {
-            title: '提交时间',
-            field: 'createTime'
-        },
-        {
-            title: '流程状态',
-            field: 'finishTime',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success'
-            },
-            replaceValue: {
-                0: '进行中',
-                1: '已完成'
-            }
-        },
-        { title: '耗时', field: 'duration' },
-        {
-            title: '当前节点',
-            field: 'taskName'
-        },
-        {
-            title: '办理人',
-            field: 'assigneeName'
-        },
-
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        detailRef.value.open(row)
-                    }
-                },
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    click: row => {}
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.beginTime = tableStore.table.params.startTime
-        tableStore.table.params.deptId = tableStore.table.params.deptIndex
-    },
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.finishTime = item.finishTime == null ? '0' : '1'
-        })
-    }
-})
-
-onMounted(() => {
-    tableStore.index()
-})
-tableStore.table.params.name = ''
-provide('tableStore', tableStore)
-</script>
+<!--业务用户管理界面-->
+<template>
+    <div class="default-main">
+        <TableHeader>
+            <template v-slot:select>
+                <el-form-item label='流程名称'>
+                    <el-input v-model='tableStore.table.params.name' clearable placeholder='流程名称' />
+                </el-form-item>
+                <el-form-item label='流程分类'>
+                    <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择流程分类">
+                        <el-option v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref="tableRef"></Table>
+        <!-- 详情 -->
+        <Detail ref="detailRef" />
+    </div>
+</template>
+
+<script setup lang='ts'>
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { useDictData } from '@/stores/dictData'
+import { pageTable } from '@/api/harmonic-boot/luckyexcel'
+import Detail from './components/detail.vue'
+
+defineOptions({
+    name: '/flowTask/mytask'
+})
+const dictData = useDictData()
+const tableRef = ref()
+const detailRef = ref()
+
+const tableStore = new TableStore({
+    url: '/process-boot/flowable/task/myProcess',
+    method: 'GET',
+    column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { title: '流程名称', field: 'procDefName', width: 200 },
+        { title: '流程类别', field: 'category', width: 200 },
+        { title: '流程版本', field: 'procDefVersion' },
+        { title: '提交时间', field: 'createTime' },
+        {
+            title: '流程状态', field: 'finishTime',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            formatter(row: any) {
+                return row.finishTime == null ? 0 : 1
+            }
+        },
+        { title: '流程名称', field: 'procDefName', width: 200 },
+        { title: '流程类别', field: 'category' },
+        {
+            title: '流程版本',
+            field: 'procDefVersion'
+        },
+        {
+            title: '提交时间',
+            field: 'createTime'
+        },
+        {
+            title: '流程状态',
+            field: 'finishTime',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'success'
+            },
+            replaceValue: {
+                0: '进行中',
+                1: '已完成'
+            }
+        },
+        { title: '耗时', field: 'duration' },
+        {
+            title: '当前节点',
+            field: 'taskName'
+        },
+        {
+            title: '办理人',
+            field: 'assigneeName'
+        },
+
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        detailRef.value.open(row)
+                    }
+                },
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    click: row => {}
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.beginTime = tableStore.table.params.startTime
+        tableStore.table.params.deptId = tableStore.table.params.deptIndex
+    },
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.finishTime = item.finishTime == null ? '0' : '1'
+        })
+    }
+})
+
+onMounted(() => {
+    tableStore.index()
+})
+tableStore.table.params.name = ''
+provide('tableStore', tableStore)
+</script>
diff --git a/src/views/pqs/voltageSags/Region/transientList/index.vue b/src/views/pqs/voltageSags/Region/transientList/index.vue
index 3f26f78a..62a0d2a5 100644
--- a/src/views/pqs/voltageSags/Region/transientList/index.vue
+++ b/src/views/pqs/voltageSags/Region/transientList/index.vue
@@ -270,10 +270,10 @@ const tableStore = new TableStore({
         },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '150',
             render: 'buttons',
-            fixed: 'right',
+            
             buttons: [
                 {
                     name: 'edit',
diff --git a/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue b/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
index 33461041..44d6322e 100644
--- a/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
+++ b/src/views/pqs/voltageSags/analyse/eventCorrelation/index.vue
@@ -89,13 +89,15 @@ const tableStore = new TableStore({
                 0: 'warning',
                 1: 'success',
                 2: 'success',
-                3: 'warning'
+                3: 'warning',
+                null: 'info'
             },
             replaceValue: {
                 0: '未处理',
                 1: '已处理',
                 2: '已处理,无结果',
-                3: '计算失败'
+                3: '计算失败',
+                null: '/'
             }
         },
         {
@@ -112,7 +114,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/voltageSags/analyse/eventwaveform/index.vue b/src/views/pqs/voltageSags/analyse/eventwaveform/index.vue
index 317e1225..6fdc9113 100644
--- a/src/views/pqs/voltageSags/analyse/eventwaveform/index.vue
+++ b/src/views/pqs/voltageSags/analyse/eventwaveform/index.vue
@@ -131,7 +131,7 @@ const tableStore = new TableStore({
             title: '事件关联分析描述'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '200',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/voltageSags/analyse/impactscope/index.vue b/src/views/pqs/voltageSags/analyse/impactscope/index.vue
index c20933e1..a07cb68f 100644
--- a/src/views/pqs/voltageSags/analyse/impactscope/index.vue
+++ b/src/views/pqs/voltageSags/analyse/impactscope/index.vue
@@ -119,7 +119,7 @@ const tableStore = new TableStore({
             title: '事件关联分析描述'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '200',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
index fdc92e2e..50f7d0d0 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/eventStudy/index.vue
@@ -83,10 +83,10 @@ const tableStore = new TableStore({
         { title: '持续时间(s)', field: 'duration', minWidth: '100' },
         // { title: '严重度', field: 'severity', minWidth: '80' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '180',
             render: 'buttons',
-            fixed: 'right',
+            
             buttons: [
                 {
                     name: 'edit',
diff --git a/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue b/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue
index cb42d34a..afc7a4b3 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/transientReport/index.vue
@@ -201,6 +201,10 @@ const exportEvent = () => {
     ElMessage('生成报告中,请稍等!')
     getLineExport(formd.value)
         .then((res: any) => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
             })
@@ -234,6 +238,10 @@ const preview = () => {
     formd.value.flag = TableHeaderRef.value.datePickerRef.interval
     ElMessage('生成报告中,请稍等!')
     getLineExport(formd.value).then((res: any) => {
+        if (res == undefined) {
+            loading.value = false
+            return
+        }
         let blob = new Blob([res], {
             type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
         })
diff --git a/src/views/pqs/voltageSags/monitoringPoint/transientList/index.vue b/src/views/pqs/voltageSags/monitoringPoint/transientList/index.vue
index 1c4f5437..e1c07efb 100644
--- a/src/views/pqs/voltageSags/monitoringPoint/transientList/index.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/transientList/index.vue
@@ -118,7 +118,7 @@ const tableStore: any = new TableStore({
         { field: 'duration', title: '持续时间(s)', minWidth: '100' },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '120',
             render: 'buttons',
             buttons: [
diff --git a/src/views/pqs/voltageSags/report/eventReports/index.vue b/src/views/pqs/voltageSags/report/eventReports/index.vue
index 1ee61645..d32e2ef7 100644
--- a/src/views/pqs/voltageSags/report/eventReports/index.vue
+++ b/src/views/pqs/voltageSags/report/eventReports/index.vue
@@ -51,16 +51,15 @@ defineOptions({
 })
 const dictData = useDictData()
 const triggerType = dictData.getBasicData('Event_Statis')
-const sign:any = dictData.getBasicData('power_flag')
+const sign: any = dictData.getBasicData('power_flag')
 const tableRef = ref()
 const tableStore = new TableStore({
-  
     url: '/event-boot/report/getEventReport',
     method: 'POST',
     column: [
         {
             title: '序号',
-            
+
             align: 'center',
             width: 80,
             formatter: (row: any) => {
@@ -69,40 +68,43 @@ const tableStore = new TableStore({
         },
         {
             field: 'startTime',
-            title: '暂态事件发生时刻',
+            title: '发生时刻',
             width: '180',
             formatter: (row: any) => {
                 return row.cellValue ? row.cellValue.replace('T', ' ') : '/'
             }
         },
-        { field: 'gdName', title: '供电公司' },
-        { field: 'subName', title: '变电站' },
-        { field: 'ip', title: '网络参数' ,width:'120px' },
-        { field: 'lineName', title: '监测点' },
+        { field: 'gdName', title: '供电公司', minWidth: '120' },
+        { field: 'subName', title: '变电站', minWidth: '120' },
+        { field: 'ip', title: '网络参数', width: '120px' },
+        { field: 'lineName', title: '监测点', minWidth: '120' },
         {
             field: 'eventType',
-            title: '触发类型',
+            title: '触发类型',minWidth: '100' ,
             formatter: (row: any) => {
                 return triggerType.filter(item => item.id === row.cellValue)[0].name
             }
         },
         {
             field: 'advanceType',
-            title: '暂态类型'
+            title: '暂态类型',
+            minWidth: '100'
         },
         {
             field: 'advanceReason',
-            title: '暂态原因'
+            title: '暂态原因',
+            minWidth: '100'
         },
         {
             field: 'voltageScale',
             title: '电压等级',
-            width: '100'
+            minWidth: '100'
         },
         {
             field: 'featureAmplitude',
             title: '暂降(骤升)幅值(%)',
-            width: '140',formatter: (row: any) => {
+            width: '140',
+            formatter: (row: any) => {
                 // return (row.cellValue * 100).toFixed(0)
                 return Math.floor(row.cellValue * 10000) / 100
             }
@@ -111,17 +113,16 @@ const tableStore = new TableStore({
             field: 'duration',
             title: '持续时间(s)',
             width: '100'
-        },
+        }
         // { field: 'severity', title: '严重度' }
-    ],
-
+    ]
 })
 tableStore.table.params.comFlag = '1'
 tableStore.table.params.monitorFlag = 0
 tableStore.table.params.powerFlag = sign[0]?.algoDescribe || 0
 tableStore.table.params.serverName = 'event-boot'
-tableStore.table.params.waveType=''
-tableStore.table.params.searchValue=''
+tableStore.table.params.waveType = ''
+tableStore.table.params.searchValue = ''
 tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', [
     'Report_Type',
     'Manufacturer',
@@ -135,7 +136,6 @@ onMounted(() => {
     tableStore.index()
 })
 const exportEvent = () => {
-
     let form: any = JSON.parse(JSON.stringify(tableStore.table.params))
     form.pageNum = 1
     form.pageSize = tableStore.table.total
diff --git a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
index 172aa3b3..6eee2329 100644
--- a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
+++ b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
@@ -254,6 +254,10 @@ const exportEvent = () => {
     ElMessage('生成报告中,请稍等!')
     getLineExport(formd.value)
         .then((res: any) => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
             let blob = new Blob([res], {
                 type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
             })
diff --git a/src/views/pqs/voltageSags/report/regionalReports/index.vue b/src/views/pqs/voltageSags/report/regionalReports/index.vue
index f4ee73bb..0b6dae41 100644
--- a/src/views/pqs/voltageSags/report/regionalReports/index.vue
+++ b/src/views/pqs/voltageSags/report/regionalReports/index.vue
@@ -9,7 +9,7 @@
                 ></PointTree>
             </pane>
             <pane style="background: #fff" :style="height">
-                <TableHeader ref="TableHeaderRef" date-picker  :show-search="false">
+                <TableHeader ref="TableHeaderRef" date-picker :show-search="false">
                     <template v-slot:select>
                         <el-form-item label="报告类型">
                             <el-select v-model="tableStore.table.params.waveType" placeholder="请选择" clearable>
@@ -33,7 +33,9 @@
                         </el-form-item> -->
                     </template>
                     <template #operation>
-                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">生成报告</el-button>
+                        <el-button icon="el-icon-Download" type="primary" @click="exportEvent" :loading="loading">
+                            生成报告
+                        </el-button>
                     </template>
                 </TableHeader>
                 <div class="box" :style="`height: calc(${tableStore.table.height} + 45px)`">
@@ -164,7 +166,7 @@ defineOptions({
 })
 const height = mainHeight(20)
 const size = ref(19)
-const dotList:any = ref({})
+const dotList: any = ref({})
 const dictData = useDictData()
 const waveTypeList = ref([
     {
@@ -281,23 +283,29 @@ const exportEvent = () => {
     formInline.value.waveType = tableStore.table.params.waveType
     formInline.value.interval = tableStore.table.params.timeFlag
     ElMessage('生成报告中,请稍等!')
-    getAreaReport(formInline.value).then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
-        })
+    getAreaReport(formInline.value)
+        .then((res: any) => {
+            if (res == undefined) {
+                loading.value = false
+                return
+            }
+            let blob = new Blob([res], {
+                type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=UTF-8'
+            })
 
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a') // 创建a标签
-        link.href = url
-        // link.download = "电压暂降事件分析报告"; // 设置下载的文件名
-        link.download = dotList.value.name +'区域报告' + dayjs().format('YYYYMMDD') // 设置下载的文件名
-        document.body.appendChild(link)
-        link.click() //执行下载
-        document.body.removeChild(link)
-        loading.value = false
-    }).catch(() => {
-        loading.value = false
-    })
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a') // 创建a标签
+            link.href = url
+            // link.download = "电压暂降事件分析报告"; // 设置下载的文件名
+            link.download = dotList.value.name + '区域报告' + dayjs().format('YYYYMMDD') // 设置下载的文件名
+            document.body.appendChild(link)
+            link.click() //执行下载
+            document.body.removeChild(link)
+            loading.value = false
+        })
+        .catch(() => {
+            loading.value = false
+        })
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/pqs/voltageSags/report/weekly/index.vue b/src/views/pqs/voltageSags/report/weekly/index.vue
index 7a177137..d48be26f 100644
--- a/src/views/pqs/voltageSags/report/weekly/index.vue
+++ b/src/views/pqs/voltageSags/report/weekly/index.vue
@@ -88,21 +88,22 @@ const list = ref([
             },
             { field: 'startTime', title: '暂降事件发生时刻', width: '200' },
             { field: 'gdName', title: '供电公司', width: '150' },
-            { field: 'subName', title: '变电站' },
-            { field: 'lineName', title: '监测点' },
+            { field: 'subName', title: '变电站', minWidth: '150' },
+            { field: 'lineName', title: '监测点', minWidth: '150' },
             {
                 field: 'objName',
                 title: '监测点对象名称',
-                formatter: ({ row }: any) => (row.objName ? row.objName : '/')
+                minWidth: '150',
+                formatter: (row: any) => (row.cellValue ? row.cellValue : '/')
             },
-            { field: 'voltageScale', title: '电压等级', width: '150' },
+            { field: 'voltageScale', title: '电压等级', width: '80' },
             { field: 'loadType', title: '干扰源类型', width: '150' },
 
             {
                 field: 'featureAmplitude',
                 title: '暂降(骤升)幅值(%)',
                 width: '150',
-                formatter: ({ row }: any) => {
+                formatter: (row: any) => {
                     return Math.floor(row.cellValue * 10000) / 100
                 }
             },
@@ -159,7 +160,7 @@ const list = ref([
             { field: 'subName', title: '变电站' },
             { field: 'subScale', title: '变电站电压等级' },
             { field: 'gdName', title: '供电公司', width: '150' },
-            { field: 'times', title: '暂升次数', width: '150' }
+            { field: 'times', title: '暂升次数', width: '130' }
         ]
     },
     {
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/IncomingTable.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/IncomingTable.vue
index 6657ee93..483cc82b 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/IncomingTable.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/IncomingTable.vue
@@ -1,99 +1,99 @@
-<!--进线管理界面-->
-<template>
-    <div class='default-main'>
-        <TableHeader>
-            <template v-slot:operation>
-                <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref='tableRef'></Table>
-        <!--弹框-->
-        <incoming-line-popup ref='incomingLinePopup' />
-    </div>
-</template>
-<script setup lang='ts'>
-import { provide, ref } from 'vue'
-import { Plus } from '@element-plus/icons-vue'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import IncomingLinePopup from './incomingLinePopup.vue'
-import TableStore from '@/utils/tableStore'
-import { ElMessage } from 'element-plus'
-import { deleteSgIncomingLine } from '@/api/advance-boot/sgGroven/incomingLine'
-
-//进线信息弹出框
-const incomingLinePopup = ref()
-
-
-const userId = ref()
-
-const tableStore = new TableStore({
-    url: '',
-    method: 'GET',
-    publicHeight: 350,
-    showPage: false,
-    column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { title: '进线名称', field: 'name' },
-        { title: '监测点名称', field: 'lineName' },
-        {
-            title: '操作',
-            align: 'center',
-            width: '150',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'update',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        incomingLinePopup.value.open('修改进线', row)
-                    }
-                },
-                {
-                    name: 'update',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        deleteSgIncomingLine(row.id).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ]
-})
-
-const getTableData = (tempId: string) => {
-    userId.value = tempId
-    tableStore.url = '/advance-boot/sgIncomingLine/list?userId=' + userId.value
-    tableStore.index()
-}
-
-
-/**********新增、编辑进线************/
-//新增进线信息
-const add = () => {
-    incomingLinePopup.value.open('新增进线', { userId: userId.value })
-}
-
-
-provide('tableStore', tableStore)
-defineExpose({ getTableData })
-
+<!--进线管理界面-->
+<template>
+    <div class='default-main'>
+        <TableHeader>
+            <template v-slot:operation>
+                <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref='tableRef'></Table>
+        <!--弹框-->
+        <incoming-line-popup ref='incomingLinePopup' />
+    </div>
+</template>
+<script setup lang='ts'>
+import { provide, ref } from 'vue'
+import { Plus } from '@element-plus/icons-vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import IncomingLinePopup from './incomingLinePopup.vue'
+import TableStore from '@/utils/tableStore'
+import { ElMessage } from 'element-plus'
+import { deleteSgIncomingLine } from '@/api/advance-boot/sgGroven/incomingLine'
+
+//进线信息弹出框
+const incomingLinePopup = ref()
+
+
+const userId = ref()
+
+const tableStore = new TableStore({
+    url: '',
+    method: 'GET',
+    publicHeight: 350,
+    showPage: false,
+    column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { title: '进线名称', field: 'name' },
+        { title: '监测点名称', field: 'lineName' },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            width: '150',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'update',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        incomingLinePopup.value.open('修改进线', row)
+                    }
+                },
+                {
+                    name: 'update',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteSgIncomingLine(row.id).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ]
+})
+
+const getTableData = (tempId: string) => {
+    userId.value = tempId
+    tableStore.url = '/advance-boot/sgIncomingLine/list?userId=' + userId.value
+    tableStore.index()
+}
+
+
+/**********新增、编辑进线************/
+//新增进线信息
+const add = () => {
+    incomingLinePopup.value.open('新增进线', { userId: userId.value })
+}
+
+
+provide('tableStore', tableStore)
+defineExpose({ getTableData })
+
 </script>
\ No newline at end of file
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue
index c04b26b1..8899a701 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/event/eventView.vue
@@ -1,270 +1,270 @@
-<template>
-    <div class='default-main'>
-        <!-- 表头 -->
-        <TableHeader date-picker ref='tableHeader'>
-            <template v-slot:select>
-                <el-form-item label='用户'>
-                    <el-select v-model='tableStore.table.params.userId' filterable @change='changeUser'>
-                        <el-option v-for='item in userListData' :key='item.id' :label='item.userName'
-                            :value='item.id' />
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <!--返回按钮-->
-                <back-component />
-            </template>
-        </TableHeader>
-        <!--导入暂降数据查询框-->
-        <event-upload-popup ref='eventUploadPopup' />
-
-        <el-radio-group v-model='radio' id='tabTitle' @change='switchRadio'>
-            <el-radio-button value='暂降数据' >暂降数据</el-radio-button>
-            <el-radio-button value='电压暂降事件统计' >电压暂降事件统计</el-radio-button>
-            <el-radio-button value='耐受曲线信息' >耐受曲线信息</el-radio-button>
-        </el-radio-group>
-        <div class='tableExtraButton'>
-            <el-button :icon='Upload' type='primary' @click='importEventData'>导入</el-button>
-            <el-button :icon='Download' type='primary' @click='exportExcel'>数据导出</el-button>
-            <el-button :icon='Download' type='primary' @click='exportExcelTemplate'>下载模板</el-button>
-        </div>
-
-        <div style='position: relative;'>
-            <!-- 表格 -->
-            <Table ref='tableRef' />
-
-            <Transition name='el-fade-in-linear' mode='out-in'>
-                <Sags3D ref='sags3DRef' v-if="radio == '电压暂降事件统计'" />
-            </Transition>
-
-            <Transition name='el-fade-in-linear' mode='out-in'>
-                <ToleranceCurve ref='toleranceCurveRef' v-if="radio == '耐受曲线信息'" />
-            </Transition>
-
-        </div>
-    </div>
-</template>
-<script setup lang='ts'>
-import { Upload, Download } from '@element-plus/icons-vue'
-import { ref, provide, reactive, onMounted } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import Sags3D from './sags3D.vue'
-import ToleranceCurve from './toleranceCurve.vue'
-import BackComponent from '@/components/icon/back/index.vue'
-import { useRoute } from 'vue-router'
-import { sgUserList } from '@/api/advance-boot/sgGroven/sgUser'
-import EventUploadPopup from '@/views/pqs/voltageSags/sagGovern/businessUser/event/eventUploadPopup.vue'
-import { calcEventLoss, deleteSgEvent, downloadTemplate, exportEventData } from '@/api/advance-boot/sgGroven/sgEvent'
-import { ElMessage } from 'element-plus'
-
-const tableHeader = ref()
-const { query } = useRoute()
-const userId = ref()
-// 注意名字不要重复，若要保持页面存活，名字需要和路由admin后面的字符保持一致
-defineOptions({
-    name: 'sagVoltageData'
-})
-const radio = ref('暂降数据')
-const eventUploadPopup = ref()
-const sags3DRef = ref()
-const toleranceCurveRef = ref()
-const userListData: any = reactive([])
-
-const tableStore = new TableStore({
-    // 若页面表格高度需要调整，请修改publicHeight(内容区域除表格外其他内容的高度)
-    url: '/advance-boot/sgEvent/list',
-    method: 'POST',
-    publicHeight: 40,
-    column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { title: '进线', field: 'incomingLineName', minWidth: '130' },
-        { title: '发生时间', field: 'startTime', minWidth: '220', sortable: true },
-        { title: '暂降幅值(p.u.)', field: 'featureAmplitude', minWidth: '130', sortable: true },
-        { title: '持续时间(ms)', field: 'duration', minWidth: '130', sortable: true },
-        { title: '预计损失(万元)', field: 'estimatedLoss', minWidth: '130', sortable: true },
-        {
-            title: '数据来源', field: 'dataSource', minWidth: '130',
-            formatter: (obj: any) => {
-                return obj.row.dataSource == 0 ? '离线导入' : '监测点同步'
-            }
-        },
-        {
-            title: '操作',
-            align: 'center',
-            width: '230',
-            render: 'buttons',
-            buttons: [
-                // {
-                //     name: 'productSetting',
-                //     title: '波形查看',
-                //     type: 'primary',
-                //     icon: 'el-icon-EditPen',
-                //     render: 'basicButton',
-                //     disabled: row => {
-                //         return row.fileFlag !== 0
-                //     }
-                //     // click: async row => {
-                //     //     dialogFormVisible.value = true
-                //     //     dialogTitle.value = '前置机修改'
-                //     //     formData.value = JSON.parse(JSON.stringify(row))
-                //     // }
-                // },
-                {
-                    name: 'productSetting',
-                    title: '计算损失',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        calcEventLoss(row.id).then(res => {
-                            ElMessage.success('计算成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-                // {
-                //     name: 'productSetting',
-                //     title: '暂无波形',
-                //     type: 'primary',
-                //     icon: 'el-icon-EditPen',
-                //     render: 'basicButton',
-                //     disabled: row => {
-                //         return row.fileFlag !== 1
-                //     }
-                // },
-                {
-                    name: 'update',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        deleteSgEvent(row.id).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.searchBeginTime = tableHeader.value.datePickerRef.timeValue[0]
-        tableStore.table.params.searchEndTime = tableHeader.value.datePickerRef.timeValue[1]
-        for (let key in tableStore.table.params) {
-            if (tableStore.table.params[key] === '') {
-                delete tableStore.table.params[key]
-            }
-        }
-        sags3DRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime)
-        toleranceCurveRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime)
-    }
-})
-// 注入到子组件
-provide('tableStore', tableStore)
-onMounted(() => {
-    // tableHeader.value.setTheDate(1)
-})
-//初始化页面
-const initData = async () => {
-    //先查询所有用户列表
-    await sgUserList().then(res => {
-        Object.assign(userListData, res.data)
-    })
-    userId.value = query.id
-    tableStore.table.params.userId = userId.value
-    tableStore.index()
-    sags3DRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime)
-    toleranceCurveRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime)
-}
-
-initData()
-
-const switchRadio = () => {
-    if (radio.value == '电压暂降事件统计') {
-        sags3DRef.value?.search(userId.value, tableHeader.value.datePickerRef.timeValue[0], tableHeader.value.datePickerRef.timeValue[1])
-    } else if (radio.value == '耐受曲线信息') {
-        toleranceCurveRef.value?.search(userId.value, tableHeader.value.datePickerRef.timeValue[0], tableHeader.value.datePickerRef.timeValue[1])
-    }
-}
-
-
-//用户信息更换
-const changeUser = () => {
-    userId.value = tableStore.table.params.userId
-}
-
-//批量导入暂降数据
-const importEventData = () => {
-    // 弹出框，联级选择生产线--进线，上传文件
-    eventUploadPopup.value.open('导入暂降数据', userId.value)
-}
-
-// 导出表格
-const exportExcel = () => {
-    const param = {
-        userId: userId.value,
-        searchBeginTime: tableHeader.value.datePickerRef.timeValue[0],
-        searchEndTime: tableHeader.value.datePickerRef.timeValue[1]
-    }
-    exportEventData(param).then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '暂降事件数据'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-}
-
-//导出模板
-const exportExcelTemplate = () => {
-    downloadTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'text/csv'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '暂降事件模板'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-}
-
-</script>
-<style scoped>
-.tableExtraButton {
-    position: absolute;
-    right: 17px;
-    top: 55px;
-}
-
-#tabTitle {
-    border-left: 1px solid var(--el-border-color);
-    border-right: 1px solid var(--el-border-color);
-    width: 100%;
-    padding: 0 0 5px 5px;
-    margin-top: -5px;
-}
-
-.cn-table-header {
-    border-bottom: 0 !important;
-}
-</style>
+<template>
+    <div class='default-main'>
+        <!-- 表头 -->
+        <TableHeader date-picker ref='tableHeader'>
+            <template v-slot:select>
+                <el-form-item label='用户'>
+                    <el-select v-model='tableStore.table.params.userId' filterable @change='changeUser'>
+                        <el-option v-for='item in userListData' :key='item.id' :label='item.userName'
+                            :value='item.id' />
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <!--返回按钮-->
+                <back-component />
+            </template>
+        </TableHeader>
+        <!--导入暂降数据查询框-->
+        <event-upload-popup ref='eventUploadPopup' />
+
+        <el-radio-group v-model='radio' id='tabTitle' @change='switchRadio'>
+            <el-radio-button value='暂降数据' >暂降数据</el-radio-button>
+            <el-radio-button value='电压暂降事件统计' >电压暂降事件统计</el-radio-button>
+            <el-radio-button value='耐受曲线信息' >耐受曲线信息</el-radio-button>
+        </el-radio-group>
+        <div class='tableExtraButton'>
+            <el-button :icon='Upload' type='primary' @click='importEventData'>导入</el-button>
+            <el-button :icon='Download' type='primary' @click='exportExcel'>数据导出</el-button>
+            <el-button :icon='Download' type='primary' @click='exportExcelTemplate'>下载模板</el-button>
+        </div>
+
+        <div style='position: relative;'>
+            <!-- 表格 -->
+            <Table ref='tableRef' />
+
+            <Transition name='el-fade-in-linear' mode='out-in'>
+                <Sags3D ref='sags3DRef' v-if="radio == '电压暂降事件统计'" />
+            </Transition>
+
+            <Transition name='el-fade-in-linear' mode='out-in'>
+                <ToleranceCurve ref='toleranceCurveRef' v-if="radio == '耐受曲线信息'" />
+            </Transition>
+
+        </div>
+    </div>
+</template>
+<script setup lang='ts'>
+import { Upload, Download } from '@element-plus/icons-vue'
+import { ref, provide, reactive, onMounted } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import Sags3D from './sags3D.vue'
+import ToleranceCurve from './toleranceCurve.vue'
+import BackComponent from '@/components/icon/back/index.vue'
+import { useRoute } from 'vue-router'
+import { sgUserList } from '@/api/advance-boot/sgGroven/sgUser'
+import EventUploadPopup from '@/views/pqs/voltageSags/sagGovern/businessUser/event/eventUploadPopup.vue'
+import { calcEventLoss, deleteSgEvent, downloadTemplate, exportEventData } from '@/api/advance-boot/sgGroven/sgEvent'
+import { ElMessage } from 'element-plus'
+
+const tableHeader = ref()
+const { query } = useRoute()
+const userId = ref()
+// 注意名字不要重复，若要保持页面存活，名字需要和路由admin后面的字符保持一致
+defineOptions({
+    name: 'sagVoltageData'
+})
+const radio = ref('暂降数据')
+const eventUploadPopup = ref()
+const sags3DRef = ref()
+const toleranceCurveRef = ref()
+const userListData: any = reactive([])
+
+const tableStore = new TableStore({
+    // 若页面表格高度需要调整，请修改publicHeight(内容区域除表格外其他内容的高度)
+    url: '/advance-boot/sgEvent/list',
+    method: 'POST',
+    publicHeight: 40,
+    column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { title: '进线', field: 'incomingLineName', minWidth: '130' },
+        { title: '发生时间', field: 'startTime', minWidth: '220', sortable: true },
+        { title: '暂降幅值(p.u.)', field: 'featureAmplitude', minWidth: '130', sortable: true },
+        { title: '持续时间(ms)', field: 'duration', minWidth: '130', sortable: true },
+        { title: '预计损失(万元)', field: 'estimatedLoss', minWidth: '130', sortable: true },
+        {
+            title: '数据来源', field: 'dataSource', minWidth: '130',
+            formatter: (obj: any) => {
+                return obj.row.dataSource == 0 ? '离线导入' : '监测点同步'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            width: '230',
+            render: 'buttons',
+            buttons: [
+                // {
+                //     name: 'productSetting',
+                //     title: '波形查看',
+                //     type: 'primary',
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+                //     disabled: row => {
+                //         return row.fileFlag !== 0
+                //     }
+                //     // click: async row => {
+                //     //     dialogFormVisible.value = true
+                //     //     dialogTitle.value = '前置机修改'
+                //     //     formData.value = JSON.parse(JSON.stringify(row))
+                //     // }
+                // },
+                {
+                    name: 'productSetting',
+                    title: '计算损失',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        calcEventLoss(row.id).then(res => {
+                            ElMessage.success('计算成功')
+                            tableStore.index()
+                        })
+                    }
+                },
+                // {
+                //     name: 'productSetting',
+                //     title: '暂无波形',
+                //     type: 'primary',
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+                //     disabled: row => {
+                //         return row.fileFlag !== 1
+                //     }
+                // },
+                {
+                    name: 'update',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteSgEvent(row.id).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.searchBeginTime = tableHeader.value.datePickerRef.timeValue[0]
+        tableStore.table.params.searchEndTime = tableHeader.value.datePickerRef.timeValue[1]
+        for (let key in tableStore.table.params) {
+            if (tableStore.table.params[key] === '') {
+                delete tableStore.table.params[key]
+            }
+        }
+        sags3DRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime)
+        toleranceCurveRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime)
+    }
+})
+// 注入到子组件
+provide('tableStore', tableStore)
+onMounted(() => {
+    // tableHeader.value.setTheDate(1)
+})
+//初始化页面
+const initData = async () => {
+    //先查询所有用户列表
+    await sgUserList().then(res => {
+        Object.assign(userListData, res.data)
+    })
+    userId.value = query.id
+    tableStore.table.params.userId = userId.value
+    tableStore.index()
+    sags3DRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime)
+    toleranceCurveRef.value?.search(userId.value, tableStore.table.params.searchBeginTime, tableStore.table.params.searchEndTime)
+}
+
+initData()
+
+const switchRadio = () => {
+    if (radio.value == '电压暂降事件统计') {
+        sags3DRef.value?.search(userId.value, tableHeader.value.datePickerRef.timeValue[0], tableHeader.value.datePickerRef.timeValue[1])
+    } else if (radio.value == '耐受曲线信息') {
+        toleranceCurveRef.value?.search(userId.value, tableHeader.value.datePickerRef.timeValue[0], tableHeader.value.datePickerRef.timeValue[1])
+    }
+}
+
+
+//用户信息更换
+const changeUser = () => {
+    userId.value = tableStore.table.params.userId
+}
+
+//批量导入暂降数据
+const importEventData = () => {
+    // 弹出框，联级选择生产线--进线，上传文件
+    eventUploadPopup.value.open('导入暂降数据', userId.value)
+}
+
+// 导出表格
+const exportExcel = () => {
+    const param = {
+        userId: userId.value,
+        searchBeginTime: tableHeader.value.datePickerRef.timeValue[0],
+        searchEndTime: tableHeader.value.datePickerRef.timeValue[1]
+    }
+    exportEventData(param).then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '暂降事件数据'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+}
+
+//导出模板
+const exportExcelTemplate = () => {
+    downloadTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'text/csv'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '暂降事件模板'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+}
+
+</script>
+<style scoped>
+.tableExtraButton {
+    position: absolute;
+    right: 17px;
+    top: 55px;
+}
+
+#tabTitle {
+    border-left: 1px solid var(--el-border-color);
+    border-right: 1px solid var(--el-border-color);
+    width: 100%;
+    padding: 0 0 5px 5px;
+    margin-top: -5px;
+}
+
+.cn-table-header {
+    border-bottom: 0 !important;
+}
+</style>
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/index.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/index.vue
index 243ad20d..89b26c24 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/index.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/index.vue
@@ -102,7 +102,7 @@ const tableStore = new TableStore({
         },
 
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '230',
             render: 'buttons',
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/machine/index.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/machine/index.vue
index f62b86db..3a08141e 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/machine/index.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/machine/index.vue
@@ -1,170 +1,170 @@
-<!--终端管理界面-->
-<template>
-  <div class='default-main'>
-    <TableHeader :showReset="false">
-      <template v-slot:select>
-        <el-form-item label='生产线'>
-          <el-select v-model='tableStore.table.params.productLineId'>
-            <el-option
-                v-for='item in productLineList'
-                :key='item.id'
-                :label='item.name'
-                :value='item.id'
-            />
-          </el-select>
-        </el-form-item>
-      </template>
-      <template v-slot:operation>
-        <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>
-        <!--返回按钮-->
-        <back-component />
-      </template>
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef'></Table>
-    <!--终端弹出框-->
-    <machine-popup ref='machinePopup' />
-    <!--终端详细弹出框，管理元器件-->
-    <machine-detail ref='machineDetail' />
-  </div>
-</template>
-
-<script setup lang='ts'>
-import { Plus } from '@element-plus/icons-vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { provide, ref, reactive } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { querySgProductLineByUserId } from '@/api/advance-boot/sgGroven/sgProductLine'
-import { deleteSgMachine } from '@/api/advance-boot/sgGroven/sgMachine'
-import MachinePopup from './machinePopup.vue'
-import MachineDetail from '@/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/machineDetail.vue'
-import BackComponent from '@/components/icon/back/index.vue'
-
-let productLineList: any = ref([])
-
-const machinePopup = ref()
-const machineDetail = ref()
-
-defineOptions({
-  name: 'machine'
-})
-const { go } = useRouter()
-const { query } = useRoute()
-
-
-const tableStore = new TableStore({
-  url: '/advance-boot/sgMachine/list',
-  method: 'POST',
-  column: [
-  { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-    { title: '终端名称', minWidth: '160', field: 'name' },
-    { title: '终端型号', minWidth: '140', field: 'type' },
-    { title: '终端损失(万元)', width: '140', field: 'machineLoss' },
-    { title: '原料损失(万元)', width: '140', field: 'materialLoss' },
-    { title: '产线功率(kW)', width: '140', field: 'machinePower' },
-    {
-      title: '操作',
-      align: 'center',
-      render: 'buttons',
-      minWidth: '230',
-      fixed: 'right',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '元器件管理',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: async row => {
-            machineDetail.value.open('元器件管理', row)
-          }
-        },
-        {
-          name: 'update',
-          title: '编辑',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            machinePopup.value.open('修改终端', row)
-          }
-        },
-        {
-          name: 'update',
-          title: '删除',
-          type: 'danger',
-          icon: 'el-icon-Delete',
-          render: 'confirmButton',
-          popconfirm: {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            confirmButtonType: 'danger',
-            title: '确定删除吗？'
-          },
-          click: row => {
-            deleteSgMachine(row.id).then(res => {
-              ElMessage.success('删除成功')
-              tableStore.index()
-            })
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
-    }
-
-  }
-})
-
-
-const getTableData = async () => {
-  //根据用户查询下面所有的生产线，默认根据第一个生产线获取下面所有终端
-  await querySgProductLineByUserId(query.id).then(res => {
-    productLineList.value = res.data
-    // //如果没有传就用第一个
-    if (productLineList.value && productLineList.value.length > 0) {
-      if (query.productLineId) {
-        tableStore.table.params.productLineId = query.productLineId
-      } else {
-        tableStore.table.params.productLineId = productLineList.value[0].id
-      }
-
-    }
-  })
-  if (tableStore.table.params.productLineId) {
-    tableStore.index()
-  } else {
-    ElMessage.error('请新增一条生产线')
-    tableStore.table.loading = false
-  }
-}
-
-
-getTableData()
-
-provide('tableStore', tableStore)
-
-
-const add = () => {
-  if (tableStore.table.params.productLineId) {
-    let data = {
-      productLineId: tableStore.table.params.productLineId
-    }
-    machinePopup.value.open('新增终端', data)
-  } else {
-    ElMessage.error('请新增一条生产线')
-  }
-
-}
-
-</script>
+<!--终端管理界面-->
+<template>
+  <div class='default-main'>
+    <TableHeader :showReset="false">
+      <template v-slot:select>
+        <el-form-item label='生产线'>
+          <el-select v-model='tableStore.table.params.productLineId'>
+            <el-option
+                v-for='item in productLineList'
+                :key='item.id'
+                :label='item.name'
+                :value='item.id'
+            />
+          </el-select>
+        </el-form-item>
+      </template>
+      <template v-slot:operation>
+        <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>
+        <!--返回按钮-->
+        <back-component />
+      </template>
+    </TableHeader>
+    <!--表格-->
+    <Table ref='tableRef'></Table>
+    <!--终端弹出框-->
+    <machine-popup ref='machinePopup' />
+    <!--终端详细弹出框，管理元器件-->
+    <machine-detail ref='machineDetail' />
+  </div>
+</template>
+
+<script setup lang='ts'>
+import { Plus } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { provide, ref, reactive } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+import { querySgProductLineByUserId } from '@/api/advance-boot/sgGroven/sgProductLine'
+import { deleteSgMachine } from '@/api/advance-boot/sgGroven/sgMachine'
+import MachinePopup from './machinePopup.vue'
+import MachineDetail from '@/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/machineDetail.vue'
+import BackComponent from '@/components/icon/back/index.vue'
+
+let productLineList: any = ref([])
+
+const machinePopup = ref()
+const machineDetail = ref()
+
+defineOptions({
+  name: 'machine'
+})
+const { go } = useRouter()
+const { query } = useRoute()
+
+
+const tableStore = new TableStore({
+  url: '/advance-boot/sgMachine/list',
+  method: 'POST',
+  column: [
+  { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+    { title: '终端名称', minWidth: '160', field: 'name' },
+    { title: '终端型号', minWidth: '140', field: 'type' },
+    { title: '终端损失(万元)', width: '140', field: 'machineLoss' },
+    { title: '原料损失(万元)', width: '140', field: 'materialLoss' },
+    { title: '产线功率(kW)', width: '140', field: 'machinePower' },
+    {
+       title: '操作',fixed: 'right',
+      align: 'center',
+      render: 'buttons',
+      minWidth: '230',
+    
+      buttons: [
+        {
+          name: 'productSetting',
+          title: '元器件管理',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: async row => {
+            machineDetail.value.open('元器件管理', row)
+          }
+        },
+        {
+          name: 'update',
+          title: '编辑',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            machinePopup.value.open('修改终端', row)
+          }
+        },
+        {
+          name: 'update',
+          title: '删除',
+          type: 'danger',
+          icon: 'el-icon-Delete',
+          render: 'confirmButton',
+          popconfirm: {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            confirmButtonType: 'danger',
+            title: '确定删除吗？'
+          },
+          click: row => {
+            deleteSgMachine(row.id).then(res => {
+              ElMessage.success('删除成功')
+              tableStore.index()
+            })
+          }
+        }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    for (let key in tableStore.table.params) {
+      if (tableStore.table.params[key] === '') {
+        delete tableStore.table.params[key]
+      }
+    }
+
+  }
+})
+
+
+const getTableData = async () => {
+  //根据用户查询下面所有的生产线，默认根据第一个生产线获取下面所有终端
+  await querySgProductLineByUserId(query.id).then(res => {
+    productLineList.value = res.data
+    // //如果没有传就用第一个
+    if (productLineList.value && productLineList.value.length > 0) {
+      if (query.productLineId) {
+        tableStore.table.params.productLineId = query.productLineId
+      } else {
+        tableStore.table.params.productLineId = productLineList.value[0].id
+      }
+
+    }
+  })
+  if (tableStore.table.params.productLineId) {
+    tableStore.index()
+  } else {
+    ElMessage.error('请新增一条生产线')
+    tableStore.table.loading = false
+  }
+}
+
+
+getTableData()
+
+provide('tableStore', tableStore)
+
+
+const add = () => {
+  if (tableStore.table.params.productLineId) {
+    let data = {
+      productLineId: tableStore.table.params.productLineId
+    }
+    machinePopup.value.open('新增终端', data)
+  } else {
+    ElMessage.error('请新增一条生产线')
+  }
+
+}
+
+</script>
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue
index 5b26de89..978ff346 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/productLine/index.vue
@@ -1,148 +1,148 @@
-<!--生产线管理界面-->
-<template>
-  <div class='default-main'>
-    <TableHeader :showReset="false">
-      <template v-slot:operation>
-<!--        <el-button type='primary' @click='refresh' class='ml10' :icon='Refresh'>刷新</el-button>-->
-        <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>
-        <!--返回按钮-->
-        <back-component />
-      </template>
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef'></Table>
-    <!--弹框-->
-    <product-popup ref='productLine' />
-  </div>
-</template>
-
-<script setup lang='ts'>
-import { Plus, Refresh } from '@element-plus/icons-vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { provide, ref } from 'vue'
-import { useRouter, useRoute } from 'vue-router'
-import { deleteSgProductLine } from '@/api/advance-boot/sgGroven/sgProductLine'
-import ProductPopup from './productPopup.vue'
-import BackComponent from '@/components/icon/back/index.vue'
-
-const productLine = ref()
-
-defineOptions({
-  name: 'productLine'
-})
-const { push } = useRouter()
-const { query } = useRoute()
-
-
-const tableStore = new TableStore({
-  url: '/advance-boot/sgProductLine/list',
-  method: 'POST',
-  column: [
-  { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-    { title: '用户名', minWidth: '130', field: 'userName' },
-    { title: '进线名称', minWidth: '130', field: 'incomingLineName' },
-    { title: '产线名称', minWidth: '130', field: 'name' },
-    { title: '产能损失(万元)', width: '120', field: 'capacityLoss' },
-    { title: '终端损失(万元)', width: '120', field: 'machineLoss' },
-    { title: '原料损失(万元)', width: '120', field: 'materialLoss' },
-    { title: '产线功率(kW)', width: '120', field: 'machinePower' },
-    {
-      title: '计算模式',
-      titlePrefix: { message: '模式一：单次中断不计算终端、原料损失 \n 模式二：单次中断计算终端、原料损失', icon: 'vxe-icon-question-circle-fill' },
-      render: 'tag',
-      width: '120',
-      field: 'calcMode',
-      replaceValue: {
-        '0': '模式一',
-        '1': '模式二'
-      }
-    },
-    {
-      title: '操作',
-      align: 'center',
-      render: 'buttons',
-      minWidth: '230',
-      fixed: 'right',
-      buttons: [
-        {
-          name: 'productSetting',
-          title: '终端管理',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            push(`/admin/businessUserRouter/machine?id=${query.id}&productLineId=${row.id}`)
-          }
-        },
-        {
-          name: 'update',
-          title: '编辑',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            productLine.value.open('修改生产线', row)
-          }
-        },
-        {
-          name: 'update',
-          title: '删除',
-          type: 'danger',
-          icon: 'el-icon-Delete',
-          render: 'confirmButton',
-          popconfirm: {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            confirmButtonType: 'danger',
-            title: '确定删除吗？'
-          },
-          click: row => {
-            deleteSgProductLine(row.id).then(res => {
-              ElMessage.success('删除成功')
-              tableStore.index()
-            })
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    if (tableStore.table.params.addr) {
-      tableStore.table.params.addrStrOption = tableStore.table.params.addr.map(tempArray => tempArray.join('/'))
-    }
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
-    }
-
-  }
-})
-
-const getTableData = () => {
-  tableStore.table.params.userId = query.id
-  tableStore.index()
-}
-getTableData()
-
-provide('tableStore', tableStore)
-
-//新增
-const add = () => {
-  let data = {
-    userId: query.id
-  }
-  productLine.value.open('新增生产线', data)
-}
-
-//刷新
-const refresh = () => {
-  tableStore.index()
-}
-
-</script>
+<!--生产线管理界面-->
+<template>
+  <div class='default-main'>
+    <TableHeader :showReset="false">
+      <template v-slot:operation>
+<!--        <el-button type='primary' @click='refresh' class='ml10' :icon='Refresh'>刷新</el-button>-->
+        <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>
+        <!--返回按钮-->
+        <back-component />
+      </template>
+    </TableHeader>
+    <!--表格-->
+    <Table ref='tableRef'></Table>
+    <!--弹框-->
+    <product-popup ref='productLine' />
+  </div>
+</template>
+
+<script setup lang='ts'>
+import { Plus, Refresh } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { provide, ref } from 'vue'
+import { useRouter, useRoute } from 'vue-router'
+import { deleteSgProductLine } from '@/api/advance-boot/sgGroven/sgProductLine'
+import ProductPopup from './productPopup.vue'
+import BackComponent from '@/components/icon/back/index.vue'
+
+const productLine = ref()
+
+defineOptions({
+  name: 'productLine'
+})
+const { push } = useRouter()
+const { query } = useRoute()
+
+
+const tableStore = new TableStore({
+  url: '/advance-boot/sgProductLine/list',
+  method: 'POST',
+  column: [
+  { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+    { title: '用户名', minWidth: '130', field: 'userName' },
+    { title: '进线名称', minWidth: '130', field: 'incomingLineName' },
+    { title: '产线名称', minWidth: '130', field: 'name' },
+    { title: '产能损失(万元)', width: '120', field: 'capacityLoss' },
+    { title: '终端损失(万元)', width: '120', field: 'machineLoss' },
+    { title: '原料损失(万元)', width: '120', field: 'materialLoss' },
+    { title: '产线功率(kW)', width: '120', field: 'machinePower' },
+    {
+      title: '计算模式',
+      titlePrefix: { message: '模式一：单次中断不计算终端、原料损失 \n 模式二：单次中断计算终端、原料损失', icon: 'vxe-icon-question-circle-fill' },
+      render: 'tag',
+      width: '120',
+      field: 'calcMode',
+      replaceValue: {
+        '0': '模式一',
+        '1': '模式二'
+      }
+    },
+    {
+       title: '操作',fixed: 'right',
+      align: 'center',
+      render: 'buttons',
+      minWidth: '230',
+    
+      buttons: [
+        {
+          name: 'productSetting',
+          title: '终端管理',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            push(`/admin/businessUserRouter/machine?id=${query.id}&productLineId=${row.id}`)
+          }
+        },
+        {
+          name: 'update',
+          title: '编辑',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            productLine.value.open('修改生产线', row)
+          }
+        },
+        {
+          name: 'update',
+          title: '删除',
+          type: 'danger',
+          icon: 'el-icon-Delete',
+          render: 'confirmButton',
+          popconfirm: {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            confirmButtonType: 'danger',
+            title: '确定删除吗？'
+          },
+          click: row => {
+            deleteSgProductLine(row.id).then(res => {
+              ElMessage.success('删除成功')
+              tableStore.index()
+            })
+          }
+        }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    if (tableStore.table.params.addr) {
+      tableStore.table.params.addrStrOption = tableStore.table.params.addr.map(tempArray => tempArray.join('/'))
+    }
+    for (let key in tableStore.table.params) {
+      if (tableStore.table.params[key] === '') {
+        delete tableStore.table.params[key]
+      }
+    }
+
+  }
+})
+
+const getTableData = () => {
+  tableStore.table.params.userId = query.id
+  tableStore.index()
+}
+getTableData()
+
+provide('tableStore', tableStore)
+
+//新增
+const add = () => {
+  let data = {
+    userId: query.id
+  }
+  productLine.value.open('新增生产线', data)
+}
+
+//刷新
+const refresh = () => {
+  tableStore.index()
+}
+
+</script>
diff --git a/src/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/unitTable.vue b/src/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/unitTable.vue
index 844ba39a..0b123c9f 100644
--- a/src/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/unitTable.vue
+++ b/src/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/unitTable.vue
@@ -1,147 +1,147 @@
-<!--进线管理界面-->
-<template>
-  <div class='default-main unitButton'>
-    <TableHeader style='padding: 0 0 !important;'>
-      <template v-slot:operation>
-        <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>
-      </template>
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef' isGroup></Table>
-    <!--弹框-->
-    <unit-popup ref='unitPopup' />
-  </div>
-</template>
-<script setup lang='ts'>
-import { provide, ref } from 'vue'
-import { Plus } from '@element-plus/icons-vue'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import TableStore from '@/utils/tableStore'
-import UnitPopup from '@/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/unitPopup.vue'
-import { deleteSgSensitiveUnit } from '@/api/advance-boot/sgGroven/sgSensitiveUnit'
-import { ElMessage } from 'element-plus'
-
-const unitPopup = ref()
-
-const tableStore = new TableStore({
-  url: '/advance-boot/sgSensitiveUnit/list',
-  method: 'POST',
-  publicHeight: 300,
-  showPage: false,
-  column: [
-    { title: '元器件名称', minWidth: 110, field: 'name' },
-    {
-      title: '灵敏度', minWidth: 80, field: 'sensitivity',
-      formatter: (row: any) => {
-        let temp
-        switch (row.sensitivity) {
-          case 1:
-            temp = '高'
-            break
-          case 2:
-            temp = '中'
-            break
-          case 3:
-            temp = '低'
-            break
-          default:
-            temp = '标准'
-        }
-        return temp
-      }
-    },
-    {
-      title: '耐受能力', minWidth: 90, field: 'standardFlag',
-      formatter: (row: any) => {
-        return row.standardFlag == 0 ? '否' : '是'
-      }
-    },
-    {
-      title: '上限曲线',
-      children: [
-        { title: '持续时间(ms)', minWidth: '110', field: 'vtcTimeUpper' },
-        { title: '暂降幅值(p.u.)', minWidth: '110', field: 'vtcAmpUpper' }
-      ]
-    },
-    {
-      title: '下限曲线',
-      children: [
-        { title: '持续时间(ms)', minWidth: '110', field: 'vtcTimeLower' },
-        { title: '暂降幅值(p.u.)', minWidth: '110', field: 'vtcAmpLower' }
-      ]
-    },
-    {
-      title: '操作',
-      align: 'center',
-      render: 'buttons',
-      width: '140',
-      fixed: 'right',
-      buttons: [
-        {
-          name: 'update',
-          title: '编辑',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            unitPopup.value.open('修改元器件', row)
-          }
-        },
-        {
-          name: 'update',
-          title: '删除',
-          type: 'danger',
-          icon: 'el-icon-Delete',
-          render: 'confirmButton',
-          popconfirm: {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            confirmButtonType: 'danger',
-            title: '确定删除吗？'
-          },
-          click: row => {
-            deleteSgSensitiveUnit(row.id).then(res => {
-                ElMessage.success('删除成功')
-                tableStore.index()
-            })
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
-    }
-
-  }
-})
-
-const getTableData = (tempId: string) => {
-  tableStore.table.params.machineId = tempId
-  tableStore.index()
-}
-
-
-/**********新增、编辑元器件************/
-//新增进线信息
-const add = () => {
-  const data = {
-    machineId: tableStore.table.params.machineId
-  }
-  unitPopup.value.open('新增元器件', data)
-}
-
-provide('tableStore', tableStore)
-defineExpose({ getTableData })
-
-</script>
-
-<style >
-.unitButton .table-header {
-  padding: 5px 15px !important;
-}
+<!--进线管理界面-->
+<template>
+  <div class='default-main unitButton'>
+    <TableHeader style='padding: 0 0 !important;'>
+      <template v-slot:operation>
+        <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增</el-button>
+      </template>
+    </TableHeader>
+    <!--表格-->
+    <Table ref='tableRef' isGroup></Table>
+    <!--弹框-->
+    <unit-popup ref='unitPopup' />
+  </div>
+</template>
+<script setup lang='ts'>
+import { provide, ref } from 'vue'
+import { Plus } from '@element-plus/icons-vue'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import TableStore from '@/utils/tableStore'
+import UnitPopup from '@/views/pqs/voltageSags/sagGovern/businessUser/sensitiveUnit/unitPopup.vue'
+import { deleteSgSensitiveUnit } from '@/api/advance-boot/sgGroven/sgSensitiveUnit'
+import { ElMessage } from 'element-plus'
+
+const unitPopup = ref()
+
+const tableStore = new TableStore({
+  url: '/advance-boot/sgSensitiveUnit/list',
+  method: 'POST',
+  publicHeight: 300,
+  showPage: false,
+  column: [
+    { title: '元器件名称', minWidth: 110, field: 'name' },
+    {
+      title: '灵敏度', minWidth: 80, field: 'sensitivity',
+      formatter: (row: any) => {
+        let temp
+        switch (row.sensitivity) {
+          case 1:
+            temp = '高'
+            break
+          case 2:
+            temp = '中'
+            break
+          case 3:
+            temp = '低'
+            break
+          default:
+            temp = '标准'
+        }
+        return temp
+      }
+    },
+    {
+      title: '耐受能力', minWidth: 90, field: 'standardFlag',
+      formatter: (row: any) => {
+        return row.standardFlag == 0 ? '否' : '是'
+      }
+    },
+    {
+      title: '上限曲线',
+      children: [
+        { title: '持续时间(ms)', minWidth: '110', field: 'vtcTimeUpper' },
+        { title: '暂降幅值(p.u.)', minWidth: '110', field: 'vtcAmpUpper' }
+      ]
+    },
+    {
+      title: '下限曲线',
+      children: [
+        { title: '持续时间(ms)', minWidth: '110', field: 'vtcTimeLower' },
+        { title: '暂降幅值(p.u.)', minWidth: '110', field: 'vtcAmpLower' }
+      ]
+    },
+    {
+       title: '操作',fixed: 'right',
+      align: 'center',
+      render: 'buttons',
+      width: '140',
+      
+      buttons: [
+        {
+          name: 'update',
+          title: '编辑',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            unitPopup.value.open('修改元器件', row)
+          }
+        },
+        {
+          name: 'update',
+          title: '删除',
+          type: 'danger',
+          icon: 'el-icon-Delete',
+          render: 'confirmButton',
+          popconfirm: {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            confirmButtonType: 'danger',
+            title: '确定删除吗？'
+          },
+          click: row => {
+            deleteSgSensitiveUnit(row.id).then(res => {
+                ElMessage.success('删除成功')
+                tableStore.index()
+            })
+          }
+        }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    for (let key in tableStore.table.params) {
+      if (tableStore.table.params[key] === '') {
+        delete tableStore.table.params[key]
+      }
+    }
+
+  }
+})
+
+const getTableData = (tempId: string) => {
+  tableStore.table.params.machineId = tempId
+  tableStore.index()
+}
+
+
+/**********新增、编辑元器件************/
+//新增进线信息
+const add = () => {
+  const data = {
+    machineId: tableStore.table.params.machineId
+  }
+  unitPopup.value.open('新增元器件', data)
+}
+
+provide('tableStore', tableStore)
+defineExpose({ getTableData })
+
+</script>
+
+<style >
+.unitButton .table-header {
+  padding: 5px 15px !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/pqs/voltageSags/sagGovern/scheme/index.vue b/src/views/pqs/voltageSags/sagGovern/scheme/index.vue
index 39eefd05..7a065a08 100644
--- a/src/views/pqs/voltageSags/sagGovern/scheme/index.vue
+++ b/src/views/pqs/voltageSags/sagGovern/scheme/index.vue
@@ -1,192 +1,192 @@
-<!--暂降治理历史数据管理界面-->
-<template>
-    <div class='default-main'>
-        <TableHeader>
-            <template v-slot:select>
-                <el-form-item label='用户'>
-                    <el-select v-model='tableStore.table.params.userId' filterable clearable>
-                        <el-option
-                            v-for='item in userListData'
-                            :key='item.id'
-                            :label='item.userName'
-                            :value='item.id'
-                        />
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增治理方案</el-button>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref='tableRef' isGroup></Table>
-        <!--弹出表格-->
-        <machine-detail-popup ref='machineDetailTable' />
-    </div>
-</template>
-
-<script setup lang='ts'>
-import { Plus } from '@element-plus/icons-vue'
-import { ElMessage } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
-import { useRouter } from 'vue-router'
-import { sgUserList } from '@/api/advance-boot/sgGroven/sgUser'
-import { deleteSgScheme } from '@/api/advance-boot/sgGroven/sgScheme'
-
-import machineDetailPopup from '@/views/pqs/voltageSags/sagGovern/scheme/machineDetailPopup.vue'
-
-defineOptions({
-    name: 'governSchemeHistory'
-})
-
-const machineDetailTable = ref()
-const machineDetailData = ref()
-const { push } = useRouter()
-const userListData: any = ref([])
-// const showPower = (id: string) => {
-//     alert(id)
-// }
-
-window.showPower = function(id: string) {
-    //根据生产线查询该生产线下的所有终端数据
-    machineDetailTable.value.open('终端容量信息', id)
-}
-
-
-const tableStore = new TableStore({
-    url: '/advance-boot/sagGovernScheme/list',
-    method: 'POST',
-    column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { title: '用户', field: 'userName', minWidth: 160 },
-        { title: '生产线名称', field: 'productLineName', minWidth: 160 },
-        { title: '期望回报(年)', field: 'payBackPeriod', minWidth: 150 },
-        { title: '数据时间范围', field: 'timeScope', minWidth: 170 },
-        {
-            title: '治理容量(kW)', field: 'governPower', minWidth: 150, type: 'html',
-            formatter: (obj: any) => {
-                const val = obj.row.governPower
-                const id = obj.row.productLineId
-                return `<a href='javascript:void(0);'  style='color: #409EFF;text-decoration: none' onclick='window.showPower("${id}")'>${val}</a>`
-            }
-        },
-        {
-            title: '最佳方案',
-            children: [
-                {
-                    title: '方案名称', minWidth: '110', field: 'schemeType',
-                    formatter: (obj: any) => {
-                        let temp
-                        switch (obj.row.schemeType) {
-                            case 1:
-                                temp = 'AVC'
-                                break
-                            case 2:
-                                temp = 'AVC-RTS'
-                                break
-                            case 3:
-                                temp = '快切'
-                                break
-                            default:
-                                temp = 'UPS'
-                        }
-                        return temp
-                    }
-                },
-                {
-                    title: '初期投资(万元)', minWidth: '150', field: 'initialInvest',
-                    formatter: (obj: any) => {
-                        return (Number(obj.row.schemeEquipment) + Number(obj.row.schemeMaintain)).toFixed(2)
-                    }
-                },
-                { title: '投资回收期(年)', minWidth: '150', field: 'payBackYear' },
-                { title: '治理效果(万元/年)', minWidth: '150', field: 'governEffect' }
-            ]
-        },
-        {
-            title: '操作',
-            align: 'center',
-            minWidth: '150',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        push(`/admin/sagGovernScheme/schemeHistory?id=${row.id}`)
-                    }
-                },
-                {
-                    name: 'update',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        deleteSgScheme(row.id).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        if (tableStore.table.params.addr) {
-            tableStore.table.params.addrStrOption = tableStore.table.params.addr.map(tempArray => tempArray.join('/'))
-        }
-        // for (let key in tableStore.table.params) {
-        //     if (tableStore.table.params[key] === '') {
-        //         delete tableStore.table.params[key]
-        //     }
-        // }
-
-    }
-})
-
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-tableStore.table.params.userId = ''
-provide('tableStore', tableStore)
-
-//初始化用户下拉选择框
-const initUserSelect = async () => {
-    await sgUserList().then(res => {
-        if (res.data && res.data.length > 0) {
-            userListData.value = res.data
-        }
-    })
-}
-
-initUserSelect()
-
-
-//新增用户信息
-const add = () => {
-    let userId = undefined
-    if (tableStore.table.params.userId) {
-        userId = tableStore.table.params.userId
-    }
-    push(`/admin/sagGovernScheme/schemeCalc?userId=${userId}`)
-}
-
-</script>
+<!--暂降治理历史数据管理界面-->
+<template>
+    <div class='default-main'>
+        <TableHeader>
+            <template v-slot:select>
+                <el-form-item label='用户'>
+                    <el-select v-model='tableStore.table.params.userId' filterable clearable>
+                        <el-option
+                            v-for='item in userListData'
+                            :key='item.id'
+                            :label='item.userName'
+                            :value='item.id'
+                        />
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增治理方案</el-button>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref='tableRef' isGroup></Table>
+        <!--弹出表格-->
+        <machine-detail-popup ref='machineDetailTable' />
+    </div>
+</template>
+
+<script setup lang='ts'>
+import { Plus } from '@element-plus/icons-vue'
+import { ElMessage } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { sgUserList } from '@/api/advance-boot/sgGroven/sgUser'
+import { deleteSgScheme } from '@/api/advance-boot/sgGroven/sgScheme'
+
+import machineDetailPopup from '@/views/pqs/voltageSags/sagGovern/scheme/machineDetailPopup.vue'
+
+defineOptions({
+    name: 'governSchemeHistory'
+})
+
+const machineDetailTable = ref()
+const machineDetailData = ref()
+const { push } = useRouter()
+const userListData: any = ref([])
+// const showPower = (id: string) => {
+//     alert(id)
+// }
+
+window.showPower = function(id: string) {
+    //根据生产线查询该生产线下的所有终端数据
+    machineDetailTable.value.open('终端容量信息', id)
+}
+
+
+const tableStore = new TableStore({
+    url: '/advance-boot/sagGovernScheme/list',
+    method: 'POST',
+    column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { title: '用户', field: 'userName', minWidth: 160 },
+        { title: '生产线名称', field: 'productLineName', minWidth: 160 },
+        { title: '期望回报(年)', field: 'payBackPeriod', minWidth: 150 },
+        { title: '数据时间范围', field: 'timeScope', minWidth: 170 },
+        {
+            title: '治理容量(kW)', field: 'governPower', minWidth: 150, type: 'html',
+            formatter: (obj: any) => {
+                const val = obj.row.governPower
+                const id = obj.row.productLineId
+                return `<a href='javascript:void(0);'  style='color: #409EFF;text-decoration: none' onclick='window.showPower("${id}")'>${val}</a>`
+            }
+        },
+        {
+            title: '最佳方案',
+            children: [
+                {
+                    title: '方案名称', minWidth: '110', field: 'schemeType',
+                    formatter: (obj: any) => {
+                        let temp
+                        switch (obj.row.schemeType) {
+                            case 1:
+                                temp = 'AVC'
+                                break
+                            case 2:
+                                temp = 'AVC-RTS'
+                                break
+                            case 3:
+                                temp = '快切'
+                                break
+                            default:
+                                temp = 'UPS'
+                        }
+                        return temp
+                    }
+                },
+                {
+                    title: '初期投资(万元)', minWidth: '150', field: 'initialInvest',
+                    formatter: (obj: any) => {
+                        return (Number(obj.row.schemeEquipment) + Number(obj.row.schemeMaintain)).toFixed(2)
+                    }
+                },
+                { title: '投资回收期(年)', minWidth: '150', field: 'payBackYear' },
+                { title: '治理效果(万元/年)', minWidth: '150', field: 'governEffect' }
+            ]
+        },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            minWidth: '150',
+            render: 'buttons',
+          
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        push(`/admin/sagGovernScheme/schemeHistory?id=${row.id}`)
+                    }
+                },
+                {
+                    name: 'update',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteSgScheme(row.id).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        if (tableStore.table.params.addr) {
+            tableStore.table.params.addrStrOption = tableStore.table.params.addr.map(tempArray => tempArray.join('/'))
+        }
+        // for (let key in tableStore.table.params) {
+        //     if (tableStore.table.params[key] === '') {
+        //         delete tableStore.table.params[key]
+        //     }
+        // }
+
+    }
+})
+
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+tableStore.table.params.userId = ''
+provide('tableStore', tableStore)
+
+//初始化用户下拉选择框
+const initUserSelect = async () => {
+    await sgUserList().then(res => {
+        if (res.data && res.data.length > 0) {
+            userListData.value = res.data
+        }
+    })
+}
+
+initUserSelect()
+
+
+//新增用户信息
+const add = () => {
+    let userId = undefined
+    if (tableStore.table.params.userId) {
+        userId = tableStore.table.params.userId
+    }
+    push(`/admin/sagGovernScheme/schemeCalc?userId=${userId}`)
+}
+
+</script>
diff --git a/src/views/setting/dictionary/component/index.vue b/src/views/setting/dictionary/component/index.vue
index 368f9fa5..ba280aeb 100644
--- a/src/views/setting/dictionary/component/index.vue
+++ b/src/views/setting/dictionary/component/index.vue
@@ -47,7 +47,7 @@ const tableStore = new TableStore({
         { field: 'path', title: '组件路径' },
         { field: 'image', title: '组件展示', render: 'image' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             render: 'buttons',
             buttons: [
                 {
diff --git a/src/views/setting/dictionary/list/detail.vue b/src/views/setting/dictionary/list/detail.vue
index de4f01c0..6a637fd3 100644
--- a/src/views/setting/dictionary/list/detail.vue
+++ b/src/views/setting/dictionary/list/detail.vue
@@ -1,153 +1,153 @@
-<template>
-    <div class="dictiontary-list-detail child-router">
-        <TableHeader>
-            <template #select>
-                <el-form-item label="">
-                    <el-page-header @back="$emit('close')">
-                        <template #content>
-                            <span class="text-large font-600 mr-3">{{ props.detail.name }}详情信息</span>
-                        </template>
-                    </el-page-header>
-                </el-form-item>
-                <el-form-item label="过滤筛选">
-                    <el-input
-                        style="width: 240px"
-                        v-model="tableStore.table.params.searchValue"
-                        clearable
-                        placeholder="请输入名称或编码筛选"
-                    />
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button :icon="Plus" type="primary" @click="add">新增</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <PopupDetailEdit ref="popupEditRef"></PopupDetailEdit>
-    </div>
-</template>
-<script setup lang="ts">
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { ElMessage } from 'element-plus'
-import PopupDetailEdit from './popupDetailEdit.vue'
-import { dictDataDelete } from '@/api/system-boot/dicData'
-
-defineOptions({
-    name: 'setting/dictionary/list/detail'
-})
-
-interface Props {
-    detail: anyObj
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    detail: () => {
-        return {}
-    }
-})
-const popupEditRef = ref()
-const tableStore = new TableStore({
-    url: '/system-boot/dictData/getTypeIdData',
-    method: 'POST',
-    column: [
-        { title: '名称', field: 'name' },
-        { title: '编码', field: 'code' },
-        { title: '排序', field: 'sort' },
-        { title: '计算值', field: 'value' },
-        { title: '事件等级', field: 'levelName' },
-        { title: '算法描述', field: 'algoDescribe' },
-        { title: '状态', field: 'stateName' },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        popupEditRef.value.open('编辑', {
-                            ...row,
-                            openDescribe: props.detail.openDescribe,
-                            openLevel: props.detail.openLevel,
-                            typeName: props.detail.name + row.name,
-                            typeId: props.detail.id
-                        })
-                    }
-                },
-                {
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除该字典类型吗？'
-                    },
-                    click: row => {
-                        dictDataDelete([row.id]).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.stateName = item.state === 1 ? '正常' : '删除'
-            switch (item.level) {
-                case 0:
-                    item.levelName = '普通'
-                    break
-                case 1:
-                    item.levelName = '中等'
-                    break
-                case 2:
-                    item.levelName = '严重'
-                    break
-                default:
-                    item.levelName = '未知'
-                    break
-            }
-            for (let key in item) {
-                if (typeof item[key] !== 'number') {
-                    item[key] = item[key] || '/'
-                }
-            }
-        })
-    }
-})
-
-provide('tableStore', tableStore)
-tableStore.table.params.searchValue = ''
-tableStore.table.params.searchState = 0
-tableStore.table.params.typeId = props.detail.id
-if (props.detail.openLevel !== 1) {
-    tableStore.table.column = tableStore.table.column.filter((item: any) => item.field !== 'levelName')
-}
-if (props.detail.openDescribe !== 1) {
-    tableStore.table.column = tableStore.table.column.filter((item: any) => item.field !== 'algoDescribe')
-}
-onMounted(() => {
-    tableStore.index()
-})
-const add = () => {
-    popupEditRef.value.open('新增', {
-        openLevel: props.detail.openLevel,
-        openDescribe: props.detail.openDescribe,
-        typeName: props.detail.name,
-        typeId: props.detail.id
-    })
-}
-</script>
+<template>
+    <div class="dictiontary-list-detail child-router">
+        <TableHeader>
+            <template #select>
+                <el-form-item label="">
+                    <el-page-header @back="$emit('close')">
+                        <template #content>
+                            <span class="text-large font-600 mr-3">{{ props.detail.name }}详情信息</span>
+                        </template>
+                    </el-page-header>
+                </el-form-item>
+                <el-form-item label="过滤筛选">
+                    <el-input
+                        style="width: 240px"
+                        v-model="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="请输入名称或编码筛选"
+                    />
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button :icon="Plus" type="primary" @click="add">新增</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <PopupDetailEdit ref="popupEditRef"></PopupDetailEdit>
+    </div>
+</template>
+<script setup lang="ts">
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage } from 'element-plus'
+import PopupDetailEdit from './popupDetailEdit.vue'
+import { dictDataDelete } from '@/api/system-boot/dicData'
+
+defineOptions({
+    name: 'setting/dictionary/list/detail'
+})
+
+interface Props {
+    detail: anyObj
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    detail: () => {
+        return {}
+    }
+})
+const popupEditRef = ref()
+const tableStore = new TableStore({
+    url: '/system-boot/dictData/getTypeIdData',
+    method: 'POST',
+    column: [
+        { title: '名称', field: 'name' },
+        { title: '编码', field: 'code' },
+        { title: '排序', field: 'sort' },
+        { title: '计算值', field: 'value' },
+        { title: '事件等级', field: 'levelName' },
+        { title: '算法描述', field: 'algoDescribe' },
+        { title: '状态', field: 'stateName' },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+        
+            buttons: [
+                {
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        popupEditRef.value.open('编辑', {
+                            ...row,
+                            openDescribe: props.detail.openDescribe,
+                            openLevel: props.detail.openLevel,
+                            typeName: props.detail.name + row.name,
+                            typeId: props.detail.id
+                        })
+                    }
+                },
+                {
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除该字典类型吗？'
+                    },
+                    click: row => {
+                        dictDataDelete([row.id]).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.stateName = item.state === 1 ? '正常' : '删除'
+            switch (item.level) {
+                case 0:
+                    item.levelName = '普通'
+                    break
+                case 1:
+                    item.levelName = '中等'
+                    break
+                case 2:
+                    item.levelName = '严重'
+                    break
+                default:
+                    item.levelName = '未知'
+                    break
+            }
+            for (let key in item) {
+                if (typeof item[key] !== 'number') {
+                    item[key] = item[key] || '/'
+                }
+            }
+        })
+    }
+})
+
+provide('tableStore', tableStore)
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchState = 0
+tableStore.table.params.typeId = props.detail.id
+if (props.detail.openLevel !== 1) {
+    tableStore.table.column = tableStore.table.column.filter((item: any) => item.field !== 'levelName')
+}
+if (props.detail.openDescribe !== 1) {
+    tableStore.table.column = tableStore.table.column.filter((item: any) => item.field !== 'algoDescribe')
+}
+onMounted(() => {
+    tableStore.index()
+})
+const add = () => {
+    popupEditRef.value.open('新增', {
+        openLevel: props.detail.openLevel,
+        openDescribe: props.detail.openDescribe,
+        typeName: props.detail.name,
+        typeId: props.detail.id
+    })
+}
+</script>
diff --git a/src/views/setting/dictionary/list/index.vue b/src/views/setting/dictionary/list/index.vue
index a615ef77..86dcccc3 100644
--- a/src/views/setting/dictionary/list/index.vue
+++ b/src/views/setting/dictionary/list/index.vue
@@ -1,128 +1,128 @@
-<template>
-    <div class="default-main" style="position: relative">
-        <TableHeader>
-            <template #select>
-                <el-form-item label="过滤筛选">
-                    <el-input
-                        style="width: 240px"
-                        v-model="tableStore.table.params.searchValue"
-                        clearable
-                        placeholder="请输入名称或编码筛选"
-                    />
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button :icon="Plus" type="primary" @click="add">新增字典类型</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <PopupEdit ref="popupEditRef"></PopupEdit>
-        <Detail ref="detailRef" :detail="detail" @close="detail = null" v-if="detail"></Detail>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { ElMessage } from 'element-plus'
-import PopupEdit from './popupEdit.vue'
-import { dictTypeDelete } from '@/api/system-boot/dictType'
-import Detail from './detail.vue'
-
-defineOptions({
-    name: 'system-boot/dictType/list'
-})
-const popupEditRef = ref()
-const detail = ref<anyObj | null>(null)
-const tableStore = new TableStore({
-    url: '/system-boot/dictType/list',
-    method: 'POST',
-
-    column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { title: '名称', field: 'name' },
-        { title: '编码', field: 'code' },
-        { title: '开启等级', field: 'openLevelName' },
-        { title: '开启算法', field: 'openDescribeName' },
-        { title: '字典描述', field: 'remark' },
-        { title: '创建时间', field: 'createTime' },
-        { title: '更新时间', field: 'updateTime' },
-        {
-            title: '状态',
-            field: 'stateName',
-            width: '80',
-            render: 'tag',
-            custom: {
-                正常: 'success',
-                删除: 'danger'
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    title: '查看',
-                    type: 'primary',
-                    icon: 'el-icon-ZoomIn',
-                    render: 'basicButton',
-                    click: row => {
-                        detail.value = row
-                    }
-                },
-                {
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        popupEditRef.value.open('编辑字典类型', row)
-                    }
-                },
-                {
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除该字典类型吗？'
-                    },
-                    click: row => {
-                        dictTypeDelete([row.id]).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.stateName = item.state === 1 ? '正常' : '删除'
-            item.openLevelName = item.openLevel === 1 ? '开启' : '不开启'
-            item.openDescribeName = item.openDescribe === 1 ? '开启' : '不开启'
-        })
-    }
-})
-
-provide('tableStore', tableStore)
-tableStore.table.params.searchValue = ''
-tableStore.table.params.searchState = 0
-onMounted(() => {
-    tableStore.index()
-})
-const add = () => {
-    popupEditRef.value.open('新增字典类型')
-}
-</script>
+<template>
+    <div class="default-main" style="position: relative">
+        <TableHeader>
+            <template #select>
+                <el-form-item label="过滤筛选">
+                    <el-input
+                        style="width: 240px"
+                        v-model="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="请输入名称或编码筛选"
+                    />
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button :icon="Plus" type="primary" @click="add">新增字典类型</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <PopupEdit ref="popupEditRef"></PopupEdit>
+        <Detail ref="detailRef" :detail="detail" @close="detail = null" v-if="detail"></Detail>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { ElMessage } from 'element-plus'
+import PopupEdit from './popupEdit.vue'
+import { dictTypeDelete } from '@/api/system-boot/dictType'
+import Detail from './detail.vue'
+
+defineOptions({
+    name: 'system-boot/dictType/list'
+})
+const popupEditRef = ref()
+const detail = ref<anyObj | null>(null)
+const tableStore = new TableStore({
+    url: '/system-boot/dictType/list',
+    method: 'POST',
+
+    column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { title: '名称', field: 'name' },
+        { title: '编码', field: 'code' },
+        { title: '开启等级', field: 'openLevelName' },
+        { title: '开启算法', field: 'openDescribeName' },
+        { title: '字典描述', field: 'remark' },
+        { title: '创建时间', field: 'createTime' },
+        { title: '更新时间', field: 'updateTime' },
+        {
+            title: '状态',
+            field: 'stateName',
+            width: '80',
+            render: 'tag',
+            custom: {
+                正常: 'success',
+                删除: 'danger'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+         
+            buttons: [
+                {
+                    title: '查看',
+                    type: 'primary',
+                    icon: 'el-icon-ZoomIn',
+                    render: 'basicButton',
+                    click: row => {
+                        detail.value = row
+                    }
+                },
+                {
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        popupEditRef.value.open('编辑字典类型', row)
+                    }
+                },
+                {
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除该字典类型吗？'
+                    },
+                    click: row => {
+                        dictTypeDelete([row.id]).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.stateName = item.state === 1 ? '正常' : '删除'
+            item.openLevelName = item.openLevel === 1 ? '开启' : '不开启'
+            item.openDescribeName = item.openDescribe === 1 ? '开启' : '不开启'
+        })
+    }
+})
+
+provide('tableStore', tableStore)
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchState = 0
+onMounted(() => {
+    tableStore.index()
+})
+const add = () => {
+    popupEditRef.value.open('新增字典类型')
+}
+</script>
diff --git a/src/views/setting/dictionary/tree/index.vue b/src/views/setting/dictionary/tree/index.vue
index f96a7c2b..41024bb8 100644
--- a/src/views/setting/dictionary/tree/index.vue
+++ b/src/views/setting/dictionary/tree/index.vue
@@ -1,114 +1,114 @@
-<template>
-    <div class='default-main'>
-        <div class='custom-table-header'>
-            <div class="title">字典树列表</div>
-            <el-button :icon='Plus' type='primary' @click='addMenu'>新增字典类型</el-button>
-        </div>
-        <Table ref='tableRef' />
-        <PopupForm ref='popupFormRef'></PopupForm>
-    </div>
-</template>
-<script setup lang='ts'>
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import { ElMessage } from 'element-plus'
-import PopupForm from './popupForm.vue'
-import { dicDelete } from '@/api/system-boot/dic'
-
-defineOptions({
-    name: 'setting/dictionary/tree'
-})
-
-const popupFormRef = ref()
-const tableStore = new TableStore({
-    showPage:false,
-    url: '/system-boot/dictTree/queryTree',
-    method: 'GET',
-    publicHeight:60,
-    column: [
-        { title: '字典名称', field: 'name', treeNode: true, align: 'left' },
-        // { title: '排序', field: 'sort',width:'80'  },
-        { title: '编码', field: 'code' },
-        { title: '描述', field: 'remark' },
-        {
-            title: '状态',
-            field: 'status',
-            width: '80',
-            render: 'tag',
-            custom: {
-                0: 'success',
-                1: 'warning',
-                2: 'danger'
-            },
-            replaceValue: {
-                0: '正常',
-                1: '禁用',
-                2: '删除'
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    title: '新增',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        popupFormRef.value.open('新增字典类型', {
-                            name: '',
-                            code: '',
-                            remark: '',
-                            sort: 100,
-                            type: 0,
-                            pid: row.id,
-                            id: ''
-                        })
-                    }
-                },
-                {
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        popupFormRef.value.open('编辑字典类型', row)
-                    }
-                },
-                {
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除该字典类型吗？'
-                    },
-                    click: row => {
-                        dicDelete(row.id).then(() => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ]
-})
-
-provide('tableStore', tableStore)
-tableStore.table.params.searchState = 0
-onMounted(() => {
-    tableStore.index()
-})
-const addMenu = () => {
-    popupFormRef.value.open('新增字典类型')
-}
-</script>
+<template>
+    <div class='default-main'>
+        <div class='custom-table-header'>
+            <div class="title">字典树列表</div>
+            <el-button :icon='Plus' type='primary' @click='addMenu'>新增字典类型</el-button>
+        </div>
+        <Table ref='tableRef' />
+        <PopupForm ref='popupFormRef'></PopupForm>
+    </div>
+</template>
+<script setup lang='ts'>
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import { ElMessage } from 'element-plus'
+import PopupForm from './popupForm.vue'
+import { dicDelete } from '@/api/system-boot/dic'
+
+defineOptions({
+    name: 'setting/dictionary/tree'
+})
+
+const popupFormRef = ref()
+const tableStore = new TableStore({
+    showPage:false,
+    url: '/system-boot/dictTree/queryTree',
+    method: 'GET',
+    publicHeight:60,
+    column: [
+        { title: '字典名称', field: 'name', treeNode: true, align: 'left' },
+        // { title: '排序', field: 'sort',width:'80'  },
+        { title: '编码', field: 'code' },
+        { title: '描述', field: 'remark' },
+        {
+            title: '状态',
+            field: 'status',
+            width: '80',
+            render: 'tag',
+            custom: {
+                0: 'success',
+                1: 'warning',
+                2: 'danger'
+            },
+            replaceValue: {
+                0: '正常',
+                1: '禁用',
+                2: '删除'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+          
+            buttons: [
+                {
+                    title: '新增',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        popupFormRef.value.open('新增字典类型', {
+                            name: '',
+                            code: '',
+                            remark: '',
+                            sort: 100,
+                            type: 0,
+                            pid: row.id,
+                            id: ''
+                        })
+                    }
+                },
+                {
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        popupFormRef.value.open('编辑字典类型', row)
+                    }
+                },
+                {
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除该字典类型吗？'
+                    },
+                    click: row => {
+                        dicDelete(row.id).then(() => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ]
+})
+
+provide('tableStore', tableStore)
+tableStore.table.params.searchState = 0
+onMounted(() => {
+    tableStore.index()
+})
+const addMenu = () => {
+    popupFormRef.value.open('新增字典类型')
+}
+</script>
diff --git a/src/views/system/ReportConfiguration/components/disposition.vue b/src/views/system/ReportConfiguration/components/disposition.vue
index 200d4e97..c40f1846 100644
--- a/src/views/system/ReportConfiguration/components/disposition.vue
+++ b/src/views/system/ReportConfiguration/components/disposition.vue
@@ -1,101 +1,101 @@
-<template>
-    <div class="default-main">
-
-        <TableHeader ref="TableHeaderRef">
-            <template v-slot:select>
-                <el-form-item label="模板类型">
-                 
-                    <el-select v-model="tableStore.table.params.type" placeholder="Select" size="large">
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-                    </el-select>
-                </el-form-item>
-            </template>
-            <template #operation>
-                <el-button icon="el-icon-Memo" type="primary" @click="add">报告字典管理</el-button>
-                <el-button icon="el-icon-Plus" type="primary" @click="add">新增模版</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-
-    </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 { delTemplate } from '@/api/harmonic-boot/luckyexcel'
-import { useDictData } from '@/stores/dictData'
-import { ElMessage } from 'element-plus'
-defineOptions({
-    name: 'BusinessAdministrator/ReportTemplate/ReportConfiguration'
-})
-const options = ([
-    { value: '0', label: '监测点报告' },
-    { value: '1', label: '区域报告' },
-
-])
-
-
-
-const tableStore: any = new TableStore({
-    url: '/system-boot/EventTemplate/getList',
-    method: 'POST',
-    column: [
-        { field: 'name', title: '模板名称' },
-        { field: 'code', title: '模板描述' },
-
-        {
-            title: '操作',
-            width: '220',
-            render: 'buttons',
-            buttons: [
-               
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-
-                    }
-                },
-
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    click: row => {
-                        delTemplate({ tempId: row.id, deptId: row.deptId }).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => { }
-})
-tableStore.table.params = {}
-
-tableStore.table.params.type = '0'
-provide('tableStore', tableStore)
-
-const add = () => {
-
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div class="default-main">
+
+        <TableHeader ref="TableHeaderRef">
+            <template v-slot:select>
+                <el-form-item label="模板类型">
+                 
+                    <el-select v-model="tableStore.table.params.type" placeholder="Select" size="large">
+                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                </el-form-item>
+            </template>
+            <template #operation>
+                <el-button icon="el-icon-Memo" type="primary" @click="add">报告字典管理</el-button>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增模版</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+
+    </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 { delTemplate } from '@/api/harmonic-boot/luckyexcel'
+import { useDictData } from '@/stores/dictData'
+import { ElMessage } from 'element-plus'
+defineOptions({
+    name: 'BusinessAdministrator/ReportTemplate/ReportConfiguration'
+})
+const options = ([
+    { value: '0', label: '监测点报告' },
+    { value: '1', label: '区域报告' },
+
+])
+
+
+
+const tableStore: any = new TableStore({
+    url: '/system-boot/EventTemplate/getList',
+    method: 'POST',
+    column: [
+        { field: 'name', title: '模板名称' },
+        { field: 'code', title: '模板描述' },
+
+        {
+             title: '操作',fixed: 'right',
+            width: '220',
+            render: 'buttons',
+            buttons: [
+               
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+
+                    }
+                },
+
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    click: row => {
+                        delTemplate({ tempId: row.id, deptId: row.deptId }).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => { }
+})
+tableStore.table.params = {}
+
+tableStore.table.params.type = '0'
+provide('tableStore', tableStore)
+
+const add = () => {
+
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/system/auth/audit/index.vue b/src/views/system/auth/audit/index.vue
index 24b64a78..aa792e5f 100644
--- a/src/views/system/auth/audit/index.vue
+++ b/src/views/system/auth/audit/index.vue
@@ -1,136 +1,136 @@
-<template>
-    <div class="default-main">
-        <div class="custom-table-header">
-            <div class="title">待审核用户</div>
-            <el-button :icon="Check" type="primary" @click="addRole" class="ml10">审核通过</el-button>
-        </div>
-        <Table ref="tableRef"  />
-    </div>
-</template>
-<script setup lang="ts">
-import { Check } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import { ElMessage } from 'element-plus'
-import { checkUser } from '@/api/user-boot/user'
-
-defineOptions({
-    name: 'auth/audit'
-})
-const tableStore = new TableStore({
-    showPage: false,
-    method: 'POST',
-    url: '/user-boot/user/checkUserList',
-    column: [
-        { width: '60', type: 'checkbox' },
-        { title: '名称', field: 'name' },
-        { title: '登录名', field: 'loginName' },
-        { title: '角色', field: 'roleName' },
-        { title: '部门', field: 'deptId' },
-        { title: '电话', field: 'phoneShow' },
-        { title: '注册时间', field: 'registerTime' },
-        { title: '类型', field: 'casualUserName' },
-        { title: '状态', field: 'stateName' },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '审核通过',
-                    type: 'primary',
-                    icon: 'el-icon-Check',
-                    render: 'basicButton',
-                    click: row => {
-                        checkUser([row.id]).then(res => {
-                            tableStore.index()
-                            ElMessage.success('操作成功')
-                        })
-                    }
-                },
-                {
-                    name: 'del',
-                    title: '审核不通过',
-                    type: 'danger',
-                    icon: 'el-icon-Close',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定不通过该角色吗？'
-                    },
-                    click: row => {
-                        ElMessage.warning('功能尚未实现')
-                    }
-                }
-            ]
-        }
-    ],
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.deptId = item.deptId || '/'
-            item.phoneShow = item.phone || '/'
-            item.roleName = item.role.length ? item.role : '/'
-            switch (item.casualUser) {
-                case 0:
-                    item.casualUserName = '临时用户'
-                    break
-                case 1:
-                    item.casualUserName = '长期用户'
-                    break
-                default:
-                    item.casualUserName = '/'
-                    break
-            }
-            switch (item.state) {
-                case 0:
-                    item.stateName = '注销'
-                    break
-                case 1:
-                    item.stateName = '正常'
-                    break
-                case 2:
-                    item.stateName = '锁定'
-                    break
-                case 3:
-                    item.stateName = '待审核'
-                    break
-                case 4:
-                    item.stateName = '休眠'
-                    break
-                case 5:
-                    item.stateName = '密码过期'
-                    break
-                default:
-                    item.stateName = '/'
-                    break
-            }
-        })
-    }
-})
-tableStore.table.params.casualUser = 0
-tableStore.table.params.searchState = 0
-tableStore.table.params.searchValue = ''
-tableStore.table.params.searchBeginTime = ''
-tableStore.table.params.searchEndTime = ''
-tableStore.table.params.sortBy = ''
-tableStore.table.params.orderBy = ''
-provide('tableStore', tableStore)
-onMounted(() => {
-    tableStore.index()
-})
-
-const addRole = () => {
-    if (!tableStore.table.selection.length) {
-        ElMessage.warning('请选择用户')
-        return
-    }
-    checkUser(tableStore.table.selection.map((item: any) => item.id)).then(res => {
-        tableStore.index()
-        ElMessage.success('操作成功')
-    })
-}
-</script>
+<template>
+    <div class="default-main">
+        <div class="custom-table-header">
+            <div class="title">待审核用户</div>
+            <el-button :icon="Check" type="primary" @click="addRole" class="ml10">审核通过</el-button>
+        </div>
+        <Table ref="tableRef"  />
+    </div>
+</template>
+<script setup lang="ts">
+import { Check } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import { ElMessage } from 'element-plus'
+import { checkUser } from '@/api/user-boot/user'
+
+defineOptions({
+    name: 'auth/audit'
+})
+const tableStore = new TableStore({
+    showPage: false,
+    method: 'POST',
+    url: '/user-boot/user/checkUserList',
+    column: [
+        { width: '60', type: 'checkbox' },
+        { title: '名称', field: 'name' },
+        { title: '登录名', field: 'loginName' },
+        { title: '角色', field: 'roleName' },
+        { title: '部门', field: 'deptId' },
+        { title: '电话', field: 'phoneShow' },
+        { title: '注册时间', field: 'registerTime' },
+        { title: '类型', field: 'casualUserName' },
+        { title: '状态', field: 'stateName' },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '审核通过',
+                    type: 'primary',
+                    icon: 'el-icon-Check',
+                    render: 'basicButton',
+                    click: row => {
+                        checkUser([row.id]).then(res => {
+                            tableStore.index()
+                            ElMessage.success('操作成功')
+                        })
+                    }
+                },
+                {
+                    name: 'del',
+                    title: '审核不通过',
+                    type: 'danger',
+                    icon: 'el-icon-Close',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定不通过该角色吗？'
+                    },
+                    click: row => {
+                        ElMessage.warning('功能尚未实现')
+                    }
+                }
+            ]
+        }
+    ],
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.deptId = item.deptId || '/'
+            item.phoneShow = item.phone || '/'
+            item.roleName = item.role.length ? item.role : '/'
+            switch (item.casualUser) {
+                case 0:
+                    item.casualUserName = '临时用户'
+                    break
+                case 1:
+                    item.casualUserName = '长期用户'
+                    break
+                default:
+                    item.casualUserName = '/'
+                    break
+            }
+            switch (item.state) {
+                case 0:
+                    item.stateName = '注销'
+                    break
+                case 1:
+                    item.stateName = '正常'
+                    break
+                case 2:
+                    item.stateName = '锁定'
+                    break
+                case 3:
+                    item.stateName = '待审核'
+                    break
+                case 4:
+                    item.stateName = '休眠'
+                    break
+                case 5:
+                    item.stateName = '密码过期'
+                    break
+                default:
+                    item.stateName = '/'
+                    break
+            }
+        })
+    }
+})
+tableStore.table.params.casualUser = 0
+tableStore.table.params.searchState = 0
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchBeginTime = ''
+tableStore.table.params.searchEndTime = ''
+tableStore.table.params.sortBy = ''
+tableStore.table.params.orderBy = ''
+provide('tableStore', tableStore)
+onMounted(() => {
+    tableStore.index()
+})
+
+const addRole = () => {
+    if (!tableStore.table.selection.length) {
+        ElMessage.warning('请选择用户')
+        return
+    }
+    checkUser(tableStore.table.selection.map((item: any) => item.id)).then(res => {
+        tableStore.index()
+        ElMessage.success('操作成功')
+    })
+}
+</script>
diff --git a/src/views/system/auth/department/index.vue b/src/views/system/auth/department/index.vue
index 24596252..ee2d331e 100644
--- a/src/views/system/auth/department/index.vue
+++ b/src/views/system/auth/department/index.vue
@@ -1,195 +1,195 @@
-<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'
-import { deleteDept, selectPid } from '@/api/user-boot/dept'
-import { ElMessage, ElMessageBox } from 'element-plus'
-
-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',
-            width: 350,
-            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: 'basicButton',
-                    click: (row: any) => {
-                        if (row.children.length > 0) {
-                            ElMessageBox.confirm('该部门有子部门，是否确认删除', '提示', {
-                                confirmButtonText: '确认删除',
-                                cancelButtonText: '取消',
-                                type: 'warning'
-                            }).then(() => {
-                                deleteDept([row.id]).then(response => {
-                                    ElMessage.success('删除成功')
-                                    tableStore.index()
-                                })
-                            })
-                        } else {
-                             ElMessageBox.confirm('是否确认删除该部门', '提示', {
-                                confirmButtonText: '确认删除',
-                                cancelButtonText: '取消',
-                                type: 'warning'
-                            }).then(() => {
-                                deleteDept([row.id]).then(response => {
-                                    ElMessage.success('删除成功')
-                                    tableStore.index()
-                                })
-                            })
-                        }
-                    }
-                },
-                {
-                    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>
+<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'
+import { deleteDept, selectPid } from '@/api/user-boot/dept'
+import { ElMessage, ElMessageBox } from 'element-plus'
+
+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',
+            width: 350,
+            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: '操作',fixed: 'right',
+            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: 'basicButton',
+                    click: (row: any) => {
+                        if (row.children.length > 0) {
+                            ElMessageBox.confirm('该部门有子部门，是否确认删除', '提示', {
+                                confirmButtonText: '确认删除',
+                                cancelButtonText: '取消',
+                                type: 'warning'
+                            }).then(() => {
+                                deleteDept([row.id]).then(response => {
+                                    ElMessage.success('删除成功')
+                                    tableStore.index()
+                                })
+                            })
+                        } else {
+                             ElMessageBox.confirm('是否确认删除该部门', '提示', {
+                                confirmButtonText: '确认删除',
+                                cancelButtonText: '取消',
+                                type: 'warning'
+                            }).then(() => {
+                                deleteDept([row.id]).then(response => {
+                                    ElMessage.success('删除成功')
+                                    tableStore.index()
+                                })
+                            })
+                        }
+                    }
+                },
+                {
+                    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/system/auth/menu/api.vue b/src/views/system/auth/menu/api.vue
index 63d49bff..c462a872 100644
--- a/src/views/system/auth/menu/api.vue
+++ b/src/views/system/auth/menu/api.vue
@@ -47,7 +47,7 @@ const tableStore = new TableStore({
         },
         { title: 'URL接口路径', field: 'path' },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
diff --git a/src/views/system/auth/menu/menu.vue b/src/views/system/auth/menu/menu.vue
index fb47d689..ae55ae0e 100644
--- a/src/views/system/auth/menu/menu.vue
+++ b/src/views/system/auth/menu/menu.vue
@@ -56,7 +56,7 @@ const tableStore = new TableStore({
             render: 'icon'
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
diff --git a/src/views/system/auth/role/index.vue b/src/views/system/auth/role/index.vue
index 7d898f4b..78c05c05 100644
--- a/src/views/system/auth/role/index.vue
+++ b/src/views/system/auth/role/index.vue
@@ -69,7 +69,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             width: '180',
             render: 'buttons',
diff --git a/src/views/system/auth/userList/index.vue b/src/views/system/auth/userList/index.vue
index 6d115538..cf7af519 100644
--- a/src/views/system/auth/userList/index.vue
+++ b/src/views/system/auth/userList/index.vue
@@ -1,231 +1,231 @@
-<template>
-    <div class="default-main">
-        <TableHeader>
-            <template v-slot:select>
-                <el-form-item label="用户状态">
-                    <el-select v-model="tableStore.table.params.searchState" placeholder="选择用户状态">
-                        <el-option
-                            v-for="(item, index) in userState"
-                            :label="item.label"
-                            :key="index"
-                            :value="item.value"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="用户类型:">
-                    <el-select v-model="tableStore.table.params.casualUser" placeholder="选择用户类型">
-                        <el-option
-                            v-for="(item, index) in casualUser"
-                            :label="item.label"
-                            :key="index"
-                            :value="item.value"
-                        ></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="关键词:">
-                    <el-input
-                        style="width: 240px"
-                        v-model="tableStore.table.params.searchValue"
-                        clearable
-                        placeholder="仅根据用户名/登录名"
-                        maxlength="10"
-                        show-word-limit
-                    />
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <el-button :icon="Plus" type="primary" @click="addUser">添加</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <PopupEdit ref="popupEditRef"></PopupEdit>
-        <PopupPwd ref="popupPwdRef"></PopupPwd>
-    </div>
-</template>
-<script setup lang="ts">
-import { Plus } from '@element-plus/icons-vue'
-import { ref, onMounted, provide } from 'vue'
-import { ElMessageBox, ElMessage } from 'element-plus'
-import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import PopupEdit from './popupEdit.vue'
-import PopupPwd from './popupPwd.vue'
-
-defineOptions({
-    name: 'auth/userlist'
-})
-const popupEditRef = ref()
-const popupPwdRef = ref()
-const tableStore = new TableStore({
-    url: '/user-boot/user/list',
-    method: 'POST',
-    column: [
-        { title: '用户名称', field: 'name', minWidth: '130' },
-        { title: '登录名', field: 'loginName', minWidth: '130' },
-        { title: '角色', field: 'roleName', minWidth: '130' },
-        { title: '部门', field: 'deptName', minWidth: '200' },
-        { title: '电话', field: 'phoneShow', minWidth: '100' },
-        { title: '注册时间', field: 'registerTime', minWidth: '130' },
-        { title: '登录时间', field: 'loginTime', minWidth: '130' },
-        { title: '类型', field: 'casualUserName', minWidth: '80' },
-        {
-            title: '状态',
-            field: 'state',
-            width: '100',
-            render: 'tag',
-            custom: {
-                0: 'danger',
-                1: 'success',
-                2: 'warning',
-                3: 'warning',
-                4: 'info',
-                5: 'danger'
-            },
-            replaceValue: {
-                0: '注销',
-                1: '正常',
-                2: '锁定',
-                3: '待审核',
-                4: '休眠',
-                5: '密码过期'
-            }
-        },
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1
-                    },
-                    click: row => {
-                        popupEditRef.value.open('编辑用户', row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '修改密码',
-                    type: 'primary',
-                    icon: 'el-icon-Lock',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1
-                    },
-                    click: row => {
-                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
-                            confirmButtonText: '确认',
-                            cancelButtonText: '取消',
-                            inputType: 'password'
-                        }).then(({ value }) => {
-                            passwordConfirm(value).then(res => {
-                                popupPwdRef.value.open(row.id)
-                            })
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '激活',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
-                    },
-                    click: row => {
-                        activateUser({
-                            id: row.id
-                        }).then(() => {
-                            ElMessage.success('激活成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '注销',
-                    type: 'danger',
-                    icon: 'el-icon-SwitchButton',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.state !== 1 && row.state !== 3
-                    },
-                    click: row => {
-                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
-                            confirmButtonText: '确认',
-                            cancelButtonText: '取消',
-                            inputType: 'password'
-                        }).then(({ value }) => {
-                            passwordConfirm(value).then(res => {
-                                deluser({
-                                    id: row.id
-                                }).then(() => {
-                                    ElMessage.success('注销成功')
-                                    tableStore.index()
-                                })
-                            })
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        tableStore.table.data.forEach((item: any) => {
-            item.deptName = item.deptName || '/'
-            item.phoneShow = item.phone || '/'
-            item.roleName = item.role.length ? item.role : '/'
-            switch (item.casualUser) {
-                case 0:
-                    item.casualUserName = '临时用户'
-                    break
-                case 1:
-                    item.casualUserName = '长期用户'
-                    break
-                default:
-                    item.casualUserName = '/'
-                    break
-            }
-        })
-    },
-    resetCallback: () => { 
-        tableStore.table.params.searchValue = ''
-    }
-})
-
-provide('tableStore', tableStore)
-tableStore.table.params.searchState = 1
-tableStore.table.params.casualUser = -1
-tableStore.table.params.orderBy = ''
-const userState = [
-    { label: '全部', value: -1 },
-    { label: '注销', value: 0 },
-    { label: '正常', value: 1 },
-    { label: '锁定', value: 2 },
-    { label: '待审核', value: 3 },
-    { label: '休眠', value: 4 },
-    { label: '密码过期', value: 5 }
-]
-const casualUser = [
-    { label: '全部', value: -1 },
-    { label: '临时用户', value: 0 },
-    { label: '长期用户', value: 1 }
-]
-onMounted(() => {
-    tableStore.index()
-})
-
-const addUser = () => {
-    popupEditRef.value.open('新增用户')
-}
-</script>
+<template>
+    <div class="default-main">
+        <TableHeader>
+            <template v-slot:select>
+                <el-form-item label="用户状态">
+                    <el-select v-model="tableStore.table.params.searchState" placeholder="选择用户状态">
+                        <el-option
+                            v-for="(item, index) in userState"
+                            :label="item.label"
+                            :key="index"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="用户类型:">
+                    <el-select v-model="tableStore.table.params.casualUser" placeholder="选择用户类型">
+                        <el-option
+                            v-for="(item, index) in casualUser"
+                            :label="item.label"
+                            :key="index"
+                            :value="item.value"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="关键词:">
+                    <el-input
+                        style="width: 240px"
+                        v-model="tableStore.table.params.searchValue"
+                        clearable
+                        placeholder="仅根据用户名/登录名"
+                        maxlength="10"
+                        show-word-limit
+                    />
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <el-button :icon="Plus" type="primary" @click="addUser">添加</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <PopupEdit ref="popupEditRef"></PopupEdit>
+        <PopupPwd ref="popupPwdRef"></PopupPwd>
+    </div>
+</template>
+<script setup lang="ts">
+import { Plus } from '@element-plus/icons-vue'
+import { ref, onMounted, provide } from 'vue'
+import { ElMessageBox, ElMessage } from 'element-plus'
+import { activateUser, deluser, passwordConfirm } from '@/api/user-boot/user'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import PopupEdit from './popupEdit.vue'
+import PopupPwd from './popupPwd.vue'
+
+defineOptions({
+    name: 'auth/userlist'
+})
+const popupEditRef = ref()
+const popupPwdRef = ref()
+const tableStore = new TableStore({
+    url: '/user-boot/user/list',
+    method: 'POST',
+    column: [
+        { title: '用户名称', field: 'name', minWidth: '130' },
+        { title: '登录名', field: 'loginName', minWidth: '130' },
+        { title: '角色', field: 'roleName', minWidth: '130' },
+        { title: '部门', field: 'deptName', minWidth: '200' },
+        { title: '电话', field: 'phoneShow', minWidth: '100' },
+        { title: '注册时间', field: 'registerTime', minWidth: '130' },
+        { title: '登录时间', field: 'loginTime', minWidth: '130' },
+        { title: '类型', field: 'casualUserName', minWidth: '80' },
+        {
+            title: '状态',
+            field: 'state',
+            width: '100',
+            render: 'tag',
+            custom: {
+                0: 'danger',
+                1: 'success',
+                2: 'warning',
+                3: 'warning',
+                4: 'info',
+                5: 'danger'
+            },
+            replaceValue: {
+                0: '注销',
+                1: '正常',
+                2: '锁定',
+                3: '待审核',
+                4: '休眠',
+                5: '密码过期'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            fixed: 'right',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1
+                    },
+                    click: row => {
+                        popupEditRef.value.open('编辑用户', row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '修改密码',
+                    type: 'primary',
+                    icon: 'el-icon-Lock',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1
+                    },
+                    click: row => {
+                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
+                            confirmButtonText: '确认',
+                            cancelButtonText: '取消',
+                            inputType: 'password'
+                        }).then(({ value }) => {
+                            passwordConfirm(value).then(res => {
+                                popupPwdRef.value.open(row.id)
+                            })
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '激活',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 2 && row.state !== 5 && row.state !== 0 && row.state !== 4
+                    },
+                    click: row => {
+                        activateUser({
+                            id: row.id
+                        }).then(() => {
+                            ElMessage.success('激活成功')
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '注销',
+                    type: 'danger',
+                    icon: 'el-icon-SwitchButton',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.state !== 1 && row.state !== 3
+                    },
+                    click: row => {
+                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
+                            confirmButtonText: '确认',
+                            cancelButtonText: '取消',
+                            inputType: 'password'
+                        }).then(({ value }) => {
+                            passwordConfirm(value).then(res => {
+                                deluser({
+                                    id: row.id
+                                }).then(() => {
+                                    ElMessage.success('注销成功')
+                                    tableStore.index()
+                                })
+                            })
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        tableStore.table.data.forEach((item: any) => {
+            item.deptName = item.deptName || '/'
+            item.phoneShow = item.phone || '/'
+            item.roleName = item.role.length ? item.role : '/'
+            switch (item.casualUser) {
+                case 0:
+                    item.casualUserName = '临时用户'
+                    break
+                case 1:
+                    item.casualUserName = '长期用户'
+                    break
+                default:
+                    item.casualUserName = '/'
+                    break
+            }
+        })
+    },
+    resetCallback: () => { 
+        tableStore.table.params.searchValue = ''
+    }
+})
+
+provide('tableStore', tableStore)
+tableStore.table.params.searchState = 1
+tableStore.table.params.casualUser = -1
+tableStore.table.params.orderBy = ''
+const userState = [
+    { label: '全部', value: -1 },
+    { label: '注销', value: 0 },
+    { label: '正常', value: 1 },
+    { label: '锁定', value: 2 },
+    { label: '待审核', value: 3 },
+    { label: '休眠', value: 4 },
+    { label: '密码过期', value: 5 }
+]
+const casualUser = [
+    { label: '全部', value: -1 },
+    { label: '临时用户', value: 0 },
+    { label: '长期用户', value: 1 }
+]
+onMounted(() => {
+    tableStore.index()
+})
+
+const addUser = () => {
+    popupEditRef.value.open('新增用户')
+}
+</script>
diff --git a/src/views/system/bpm/category/index.vue b/src/views/system/bpm/category/index.vue
index eb47a257..d8c682ac 100644
--- a/src/views/system/bpm/category/index.vue
+++ b/src/views/system/bpm/category/index.vue
@@ -1,115 +1,115 @@
-<!--流程分类页面-->
-<template>
-  <div class='default-main'>
-    <TableHeader>
-      <template v-slot:select>
-        <el-form-item label='流程分类'>
-          <el-input
-              v-model='tableStore.table.params.searchValue'
-              clearable
-              placeholder='请输入分类名称'
-          />
-        </el-form-item>
-      </template>
-      <template v-slot:operation>
-        <el-button type='primary' class='ml10' @click='add' :icon='Plus'>新增</el-button>
-      </template>
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef'></Table>
-    <!--弹出框-->
-    <category-popup ref='categoryPopup' />
-  </div>
-</template>
-
-<script setup lang='ts'>
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
-import { useRouter } from 'vue-router'
-import { ElMessage } from 'element-plus'
-import { Plus } from '@element-plus/icons-vue'
-import CategoryPopup from '@/views/system/bpm/category/categoryPopup.vue'
-import { deleteCategory } from '@/api/bpm-boot/category'
-
-defineOptions({
-  name: 'bpmCategory'
-})
-
-const { push } = useRouter()
-const categoryPopup = ref()
-
-const tableStore = new TableStore({
-  url: '/bpm-boot/bpm/category/list',
-  method: 'POST',
-  column: [
-  { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-    { title: '分类名称', field: 'name', minWidth: 130 },
-    { title: '分类标识', field: 'code', minWidth: 130 },
-    { title: '分类描述', field: 'description', minWidth: 170 },
-    { title: '创建时间', field: 'createTime', minWidth: 170 },
-    { title: '排序', field: 'sort', width: 170 },
-    {
-      title: '操作',
-      align: 'center',
-      minWidth: '150',
-      fixed: 'right',
-      render: 'buttons',
-      buttons: [
-        {
-          name: 'update',
-          title: '编辑',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            categoryPopup.value.open('修改流程分类', row)
-          }
-        },
-        {
-          name: 'update',
-          title: '删除',
-          type: 'danger',
-          icon: 'el-icon-Delete',
-          render: 'confirmButton',
-          popconfirm: {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            confirmButtonType: 'danger',
-            title: '确定删除吗？'
-          },
-          click: row => {
-            deleteCategory(row.id).then(res => {
-              ElMessage.success('删除成功')
-              tableStore.index()
-            })
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
-    }
-
-  }
-})
-
-onMounted(() => {
-  // 加载数据
-  tableStore.index()
-})
-tableStore.table.params.name = ''
-provide('tableStore', tableStore)
-
-const add = () => {
-  categoryPopup.value.open('新增流程分类')
-}
-
-</script>
+<!--流程分类页面-->
+<template>
+  <div class='default-main'>
+    <TableHeader>
+      <template v-slot:select>
+        <el-form-item label='流程分类'>
+          <el-input
+              v-model='tableStore.table.params.searchValue'
+              clearable
+              placeholder='请输入分类名称'
+          />
+        </el-form-item>
+      </template>
+      <template v-slot:operation>
+        <el-button type='primary' class='ml10' @click='add' :icon='Plus'>新增</el-button>
+      </template>
+    </TableHeader>
+    <!--表格-->
+    <Table ref='tableRef'></Table>
+    <!--弹出框-->
+    <category-popup ref='categoryPopup' />
+  </div>
+</template>
+
+<script setup lang='ts'>
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import CategoryPopup from '@/views/system/bpm/category/categoryPopup.vue'
+import { deleteCategory } from '@/api/bpm-boot/category'
+
+defineOptions({
+  name: 'bpmCategory'
+})
+
+const { push } = useRouter()
+const categoryPopup = ref()
+
+const tableStore = new TableStore({
+  url: '/bpm-boot/bpm/category/list',
+  method: 'POST',
+  column: [
+  { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+    { title: '分类名称', field: 'name', minWidth: 130 },
+    { title: '分类标识', field: 'code', minWidth: 130 },
+    { title: '分类描述', field: 'description', minWidth: 170 },
+    { title: '创建时间', field: 'createTime', minWidth: 170 },
+    { title: '排序', field: 'sort', width: 170 },
+    {
+       title: '操作',fixed: 'right',
+      align: 'center',
+      minWidth: '150',
+   
+      render: 'buttons',
+      buttons: [
+        {
+          name: 'update',
+          title: '编辑',
+          type: 'primary',
+          icon: 'el-icon-EditPen',
+          render: 'basicButton',
+          click: row => {
+            categoryPopup.value.open('修改流程分类', row)
+          }
+        },
+        {
+          name: 'update',
+          title: '删除',
+          type: 'danger',
+          icon: 'el-icon-Delete',
+          render: 'confirmButton',
+          popconfirm: {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            confirmButtonType: 'danger',
+            title: '确定删除吗？'
+          },
+          click: row => {
+            deleteCategory(row.id).then(res => {
+              ElMessage.success('删除成功')
+              tableStore.index()
+            })
+          }
+        }
+      ]
+    }
+  ],
+  beforeSearchFun: () => {
+    for (let key in tableStore.table.params) {
+      if (tableStore.table.params[key] === '') {
+        delete tableStore.table.params[key]
+      }
+    }
+
+  }
+})
+
+onMounted(() => {
+  // 加载数据
+  tableStore.index()
+})
+tableStore.table.params.name = ''
+provide('tableStore', tableStore)
+
+const add = () => {
+  categoryPopup.value.open('新增流程分类')
+}
+
+</script>
diff --git a/src/views/system/bpm/form/index.vue b/src/views/system/bpm/form/index.vue
index fe16a1b6..3eab57f4 100644
--- a/src/views/system/bpm/form/index.vue
+++ b/src/views/system/bpm/form/index.vue
@@ -1,167 +1,167 @@
-<!--流程表单-->
-<template>
-    <div class='default-main'>
-        <TableHeader>
-            <template v-slot:select>
-                <el-form-item label='表单名称'>
-                    <el-input
-                        v-model='tableStore.table.params.name'
-                        clearable
-                    />
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <el-button type='primary' class='ml10' :icon='Plus' @click='openForm'>新增</el-button>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref='tableRef'></Table>
-        <!-- 预览表单对话框 -->
-        <el-dialog v-model="detailVisible" title="表单详情" width="800">
-            <form-create :option="detailData.option" :rule="detailData.rule" />
-        </el-dialog>
-    </div>
-</template>
-<script lang='ts' setup>
-import { Plus } from '@element-plus/icons-vue'
-import TableHeader from '@/components/table/header/index.vue'
-import Table from '@/components/table/index.vue'
-import TableStore from '@/utils/tableStore'
-import { ElMessage } from 'element-plus'
-import { onMounted, provide, ref, reactive,nextTick } from 'vue'
-import { useRouter } from 'vue-router'
-import { deleteForm, getById } from '@/api/bpm-boot/form'
-import { setConfAndFields2 } from '@/utils/formCreate'
-
-
-const { push } = useRouter()
-defineOptions({
-    name: 'category'
-})
-const formJson = reactive({"widgetList":[],"formConfig":{"modelName":"formData","refName":"vForm","rulesName":"rules","labelWidth":80,"labelPosition":"left","size":"","labelAlign":"label-left-align","cssCode":"","customClass":"","functions":"","layoutType":"PC","jsonVersion":3,"onFormCreated":"","onFormMounted":"","onFormDataChange":"","onFormValidate":""}})
-const formData = reactive({})
-const optionData = reactive({})
-const vfRenderRef = ref()
-const render = reactive({
-    visible: false,
-    title: ''
-})
-
-const detailVisible = ref(false)
-const detailData = ref({
-    rule: [],
-    option: {}
-})
-
-const tableStore = new TableStore({
-    url: '/bpm-boot/bpm/form/list',
-    method: 'POST',
-    column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { title: '表单名称', minWidth: '160', field: 'name' },
-        { title: '备注', minWidth: '140', field: 'remark' },
-        { title: '状态', minWidth: '140', field: 'status',
-            render: 'tag',
-            custom: {
-                0: 'danger',
-                1: 'success',
-            },
-            replaceValue: {
-                0: '关闭',
-                1: '开启',
-            }
-        },
-        { title: '排序', field: 'sort', width: 170 },
-        {
-            title: '操作',
-            align: 'center',
-            render: 'buttons',
-            minWidth: '230',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'view',
-                    title: '预览',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        //首先根据id查询出详细数据，然后渲染json
-                        getById(row.id).then(res => {
-                            nextTick(async () => {
-                                setConfAndFields2(detailData, res.data.conf, res.data.fields)
-                                // 弹窗打开
-                                detailVisible.value = true
-                            });
-
-                        })
-                    }
-                },
-                {
-                    name: 'update',
-                    title: '设计表单',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        // push(`/admin/form/formDesigner?id=${row.id}`)
-                        openForm(row.id)
-                    }
-                },
-                {
-                    name: 'update',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        deleteForm(row.id).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        for (let key in tableStore.table.params) {
-            if (tableStore.table.params[key] === '') {
-                delete tableStore.table.params[key]
-            }
-        }
-
-    }
-})
-/** 添加/修改操作表单 */
-const openForm = (id?: string) => {
-    const toRouter: { name: string; query?: { id: string } } = {
-        name: 'BpmFormEditor'
-    }
-    // 表单新建的时候id传的是event需要排除
-    if (typeof id === 'string') {
-        toRouter.query = {
-            id
-        }
-    }
-    push(toRouter)
-}
-tableStore.table.params.orderBy = 'desc'
-tableStore.table.params.name = ''
-provide('tableStore', tableStore)
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-</script>
-<style scoped>
-
+<!--流程表单-->
+<template>
+    <div class='default-main'>
+        <TableHeader>
+            <template v-slot:select>
+                <el-form-item label='表单名称'>
+                    <el-input
+                        v-model='tableStore.table.params.name'
+                        clearable
+                    />
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <el-button type='primary' class='ml10' :icon='Plus' @click='openForm'>新增</el-button>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref='tableRef'></Table>
+        <!-- 预览表单对话框 -->
+        <el-dialog v-model="detailVisible" title="表单详情" width="800">
+            <form-create :option="detailData.option" :rule="detailData.rule" />
+        </el-dialog>
+    </div>
+</template>
+<script lang='ts' setup>
+import { Plus } from '@element-plus/icons-vue'
+import TableHeader from '@/components/table/header/index.vue'
+import Table from '@/components/table/index.vue'
+import TableStore from '@/utils/tableStore'
+import { ElMessage } from 'element-plus'
+import { onMounted, provide, ref, reactive,nextTick } from 'vue'
+import { useRouter } from 'vue-router'
+import { deleteForm, getById } from '@/api/bpm-boot/form'
+import { setConfAndFields2 } from '@/utils/formCreate'
+
+
+const { push } = useRouter()
+defineOptions({
+    name: 'category'
+})
+const formJson = reactive({"widgetList":[],"formConfig":{"modelName":"formData","refName":"vForm","rulesName":"rules","labelWidth":80,"labelPosition":"left","size":"","labelAlign":"label-left-align","cssCode":"","customClass":"","functions":"","layoutType":"PC","jsonVersion":3,"onFormCreated":"","onFormMounted":"","onFormDataChange":"","onFormValidate":""}})
+const formData = reactive({})
+const optionData = reactive({})
+const vfRenderRef = ref()
+const render = reactive({
+    visible: false,
+    title: ''
+})
+
+const detailVisible = ref(false)
+const detailData = ref({
+    rule: [],
+    option: {}
+})
+
+const tableStore = new TableStore({
+    url: '/bpm-boot/bpm/form/list',
+    method: 'POST',
+    column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { title: '表单名称', minWidth: '160', field: 'name' },
+        { title: '备注', minWidth: '140', field: 'remark' },
+        { title: '状态', minWidth: '140', field: 'status',
+            render: 'tag',
+            custom: {
+                0: 'danger',
+                1: 'success',
+            },
+            replaceValue: {
+                0: '关闭',
+                1: '开启',
+            }
+        },
+        { title: '排序', field: 'sort', width: 170 },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            render: 'buttons',
+            minWidth: '230',
+        
+            buttons: [
+                {
+                    name: 'view',
+                    title: '预览',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        //首先根据id查询出详细数据，然后渲染json
+                        getById(row.id).then(res => {
+                            nextTick(async () => {
+                                setConfAndFields2(detailData, res.data.conf, res.data.fields)
+                                // 弹窗打开
+                                detailVisible.value = true
+                            });
+
+                        })
+                    }
+                },
+                {
+                    name: 'update',
+                    title: '设计表单',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        // push(`/admin/form/formDesigner?id=${row.id}`)
+                        openForm(row.id)
+                    }
+                },
+                {
+                    name: 'update',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteForm(row.id).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        for (let key in tableStore.table.params) {
+            if (tableStore.table.params[key] === '') {
+                delete tableStore.table.params[key]
+            }
+        }
+
+    }
+})
+/** 添加/修改操作表单 */
+const openForm = (id?: string) => {
+    const toRouter: { name: string; query?: { id: string } } = {
+        name: 'BpmFormEditor'
+    }
+    // 表单新建的时候id传的是event需要排除
+    if (typeof id === 'string') {
+        toRouter.query = {
+            id
+        }
+    }
+    push(toRouter)
+}
+tableStore.table.params.orderBy = 'desc'
+tableStore.table.params.name = ''
+provide('tableStore', tableStore)
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+</script>
+<style scoped>
+
 </style>
\ No newline at end of file
diff --git a/src/views/system/bpm/model/index.vue b/src/views/system/bpm/model/index.vue
index d71ed3dc..a00cec6f 100644
--- a/src/views/system/bpm/model/index.vue
+++ b/src/views/system/bpm/model/index.vue
@@ -1,271 +1,271 @@
-<!--流程模型管理界面-->
-<template>
-    <div class='default-main'>
-        <TableHeader>
-            <template v-slot:select>
-                <!--                <el-form-item label='用户'>-->
-                <!--                    <el-select v-model='tableStore.table.params.userId' filterable clearable>-->
-                <!--                        <el-option-->
-                <!--                            v-for='item in userListData'-->
-                <!--                            :key='item.id'-->
-                <!--                            :label='item.userName'-->
-                <!--                            :value='item.id'-->
-                <!--                        />-->
-                <!--                    </el-select>-->
-                <!--                </el-form-item>-->
-            </template>
-            <template v-slot:operation>
-                <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增模型</el-button>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref='tableRef' isGroup></Table>
-        <model-popup ref='modelPopup' />
-        <!-- 弹窗：表单详情 -->
-        <el-dialog title='表单详情' v-model='formDetailVisible' width='800'>
-            <form-create :rule='formDetailPreview.rule' :option='formDetailPreview.option' />
-        </el-dialog>
-    </div>
-</template>
-
-<script setup lang='ts'>
-import { Plus } from '@element-plus/icons-vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
-import { useRouter } from 'vue-router'
-import ModelPopup from '@/views/system/bpm/model/modelPopup.vue'
-import { deleteModel, deployModel } from '@/api/bpm-boot/model'
-import { getById } from '@/api/bpm-boot/form'
-import { setConfAndFields2 } from '@/utils/formCreate'
-import { getSignSimpleList } from '@/api/bpm-boot/sign'
-
-defineOptions({
-    name: 'governSchemeHistory'
-})
-
-const { push } = useRouter()
-const modelPopup = ref()
-
-const tableStore = new TableStore({
-    url: '/bpm-boot/bpm/model/list',
-    method: 'POST',
-    column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { title: '模型标识', field: 'key', width: 160 },
-        { title: '模型名称', field: 'name', width: 160 },
-        { title: '流程分类', field: 'categoryName', width: 150 },
-        {
-            title: '表单信息', field: 'formName', width: 170,
-            formatter: (obj: any) => {
-                const formType = obj.row.formType
-                if (formType == 20) {
-                    return getFormNameByViewPath(obj.row.formCustomViewPath)
-                } else {
-                    return obj.row.formName
-                }
-            }
-        },
-        {
-            title: '创建时间',
-            field: 'createTime',
-            width: 150
-        },
-        {
-            title: '最新部署的流程定义',
-            children: [
-                {
-                    title: '模型版本',
-                    width: '150',
-                    field: 'processDefinition.version',
-                    type: 'html',
-                    formatter: (obj: any) => {
-                        if (obj.row.processDefinition) {
-                            const val = obj.row.processDefinition.version
-                            return `<a href='javascript:void(0);'  style='color: #409EFF;text-decoration: none'>v${val}</a>`
-                        } else {
-                            return '未部署'
-                        }
-                    }
-                },
-                {
-                    title: '激活状态',
-                    width: '150',
-                    field: 'processDefinition.suspensionState',
-                    // render: 'switch',
-                    // activeValue: '1',
-                    // inactiveValue: '0',
-                    // onChangeField: (row: any, value) => {
-                    //     console.log(row, 444123, value)
-                    //     value == 0 ? (value = 1) : (value = 0)
-                    // }
-                    render: 'tag',
-                    custom: {
-                        2: 'danger',
-                        1: 'success'
-                    },
-                    replaceValue: {
-                        2: '关闭',
-                        1: '开启'
-                    }
-                },
-                { title: '部署时间', width: '150', field: 'processDefinition.deploymentTime' }
-            ]
-        },
-        {
-            title: '操作',
-            align: 'center',
-            minWidth: '200',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '设计流程',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        handleDesign(row.id)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '部署流程',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        handleDeployConfirm(row.id)
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '表单预览',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        handleFormDetail(row.formId)
-                    }
-                },
-                {
-                    name: 'update',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        deleteModel(row.id).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        if (tableStore.table.params.addr) {
-            tableStore.table.params.addrStrOption = tableStore.table.params.addr.map(tempArray => tempArray.join('/'))
-        }
-        for (let key in tableStore.table.params) {
-            if (tableStore.table.params[key] === '') {
-                delete tableStore.table.params[key]
-            }
-        }
-    }
-})
-const flowInfo = ref()
-
-onMounted(async () => {
-    //加载流程标识
-    await getSignSimpleList().then(res => {
-        flowInfo.value = res.data
-    })
-
-    // 加载数据
-    tableStore.index()
-})
-tableStore.table.params.userId = ''
-
-provide('tableStore', tableStore)
-
-
-//获取流程标识的名称
-const getFormNameByViewPath = (viewPath: string) => {
-    const nameItem = flowInfo.value.filter(item => item.viewPath == viewPath)
-    if (nameItem.length > 0) {
-        return nameItem[0].name
-    } else {
-        return ''
-    }
-}
-
-//新增用户信息
-const add = () => {
-    modelPopup.value.open('新增流程模型')
-}
-
-/** 设计流程 */
-const handleDesign = (rowId: string) => {
-    push({
-        name: 'BpmModelEditor',
-        query: {
-            modelId: rowId
-        }
-    })
-}
-
-/** 发布流程 */
-const handleDeployConfirm = (rowId: string) => {
-    try {
-        // 删除的二次确认
-        ElMessageBox.confirm('是否部署该流程?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            draggable: true,
-            type: 'warning'
-        }).then(() => {
-            handleDeploy(rowId)
-        })
-            .catch(() => {
-            })
-    } catch {
-    }
-}
-
-const handleDeploy = async (rowId: string) => {
-    // 发起部署
-    await deployModel(rowId)
-    ElMessage.success('部署成功')
-    tableStore.index()
-}
-
-/** 流程表单的详情按钮操作 */
-const formDetailVisible = ref(false)
-const formDetailPreview = ref({
-    rule: [],
-    option: {}
-})
-
-const handleFormDetail = async (formId: string) => {
-    // 设置表单
-    await getById(formId).then(res => {
-        const data = res.data
-        setConfAndFields2(formDetailPreview, data.conf, data.fields)
-        // 弹窗打开
-        formDetailVisible.value = true
-    })
-}
-</script>
+<!--流程模型管理界面-->
+<template>
+    <div class='default-main'>
+        <TableHeader>
+            <template v-slot:select>
+                <!--                <el-form-item label='用户'>-->
+                <!--                    <el-select v-model='tableStore.table.params.userId' filterable clearable>-->
+                <!--                        <el-option-->
+                <!--                            v-for='item in userListData'-->
+                <!--                            :key='item.id'-->
+                <!--                            :label='item.userName'-->
+                <!--                            :value='item.id'-->
+                <!--                        />-->
+                <!--                    </el-select>-->
+                <!--                </el-form-item>-->
+            </template>
+            <template v-slot:operation>
+                <el-button type='primary' @click='add' class='ml10' :icon='Plus'>新增模型</el-button>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref='tableRef' isGroup></Table>
+        <model-popup ref='modelPopup' />
+        <!-- 弹窗：表单详情 -->
+        <el-dialog title='表单详情' v-model='formDetailVisible' width='800'>
+            <form-create :rule='formDetailPreview.rule' :option='formDetailPreview.option' />
+        </el-dialog>
+    </div>
+</template>
+
+<script setup lang='ts'>
+import { Plus } from '@element-plus/icons-vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import ModelPopup from '@/views/system/bpm/model/modelPopup.vue'
+import { deleteModel, deployModel } from '@/api/bpm-boot/model'
+import { getById } from '@/api/bpm-boot/form'
+import { setConfAndFields2 } from '@/utils/formCreate'
+import { getSignSimpleList } from '@/api/bpm-boot/sign'
+
+defineOptions({
+    name: 'governSchemeHistory'
+})
+
+const { push } = useRouter()
+const modelPopup = ref()
+
+const tableStore = new TableStore({
+    url: '/bpm-boot/bpm/model/list',
+    method: 'POST',
+    column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { title: '模型标识', field: 'key', width: 160 },
+        { title: '模型名称', field: 'name', width: 160 },
+        { title: '流程分类', field: 'categoryName', width: 150 },
+        {
+            title: '表单信息', field: 'formName', width: 170,
+            formatter: (obj: any) => {
+                const formType = obj.row.formType
+                if (formType == 20) {
+                    return getFormNameByViewPath(obj.row.formCustomViewPath)
+                } else {
+                    return obj.row.formName
+                }
+            }
+        },
+        {
+            title: '创建时间',
+            field: 'createTime',
+            width: 150
+        },
+        {
+            title: '最新部署的流程定义',
+            children: [
+                {
+                    title: '模型版本',
+                    width: '150',
+                    field: 'processDefinition.version',
+                    type: 'html',
+                    formatter: (obj: any) => {
+                        if (obj.row.processDefinition) {
+                            const val = obj.row.processDefinition.version
+                            return `<a href='javascript:void(0);'  style='color: #409EFF;text-decoration: none'>v${val}</a>`
+                        } else {
+                            return '未部署'
+                        }
+                    }
+                },
+                {
+                    title: '激活状态',
+                    width: '150',
+                    field: 'processDefinition.suspensionState',
+                    // render: 'switch',
+                    // activeValue: '1',
+                    // inactiveValue: '0',
+                    // onChangeField: (row: any, value) => {
+                    //     console.log(row, 444123, value)
+                    //     value == 0 ? (value = 1) : (value = 0)
+                    // }
+                    render: 'tag',
+                    custom: {
+                        2: 'danger',
+                        1: 'success'
+                    },
+                    replaceValue: {
+                        2: '关闭',
+                        1: '开启'
+                    }
+                },
+                { title: '部署时间', width: '150', field: 'processDefinition.deploymentTime' }
+            ]
+        },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            minWidth: '200',
+            render: 'buttons',
+        
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '设计流程',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        handleDesign(row.id)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '部署流程',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        handleDeployConfirm(row.id)
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '表单预览',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        handleFormDetail(row.formId)
+                    }
+                },
+                {
+                    name: 'update',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteModel(row.id).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        if (tableStore.table.params.addr) {
+            tableStore.table.params.addrStrOption = tableStore.table.params.addr.map(tempArray => tempArray.join('/'))
+        }
+        for (let key in tableStore.table.params) {
+            if (tableStore.table.params[key] === '') {
+                delete tableStore.table.params[key]
+            }
+        }
+    }
+})
+const flowInfo = ref()
+
+onMounted(async () => {
+    //加载流程标识
+    await getSignSimpleList().then(res => {
+        flowInfo.value = res.data
+    })
+
+    // 加载数据
+    tableStore.index()
+})
+tableStore.table.params.userId = ''
+
+provide('tableStore', tableStore)
+
+
+//获取流程标识的名称
+const getFormNameByViewPath = (viewPath: string) => {
+    const nameItem = flowInfo.value.filter(item => item.viewPath == viewPath)
+    if (nameItem.length > 0) {
+        return nameItem[0].name
+    } else {
+        return ''
+    }
+}
+
+//新增用户信息
+const add = () => {
+    modelPopup.value.open('新增流程模型')
+}
+
+/** 设计流程 */
+const handleDesign = (rowId: string) => {
+    push({
+        name: 'BpmModelEditor',
+        query: {
+            modelId: rowId
+        }
+    })
+}
+
+/** 发布流程 */
+const handleDeployConfirm = (rowId: string) => {
+    try {
+        // 删除的二次确认
+        ElMessageBox.confirm('是否部署该流程?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            draggable: true,
+            type: 'warning'
+        }).then(() => {
+            handleDeploy(rowId)
+        })
+            .catch(() => {
+            })
+    } catch {
+    }
+}
+
+const handleDeploy = async (rowId: string) => {
+    // 发起部署
+    await deployModel(rowId)
+    ElMessage.success('部署成功')
+    tableStore.index()
+}
+
+/** 流程表单的详情按钮操作 */
+const formDetailVisible = ref(false)
+const formDetailPreview = ref({
+    rule: [],
+    option: {}
+})
+
+const handleFormDetail = async (formId: string) => {
+    // 设置表单
+    await getById(formId).then(res => {
+        const data = res.data
+        setConfAndFields2(formDetailPreview, data.conf, data.fields)
+        // 弹窗打开
+        formDetailVisible.value = true
+    })
+}
+</script>
diff --git a/src/views/system/bpm/sign/index.vue b/src/views/system/bpm/sign/index.vue
index e6e16d75..ec4610f7 100644
--- a/src/views/system/bpm/sign/index.vue
+++ b/src/views/system/bpm/sign/index.vue
@@ -1,113 +1,113 @@
-<!--流程分类页面-->
-<template>
-    <div class="default-main">
-        <TableHeader>
-            <template v-slot:select>
-                <el-form-item label="标识名称">
-                    <el-input v-model="tableStore.table.params.name" clearable placeholder="请输入名称" />
-                </el-form-item>
-                <el-form-item label="标识key">
-                    <el-input v-model="tableStore.table.params.signKey" clearable placeholder="请输入key" />
-                </el-form-item>
-            </template>
-            <template v-slot:operation>
-                <el-button type="primary" class="ml10" @click="add" :icon="Plus">新增</el-button>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref="tableRef"></Table>
-        <!--弹出框-->
-        <sign-popup ref="signPopup" />
-    </div>
-</template>
-
-<script setup lang="ts">
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref } from 'vue'
-import { useRouter } from 'vue-router'
-import { ElMessage } from 'element-plus'
-import { Plus } from '@element-plus/icons-vue'
-import SignPopup from '@/views/system/bpm/sign/signPopup.vue'
-import { deleteSign } from '@/api/bpm-boot/sign'
-
-defineOptions({
-    name: 'bpmSign'
-})
-
-const { push } = useRouter()
-const signPopup = ref()
-
-const tableStore = new TableStore({
-    url: '/bpm-boot/bpmSign/list',
-    method: 'POST',
-    column: [
-    { title: '序号',  width: 80,formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      } },
-        { title: '标识名称', field: 'name', minWidth: 130 },
-        { title: '标识key', field: 'signKey', minWidth: 130 },
-        { title: '表单查看地址', field: 'viewPath', minWidth: 200 },
-        { title: '创建时间', field: 'createTime', minWidth: 170 },
-        { title: '排序', field: 'sort', width: 170 },
-        {
-            title: '操作',
-            align: 'center',
-            minWidth: '150',
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'update',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        signPopup.value.open('修改流程标识', row)
-                    }
-                },
-                {
-                    name: 'update',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        deleteSign(row.id).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        for (let key in tableStore.table.params) {
-            if (tableStore.table.params[key] === '') {
-                delete tableStore.table.params[key]
-            }
-        }
-    }
-})
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-})
-tableStore.table.params.name = ''
-tableStore.table.params.signKey = ''
-provide('tableStore', tableStore)
-
-const add = () => {
-    signPopup.value.open('新增流程标识')
-}
-</script>
+<!--流程分类页面-->
+<template>
+    <div class="default-main">
+        <TableHeader>
+            <template v-slot:select>
+                <el-form-item label="标识名称">
+                    <el-input v-model="tableStore.table.params.name" clearable placeholder="请输入名称" />
+                </el-form-item>
+                <el-form-item label="标识key">
+                    <el-input v-model="tableStore.table.params.signKey" clearable placeholder="请输入key" />
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <el-button type="primary" class="ml10" @click="add" :icon="Plus">新增</el-button>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref="tableRef"></Table>
+        <!--弹出框-->
+        <sign-popup ref="signPopup" />
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import { Plus } from '@element-plus/icons-vue'
+import SignPopup from '@/views/system/bpm/sign/signPopup.vue'
+import { deleteSign } from '@/api/bpm-boot/sign'
+
+defineOptions({
+    name: 'bpmSign'
+})
+
+const { push } = useRouter()
+const signPopup = ref()
+
+const tableStore = new TableStore({
+    url: '/bpm-boot/bpmSign/list',
+    method: 'POST',
+    column: [
+    { title: '序号',  width: 80,formatter: (row: any) => {
+        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+      } },
+        { title: '标识名称', field: 'name', minWidth: 130 },
+        { title: '标识key', field: 'signKey', minWidth: 130 },
+        { title: '表单查看地址', field: 'viewPath', minWidth: 200 },
+        { title: '创建时间', field: 'createTime', minWidth: 170 },
+        { title: '排序', field: 'sort', width: 170 },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            minWidth: '150',
+         
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'update',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        signPopup.value.open('修改流程标识', row)
+                    }
+                },
+                {
+                    name: 'update',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteSign(row.id).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        for (let key in tableStore.table.params) {
+            if (tableStore.table.params[key] === '') {
+                delete tableStore.table.params[key]
+            }
+        }
+    }
+})
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+})
+tableStore.table.params.name = ''
+tableStore.table.params.signKey = ''
+provide('tableStore', tableStore)
+
+const add = () => {
+    signPopup.value.open('新增流程标识')
+}
+</script>
diff --git a/src/views/system/bpm/task/alarmTask/index.vue b/src/views/system/bpm/task/alarmTask/index.vue
index 33b3e0f1..a7a5c6de 100644
--- a/src/views/system/bpm/task/alarmTask/index.vue
+++ b/src/views/system/bpm/task/alarmTask/index.vue
@@ -1,292 +1,292 @@
-<template>
-    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
-        <!--        <template #operation>-->
-        <!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
-        <!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
-        <!--        </template>-->
-    </TableHeader>
-    <Table ref="tableRef" />
-    <!--弹框-->
-    <feedback-popup ref="feedbackPopup" />
-</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 FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
-import { useRouter } from 'vue-router'
-import { cancelFeedback } from '@/api/supervision-boot/leaflet'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { useDictData } from '@/stores/dictData'
-import { getFileNameAndFilePath } from '@/api/system-boot/file'
-const dictData = useDictData()
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-const { push } = useRouter()
-const tableRef = ref()
-const TableHeaderRef = ref()
-const feedbackPopup = ref()
-const tableStore = new TableStore({
-    url: '/supervision-boot/warningLeaflet/allPageData',
-    publicHeight: 65,
-    method: 'POST',
-    column: [
-        {
-            title: '序号',
-          
-            align: 'center',
-            width: 80,
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-
-        {
-            field: 'problemType',
-            title: '预告警单问题来源',
-            minWidth: '150',
-            render: 'tag',
-            custom: {
-                1: 'warning',
-                2: 'warning',
-                3: 'warning',
-                4: 'warning'
-            },
-            replaceValue: {
-                1: '技术监督计划',
-                2: '在线监测超标问题',
-                3: '用户投诉问题',
-                4: '试运行监测点问题'
-            }
-        },
-        { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
-        {
-            field: 'leafletType',
-            title: '告警类型',
-            render: 'tag',
-            minWidth: '150',
-            custom: {
-                1: 'warning',
-                2: 'danger'
-            },
-            replaceValue: {
-                1: '预警单',
-                2: '告警单'
-            }
-            // formatter: (row: any) => {
-            //     return row.row.leafletType == 1 ? '预警单' : '告警单'
-            // }
-        },
-        { field: 'reformAdvice', title: '整改意见', minWidth: '200' },
-        { field: 'leafletName', title: '单据名称', minWidth: '200' },
-        {
-            field: 'status',
-            title: '流程状态',
-            minWidth: '150',
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning',
-                5: 'primary'
-            },
-            replaceValue: {
-                0: '待提交审批',
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消',
-                5: '新增'
-            }
-        },
-
-        { field: 'createTime', title: '创建时间', minWidth: '150' },
-        {
-            field: 'createBy',
-            title: '填报人',
-            minWidth: 80,
-            formatter: (row: any) => {
-                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
-            }
-        },
-        {
-            title: '操作',
-            minWidth: '220',
-            align: 'center',
-            render: 'buttons',
-            fixed: 'right',
-            buttons: [
-                // {
-                //     name: 'productSetting',
-                //     title: '发送督办单',
-                //     type: 'primary',
-                //     icon: 'el-icon-EditPen',
-                //     render: 'basicButton',
-                //     click: row => {
-                //         // handleAudit(row.processInstanceId)
-                //         ElMessage.warning('待打通生成管理系统接口！')
-                //     }
-                // },
-                {
-                    name: 'productSetting',
-                    title: '问题反馈',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.dutyOrgId != adminInfo.$state.deptId || row.status !== 5
-                    },
-                    click: row => {
-                        feedbackPopup.value.open(
-                            '填报反馈单',
-                            row.id,
-                            row.status,
-                            row.issueDetail,
-                            row.problemPath,
-                            row.supervisionReport,
-                            row.reformAdvice
-                        )
-                    }
-                },
-
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
-                    click: row => {
-                        handleAudit(row.processInstanceId, row.historyInstanceId)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    showDisabled: row => {
-                        return row.dutyOrgId != adminInfo.$state.deptId || !(row.status == 0)
-                    },
-                    disabled: row => {
-                        return !(row.status == 0)
-                    },
-                    click: row => {
-                        feedbackPopup.value.open(
-                            '编辑',
-                            row.id,
-                            row.status,
-                            row.issueDetail,
-                            row.problemPath,
-                            row.supervisionReport,
-                            row.reformAdvice,
-                            row.takeStep,
-                            row.reportPath
-                        )
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '重新发起',
-                    type: 'warning',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
-                    },
-                    click: row => {
-                        // deviceQuitPopup.value.open('重新发起', row)
-                        feedbackPopup.value.open(
-                            '重新发起告警单',
-                            row.id,
-                            row.status,
-                            row.issueDetail,
-                            row.problemPath,
-                            row.supervisionReport,
-                            row.reformAdvice,
-                            row.takeStep,
-                            row.reportPath,
-                            row.reformAdvice
-                        )
-                    }
-                },
-                {
-                    name: 'productSetting',
-                    title: '报告下载',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.problemType != 2
-                    },
-                    click: row => {
-                        window.open(row.filePath)
-                    }
-                },
-                {
-                    name: 'cancel',
-                    title: '取消',
-                    type: 'danger',
-                    icon: 'el-icon-Open',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status != 1
-                    },
-                    click: row => {
-                        cancelLeave(row)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        tableStore.table.params.currentPage = tableStore.table.params.pageNum
-    }
-})
-
-provide('tableStore', tableStore)
-
-onMounted(() => {
-    tableStore.index()
-})
-/**取消流程操作*/
-const cancelLeave = async (row: any) => {
-    // 二次确认
-    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputType: 'textarea',
-        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
-        inputErrorMessage: '取消原因不能为空'
-    })
-    // 发起取消
-    let data = {
-        id: row.id,
-        processInstanceId: row.processInstanceId,
-        reason: value
-    }
-    await cancelFeedback(data)
-    ElMessage.success('取消成功')
-    // 加载数据
-    tableStore.index()
-}
-/** 流程实例详情 */
-const handleAudit = (instanceId: any, historyInstanceId: any) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        query: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-</script>
-
-<style scoped lang="scss"></style>
+<template>
+    <TableHeader area datePicker nextFlag theCurrentTime ref="TableHeaderRef">
+        <!--        <template #operation>-->
+        <!--            <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>-->
+        <!--            <el-button icon="el-icon-Delete" type="primary">删除</el-button>-->
+        <!--        </template>-->
+    </TableHeader>
+    <Table ref="tableRef" />
+    <!--弹框-->
+    <feedback-popup ref="feedbackPopup" />
+</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 FeedbackPopup from '@/views/pqs/supervise/technology/feedbackPopup.vue'
+import { useRouter } from 'vue-router'
+import { cancelFeedback } from '@/api/supervision-boot/leaflet'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getFileNameAndFilePath } from '@/api/system-boot/file'
+const dictData = useDictData()
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+const { push } = useRouter()
+const tableRef = ref()
+const TableHeaderRef = ref()
+const feedbackPopup = ref()
+const tableStore = new TableStore({
+    url: '/supervision-boot/warningLeaflet/allPageData',
+    publicHeight: 65,
+    method: 'POST',
+    column: [
+        {
+            title: '序号',
+          
+            align: 'center',
+            width: 80,
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+
+        {
+            field: 'problemType',
+            title: '预告警单问题来源',
+            minWidth: '150',
+            render: 'tag',
+            custom: {
+                1: 'warning',
+                2: 'warning',
+                3: 'warning',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '技术监督计划',
+                2: '在线监测超标问题',
+                3: '用户投诉问题',
+                4: '试运行监测点问题'
+            }
+        },
+        { field: 'dutyOrgName', title: '负责单位', minWidth: '150' },
+        {
+            field: 'leafletType',
+            title: '告警类型',
+            render: 'tag',
+            minWidth: '150',
+            custom: {
+                1: 'warning',
+                2: 'danger'
+            },
+            replaceValue: {
+                1: '预警单',
+                2: '告警单'
+            }
+            // formatter: (row: any) => {
+            //     return row.row.leafletType == 1 ? '预警单' : '告警单'
+            // }
+        },
+        { field: 'reformAdvice', title: '整改意见', minWidth: '200' },
+        { field: 'leafletName', title: '单据名称', minWidth: '200' },
+        {
+            field: 'status',
+            title: '流程状态',
+            minWidth: '150',
+            render: 'tag',
+            custom: {
+                0: 'warning',
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning',
+                5: 'primary'
+            },
+            replaceValue: {
+                0: '待提交审批',
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消',
+                5: '新增'
+            }
+        },
+
+        { field: 'createTime', title: '创建时间', minWidth: '150' },
+        {
+            field: 'createBy',
+            title: '填报人',
+            minWidth: 80,
+            formatter: (row: any) => {
+                return dictData.state.userList.filter(item => item.id == row.cellValue)[0]?.name
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            minWidth: '220',
+            align: 'center',
+            render: 'buttons',
+          
+            buttons: [
+                // {
+                //     name: 'productSetting',
+                //     title: '发送督办单',
+                //     type: 'primary',
+                //     icon: 'el-icon-EditPen',
+                //     render: 'basicButton',
+                //     click: row => {
+                //         // handleAudit(row.processInstanceId)
+                //         ElMessage.warning('待打通生成管理系统接口！')
+                //     }
+                // },
+                {
+                    name: 'productSetting',
+                    title: '问题反馈',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.dutyOrgId != adminInfo.$state.deptId || row.status !== 5
+                    },
+                    click: row => {
+                        feedbackPopup.value.open(
+                            '填报反馈单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+                            row.reformAdvice
+                        )
+                    }
+                },
+
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    showDisabled: row => {
+                        return row.dutyOrgId != adminInfo.$state.deptId || !(row.status == 0)
+                    },
+                    disabled: row => {
+                        return !(row.status == 0)
+                    },
+                    click: row => {
+                        feedbackPopup.value.open(
+                            '编辑',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+                            row.reformAdvice,
+                            row.takeStep,
+                            row.reportPath
+                        )
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '重新发起',
+                    type: 'warning',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4)
+                    },
+                    click: row => {
+                        // deviceQuitPopup.value.open('重新发起', row)
+                        feedbackPopup.value.open(
+                            '重新发起告警单',
+                            row.id,
+                            row.status,
+                            row.issueDetail,
+                            row.problemPath,
+                            row.supervisionReport,
+                            row.reformAdvice,
+                            row.takeStep,
+                            row.reportPath,
+                            row.reformAdvice
+                        )
+                    }
+                },
+                {
+                    name: 'productSetting',
+                    title: '报告下载',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.problemType != 2
+                    },
+                    click: row => {
+                        window.open(row.filePath)
+                    }
+                },
+                {
+                    name: 'cancel',
+                    title: '取消',
+                    type: 'danger',
+                    icon: 'el-icon-Open',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.createBy != adminInfo.$state.id || row.status != 1
+                    },
+                    click: row => {
+                        cancelLeave(row)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        tableStore.table.params.currentPage = tableStore.table.params.pageNum
+    }
+})
+
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+/**取消流程操作*/
+const cancelLeave = async (row: any) => {
+    // 二次确认
+    const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputType: 'textarea',
+        inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: '取消原因不能为空'
+    })
+    // 发起取消
+    let data = {
+        id: row.id,
+        processInstanceId: row.processInstanceId,
+        reason: value
+    }
+    await cancelFeedback(data)
+    ElMessage.success('取消成功')
+    // 加载数据
+    tableStore.index()
+}
+/** 流程实例详情 */
+const handleAudit = (instanceId: any, historyInstanceId: any) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/system/bpm/task/done/index.vue b/src/views/system/bpm/task/done/index.vue
index 008a224a..cf3cc504 100644
--- a/src/views/system/bpm/task/done/index.vue
+++ b/src/views/system/bpm/task/done/index.vue
@@ -1,161 +1,161 @@
-<!--待办事项列表-->
-<template>
-    <div>
-        <TableHeader date-picker theCurrentTime showTimeAll showExport :showReset="false">
-            <template v-slot:select>
-                <el-form-item label='任务名称'>
-                    <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' clearable maxlength="32"  show-word-limit/>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref='tableRef'></Table>
-    </div>
-</template>
-
-<script setup lang='ts'>
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref, watch } from 'vue'
-import { useRouter } from 'vue-router'
-import { dateFormatter, formatPast2 } from '@/utils/formatTime'
-
-defineOptions({
-    name: 'businessUser'
-})
-const props = defineProps({
-  height: [String, Number]  ,
- 
-})
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-const tableStore = new TableStore({
-    url: '/bpm-boot/bpm/task/doneList',
-    method: 'POST',
-    publicHeight: 65,
-    filename:'已办任务',
-    column: [
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
-        { title: '任务内容', field: 'instanceSign', minWidth: 300 },
-        { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
-        { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
-        { title: '当前任务', field: 'name', minWidth: 130 },
-        { title: '发起时间', field: 'createTime', minWidth: 170 },
-        { title: '结束时间', field: 'endTime', minWidth: 170 },
-        {
-            title: '审批状态',
-            field: 'status',
-            minWidth: 130,
-            render: 'tag',
-            custom: {
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        { title: '审批建议', field: 'reason', minWidth: 150 },
-        {
-            title: '耗时',
-            field: 'durationInMillis',
-            minWidth: 150,
-            formatter: (obj: any) => {
-                return formatPast2(obj.row.durationInMillis)
-            }
-        },
-        {
-            title: '操作',
-            align: 'center',
-            minWidth: '150',
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return !row.processInstanceId
-                    },
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.processInstance.id, row.historyInstanceId)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-
-    },
-    exportProcessingData: () => {
-        tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.status =
-                item.status == 0
-                    ? '待提交审批'
-                    : item.status == 1
-                    ? '审批中'
-                    : item.status == 2
-                    ? '审批通过'
-                    : item.status == 3
-                    ? '审批不通过'
-                    : '已取消'
-            return item
-        })
-    }
-})
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-    setTimeout(() => {
-    if (props.height) {
-        tableStore.table.height = props.height
-    }
-   },0)
-})
-tableStore.table.params.searchValue = ''
-provide('tableStore', tableStore)
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: string, historyInstanceId: string) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-
-
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-</script>
+<!--待办事项列表-->
+<template>
+    <div>
+        <TableHeader date-picker theCurrentTime showTimeAll showExport :showReset="false">
+            <template v-slot:select>
+                <el-form-item label='任务名称'>
+                    <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称' clearable maxlength="32"  show-word-limit/>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref='tableRef'></Table>
+    </div>
+</template>
+
+<script setup lang='ts'>
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import { dateFormatter, formatPast2 } from '@/utils/formatTime'
+
+defineOptions({
+    name: 'businessUser'
+})
+const props = defineProps({
+  height: [String, Number]  ,
+ 
+})
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+const tableStore = new TableStore({
+    url: '/bpm-boot/bpm/task/doneList',
+    method: 'POST',
+    publicHeight: 65,
+    filename:'已办任务',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
+        { title: '任务内容', field: 'instanceSign', minWidth: 300 },
+        { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
+        { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
+        { title: '当前任务', field: 'name', minWidth: 130 },
+        { title: '发起时间', field: 'createTime', minWidth: 170 },
+        { title: '结束时间', field: 'endTime', minWidth: 170 },
+        {
+            title: '审批状态',
+            field: 'status',
+            minWidth: 130,
+            render: 'tag',
+            custom: {
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        { title: '审批建议', field: 'reason', minWidth: 150 },
+        {
+            title: '耗时',
+            field: 'durationInMillis',
+            minWidth: 150,
+            formatter: (obj: any) => {
+                return formatPast2(obj.row.durationInMillis)
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            minWidth: '150',
+        
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return !row.processInstanceId
+                    },
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstance.id, row.historyInstanceId)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+
+    },
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.status =
+                item.status == 0
+                    ? '待提交审批'
+                    : item.status == 1
+                    ? '审批中'
+                    : item.status == 2
+                    ? '审批通过'
+                    : item.status == 3
+                    ? '审批不通过'
+                    : '已取消'
+            return item
+        })
+    }
+})
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+    setTimeout(() => {
+    if (props.height) {
+        tableStore.table.height = props.height
+    }
+   },0)
+})
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+</script>
diff --git a/src/views/system/bpm/task/myInstance/index.vue b/src/views/system/bpm/task/myInstance/index.vue
index d6efbb40..8e4b66fc 100644
--- a/src/views/system/bpm/task/myInstance/index.vue
+++ b/src/views/system/bpm/task/myInstance/index.vue
@@ -1,186 +1,186 @@
-<!--待办事项列表-->
-<template>
-    <div>
-        <TableHeader date-picker theCurrentTime showTimeAll showExport :showReset="false">
-            <template v-slot:select>
-                <el-form-item label="任务名称">
-                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" clearable
-                        maxlength="32" show-word-limit></el-input>
-                </el-form-item>
-            </template>
-        </TableHeader>
-        <!--表格-->
-        <Table ref="tableRef"></Table>
-    </div>
-</template>
-
-<script setup lang="ts">
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import { onMounted, provide, ref, watch } from 'vue'
-import { formatDate, formatPast2 } from '@/utils/formatTime'
-import { useRouter } from 'vue-router'
-import { useDictData } from '@/stores/dictData'
-const dictData = useDictData()
-const categoryOptionList = dictData.getBasicData('flow_category')
-const props = defineProps({
-    height: [String, Number],
-
-})
-defineOptions({
-    name: 'businessUser'
-})
-
-const { push, options, currentRoute } = useRouter()
-const flag = ref(false)
-
-const tableStore = new TableStore({
-    url: '/bpm-boot/bpm/processInstance/myPage',
-    method: 'POST',
-    publicHeight: 65,
-    filename:'我发起的',
-    column: [
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { title: '任务名称', field: 'name', minWidth: 130 },
-        { title: '任务内容', field: 'instanceSign', minWidth: 300 },
-        {
-            title: '流程分类',
-            field: 'category',
-            minWidth: 130,
-            formatter: (row: any) => {
-                return categoryOptionList.filter(item => item.id === row.cellValue)[0]?.name
-            }
-        },
-        {
-            field: 'status',
-            title: '流程状态',
-            render: 'tag',
-            minWidth: 130,
-            custom: {
-                1: 'primary',
-                2: 'success',
-                3: 'danger',
-                4: 'warning'
-            },
-            replaceValue: {
-                1: '审批中',
-                2: '审批通过',
-                3: '审批不通过',
-                4: '已取消'
-            }
-        },
-        { title: '发起时间', field: 'startTime', minWidth: 140 },
-        { title: '结束时间', field: 'endTime', minWidth: 140 },
-        {
-            title: '耗时',
-            field: 'durationInMillis',
-            minWidth: 130,
-            formatter: (obj: any) => {
-                const millis = obj.row.durationInMillis
-                return millis > 0 ? formatPast2(millis) : ''
-            }
-        },
-        {
-            title: '当前审批任务',
-            field: 'tasks',
-            minWidth: 140,
-            formatter: (obj: any) => {
-                const tasks = obj.row.tasks
-                if (tasks) {
-                    return tasks[0].name
-                } else {
-                    return ''
-                }
-
-                // return millis > 0 ? formatPast2(millis) : '--'
-            }
-        },
-        {
-            title: '操作',
-            align: 'center',
-            minWidth: '180',
-            fixed: 'right',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'productSetting',
-                    title: '流程详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                        flag.value = true
-                        handleAudit(row.id, row.historyInstanceId)
-                    }
-                }
-            ]
-        }
-    ],
-    beforeSearchFun: () => {
-        // for (let key in tableStore.table.params) {
-        //     if (tableStore.table.params[key] === '') {
-        //         delete tableStore.table.params[key]
-        //     }
-        // }
-    },
-    exportProcessingData: () => {
-        tableStore.table.allData = tableStore.table.allData.filter(item => {
-            item.status =
-                item.status == 0
-                    ? '待提交审批'
-                    : item.status == 1
-                    ? '审批中'
-                    : item.status == 2
-                    ? '审批通过'
-                    : item.status == 3
-                    ? '审批不通过'
-                    : '已取消'
-            return item
-        })
-    }
-})
-
-onMounted(() => {
-    // 加载数据
-    tableStore.index()
-    setTimeout(() => {
-        if (props.height) {
-            tableStore.table.height = props.height
-        }
-    }, 0)
-})
-tableStore.table.params.searchValue = ''
-provide('tableStore', tableStore)
-
-/** 处理审批按钮 */
-const handleAudit = (instanceId: string, historyInstanceId: string) => {
-    push({
-        name: 'BpmProcessInstanceDetail',
-        state: {
-            id: instanceId,
-            historyInstanceId
-        }
-    })
-}
-
-watch(
-    () => currentRoute.value.path,
-    () => {
-        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
-            tableStore.index()
-            flag.value = false
-        }
-    },
-    {
-        deep: true
-    }
-)
-</script>
+<!--待办事项列表-->
+<template>
+    <div>
+        <TableHeader date-picker theCurrentTime showTimeAll showExport :showReset="false">
+            <template v-slot:select>
+                <el-form-item label="任务名称">
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称" clearable
+                        maxlength="32" show-word-limit></el-input>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref="tableRef"></Table>
+    </div>
+</template>
+
+<script setup lang="ts">
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { onMounted, provide, ref, watch } from 'vue'
+import { formatDate, formatPast2 } from '@/utils/formatTime'
+import { useRouter } from 'vue-router'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const categoryOptionList = dictData.getBasicData('flow_category')
+const props = defineProps({
+    height: [String, Number],
+
+})
+defineOptions({
+    name: 'businessUser'
+})
+
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
+
+const tableStore = new TableStore({
+    url: '/bpm-boot/bpm/processInstance/myPage',
+    method: 'POST',
+    publicHeight: 65,
+    filename:'我发起的',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '任务名称', field: 'name', minWidth: 130 },
+        { title: '任务内容', field: 'instanceSign', minWidth: 300 },
+        {
+            title: '流程分类',
+            field: 'category',
+            minWidth: 130,
+            formatter: (row: any) => {
+                return categoryOptionList.filter(item => item.id === row.cellValue)[0]?.name
+            }
+        },
+        {
+            field: 'status',
+            title: '流程状态',
+            render: 'tag',
+            minWidth: 130,
+            custom: {
+                1: 'primary',
+                2: 'success',
+                3: 'danger',
+                4: 'warning'
+            },
+            replaceValue: {
+                1: '审批中',
+                2: '审批通过',
+                3: '审批不通过',
+                4: '已取消'
+            }
+        },
+        { title: '发起时间', field: 'startTime', minWidth: 140 },
+        { title: '结束时间', field: 'endTime', minWidth: 140 },
+        {
+            title: '耗时',
+            field: 'durationInMillis',
+            minWidth: 130,
+            formatter: (obj: any) => {
+                const millis = obj.row.durationInMillis
+                return millis > 0 ? formatPast2(millis) : ''
+            }
+        },
+        {
+            title: '当前审批任务',
+            field: 'tasks',
+            minWidth: 140,
+            formatter: (obj: any) => {
+                const tasks = obj.row.tasks
+                if (tasks) {
+                    return tasks[0].name
+                } else {
+                    return ''
+                }
+
+                // return millis > 0 ? formatPast2(millis) : '--'
+            }
+        },
+        {
+             title: '操作',fixed: 'right',
+            align: 'center',
+            minWidth: '180',
+          
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '流程详情',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.id, row.historyInstanceId)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        // for (let key in tableStore.table.params) {
+        //     if (tableStore.table.params[key] === '') {
+        //         delete tableStore.table.params[key]
+        //     }
+        // }
+    },
+    exportProcessingData: () => {
+        tableStore.table.allData = tableStore.table.allData.filter(item => {
+            item.status =
+                item.status == 0
+                    ? '待提交审批'
+                    : item.status == 1
+                    ? '审批中'
+                    : item.status == 2
+                    ? '审批通过'
+                    : item.status == 3
+                    ? '审批不通过'
+                    : '已取消'
+            return item
+        })
+    }
+})
+
+onMounted(() => {
+    // 加载数据
+    tableStore.index()
+    setTimeout(() => {
+        if (props.height) {
+            tableStore.table.height = props.height
+        }
+    }, 0)
+})
+tableStore.table.params.searchValue = ''
+provide('tableStore', tableStore)
+
+/** 处理审批按钮 */
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
+    push({
+        name: 'BpmProcessInstanceDetail',
+        state: {
+            id: instanceId,
+            historyInstanceId
+        }
+    })
+}
+
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
+</script>
diff --git a/src/views/system/bpm/task/todo/index.vue b/src/views/system/bpm/task/todo/index.vue
index cb8ced8f..bb1c8bbb 100644
--- a/src/views/system/bpm/task/todo/index.vue
+++ b/src/views/system/bpm/task/todo/index.vue
@@ -75,7 +75,7 @@ const tableStore = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             align: 'center',
             minWidth: 100,
             render: 'buttons',
diff --git a/src/views/system/icd/index.vue b/src/views/system/icd/index.vue
index 831852c4..191c2f12 100644
--- a/src/views/system/icd/index.vue
+++ b/src/views/system/icd/index.vue
@@ -1,166 +1,166 @@
-<template>
-    <div class="default-main">
-        <div>
-            <TableHeader ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="icd名称">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            maxlength="32"
-                            show-word-limit
-                            clearable
-                            placeholder="请输入任务名称"
-                        />
-                    </el-form-item>
-                </template>
-                <template #operation>
-                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-        </div>
-        <!-- 新增 -->
-        <taskForm ref="taskFormRef" v-if="taskFormFlag" @submit="tableStore.index()" />
-        <!-- 补招 -->
-        <el-dialog v-model="dialogVisible" title="选择补招时间" width="500">
-            <el-date-picker
-                v-model="formDate.date"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="选择日期"
-            ></el-date-picker>
-            <template #footer>
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="okRun">确认</el-button>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import taskForm from './form.vue'
-import { downloadFile } from '@/api/system-boot/file'
-import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
-import { timerRun, runTimer, deleteTimer, stop, start } from '@/api/system-boot/csDictData'
-import { delIcdPath } from '@/api/device-boot/icd'
-defineOptions({
-    name: 'icd'
-})
-const formDate = ref({
-    date: '',
-    id: ''
-})
-const taskFormRef = ref()
-const dialogVisible = ref(false)
-const taskFormFlag = ref(false)
-const tableStore: any = new TableStore({
-    url: '/device-boot/icd/pageIcdList',
-    method: 'POST',
-    // isWebPaging: true,
-    column: [
-        {
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'name', title: 'icd名称' },
-        { field: 'path', title: 'icd路径', minWidth: 250 },
-        { field: 'createBy', title: '创建人' },
-        { field: 'createTime', title: '创建时间' },
-        { field: 'updateBy', title: '修改人' },
-        { field: 'updateTime', title: '修改时间' },
-        {
-            title: '操作',
-            width: '220',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-
-                    click: async row => {
-                        taskFormFlag.value = true
-                        setTimeout(() => {
-                            taskFormRef.value.open('编辑icd文件', row)
-                        }, 10)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '下载',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: async row => {
-                        downloadFile({ filePath: row.path }).then(res => {
-                            let blob = new Blob([res], {
-                                type: 'application/xml'
-                            })
-                            const url = window.URL.createObjectURL(blob)
-                            const link = document.createElement('a')
-                            link.href = url
-                            link.download = row.name
-                            document.body.appendChild(link)
-                            link.click()
-                            link.remove()
-                        })
-                    }
-                },
-
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    click: row => {
-                        delIcdPath([row.id]).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        taskFormFlag.value = false
-    }
-})
-tableStore.table.params.searchValue = ''
-tableStore.table.params.searchState = ''
-
-provide('tableStore', tableStore)
-
-const add = () => {
-    taskFormFlag.value = true
-    setTimeout(() => {
-        taskFormRef.value.open('新增icd文件')
-    }, 10)
-}
-const okRun = () => {
-    runTimer(formDate.value).then(res => {
-        ElMessage.success('操作成功')
-        dialogVisible.value = false
-        tableStore.index()
-    })
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div class="default-main">
+        <div>
+            <TableHeader ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="icd名称">
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            maxlength="32"
+                            show-word-limit
+                            clearable
+                            placeholder="请输入任务名称"
+                        />
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+        <!-- 新增 -->
+        <taskForm ref="taskFormRef" v-if="taskFormFlag" @submit="tableStore.index()" />
+        <!-- 补招 -->
+        <el-dialog v-model="dialogVisible" title="选择补招时间" width="500">
+            <el-date-picker
+                v-model="formDate.date"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期"
+            ></el-date-picker>
+            <template #footer>
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="okRun">确认</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import taskForm from './form.vue'
+import { downloadFile } from '@/api/system-boot/file'
+import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
+import { timerRun, runTimer, deleteTimer, stop, start } from '@/api/system-boot/csDictData'
+import { delIcdPath } from '@/api/device-boot/icd'
+defineOptions({
+    name: 'icd'
+})
+const formDate = ref({
+    date: '',
+    id: ''
+})
+const taskFormRef = ref()
+const dialogVisible = ref(false)
+const taskFormFlag = ref(false)
+const tableStore: any = new TableStore({
+    url: '/device-boot/icd/pageIcdList',
+    method: 'POST',
+    // isWebPaging: true,
+    column: [
+        {
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'name', title: 'icd名称' },
+        { field: 'path', title: 'icd路径', minWidth: 250 },
+        { field: 'createBy', title: '创建人' },
+        { field: 'createTime', title: '创建时间' },
+        { field: 'updateBy', title: '修改人' },
+        { field: 'updateTime', title: '修改时间' },
+        {
+             title: '操作',fixed: 'right',
+            width: '220',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: async row => {
+                        taskFormFlag.value = true
+                        setTimeout(() => {
+                            taskFormRef.value.open('编辑icd文件', row)
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '下载',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: async row => {
+                        downloadFile({ filePath: row.path }).then(res => {
+                            let blob = new Blob([res], {
+                                type: 'application/xml'
+                            })
+                            const url = window.URL.createObjectURL(blob)
+                            const link = document.createElement('a')
+                            link.href = url
+                            link.download = row.name
+                            document.body.appendChild(link)
+                            link.click()
+                            link.remove()
+                        })
+                    }
+                },
+
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    click: row => {
+                        delIcdPath([row.id]).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        taskFormFlag.value = false
+    }
+})
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchState = ''
+
+provide('tableStore', tableStore)
+
+const add = () => {
+    taskFormFlag.value = true
+    setTimeout(() => {
+        taskFormRef.value.open('新增icd文件')
+    }, 10)
+}
+const okRun = () => {
+    runTimer(formDate.value).then(res => {
+        ElMessage.success('操作成功')
+        dialogVisible.value = false
+        tableStore.index()
+    })
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/system/modelManage/index.vue b/src/views/system/modelManage/index.vue
index 8294d6af..6963adc7 100644
--- a/src/views/system/modelManage/index.vue
+++ b/src/views/system/modelManage/index.vue
@@ -1,155 +1,155 @@
-<template>
-    <div class="default-main">
-        <div>
-            <TableHeader ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="终端型号名称">
-                        <el-input
-                            v-model="tableStore.table.params.searchValue"
-                            maxlength="32"
-                            show-word-limit
-                            clearable
-                            placeholder="请输入任务名称"
-                        />
-                    </el-form-item>
-                </template>
-                <template #operation>
-                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-        </div>
-        <!-- 新增 -->
-        <taskForm ref="taskFormRef" v-if="taskFormFlag" @submit="tableStore.index()" />
-        <!-- 补招 -->
-        <el-dialog v-model="dialogVisible" title="选择补招时间" width="500">
-            <el-date-picker
-                v-model="formDate.date"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="选择日期"
-            ></el-date-picker>
-            <template #footer>
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="okRun">确认</el-button>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import taskForm from './form.vue'
-import { delDevType } from '@/api/device-boot/modelManage'
-import { getIcdList } from '@/api/device-boot/icd'
-import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
-import { timerRun, runTimer, deleteTimer, stop, start } from '@/api/system-boot/csDictData'
-defineOptions({
-    name: 'modelManage'
-})
-const formDate = ref({
-    date: '',
-    id: ''
-})
-const options = ref([])
-const taskFormFlag = ref(false)
-const taskFormRef = ref()
-const dialogVisible = ref(false)
-const tableStore: any = new TableStore({
-    url: '/device-boot/devType/pageDevTypeList',
-    method: 'POST',
-    // isWebPaging: true,
-    column: [
-        {
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'name', title: '型号名称' },
-        {
-            field: 'icdId',
-            title: '关联icd',
-            formatter: (row: any) => {
-                return options.value.find((item: any) => item.id === row.cellValue)?.name
-            }
-        },
-        { field: 'createBy', title: '创建人' },
-        { field: 'createTime', title: '创建时间' },
-        { field: 'updateBy', title: '修改人' },
-        { field: 'updateTime', title: '修改时间' },
-        {
-            title: '操作',
-            width: '220',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-
-                    click: async row => {
-                        taskFormFlag.value = true
-                        setTimeout(() => {
-                            taskFormRef.value.open('编辑终端型号', row)
-                        }, 10)
-                    }
-                },
-
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    click: row => {
-                        delDevType([row.id]).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        taskFormFlag.value = true
-    }
-})
-tableStore.table.params.searchValue = ''
-tableStore.table.params.searchState = ''
-
-provide('tableStore', tableStore)
-
-const add = () => {
-    taskFormFlag.value = true
-    setTimeout(() => {
-        taskFormRef.value.open('新增终端型号')
-    }, 10)
-}
-const okRun = () => {
-    runTimer(formDate.value).then(res => {
-        ElMessage.success('操作成功')
-        dialogVisible.value = false
-        tableStore.index()
-    })
-}
-onMounted(() => {
-    getIcdList().then(res => {
-        options.value = res.data
-    })
-    tableStore.index()
-})
-</script>
+<template>
+    <div class="default-main">
+        <div>
+            <TableHeader ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="终端型号名称">
+                        <el-input
+                            v-model="tableStore.table.params.searchValue"
+                            maxlength="32"
+                            show-word-limit
+                            clearable
+                            placeholder="请输入任务名称"
+                        />
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+        <!-- 新增 -->
+        <taskForm ref="taskFormRef" v-if="taskFormFlag" @submit="tableStore.index()" />
+        <!-- 补招 -->
+        <el-dialog v-model="dialogVisible" title="选择补招时间" width="500">
+            <el-date-picker
+                v-model="formDate.date"
+                type="date"
+                value-format="YYYY-MM-DD"
+                placeholder="选择日期"
+            ></el-date-picker>
+            <template #footer>
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="okRun">确认</el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import taskForm from './form.vue'
+import { delDevType } from '@/api/device-boot/modelManage'
+import { getIcdList } from '@/api/device-boot/icd'
+import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
+import { timerRun, runTimer, deleteTimer, stop, start } from '@/api/system-boot/csDictData'
+defineOptions({
+    name: 'modelManage'
+})
+const formDate = ref({
+    date: '',
+    id: ''
+})
+const options = ref([])
+const taskFormFlag = ref(false)
+const taskFormRef = ref()
+const dialogVisible = ref(false)
+const tableStore: any = new TableStore({
+    url: '/device-boot/devType/pageDevTypeList',
+    method: 'POST',
+    // isWebPaging: true,
+    column: [
+        {
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'name', title: '型号名称' },
+        {
+            field: 'icdId',
+            title: '关联icd',
+            formatter: (row: any) => {
+                return options.value.find((item: any) => item.id === row.cellValue)?.name
+            }
+        },
+        { field: 'createBy', title: '创建人' },
+        { field: 'createTime', title: '创建时间' },
+        { field: 'updateBy', title: '修改人' },
+        { field: 'updateTime', title: '修改时间' },
+        {
+             title: '操作',fixed: 'right',
+            width: '220',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: async row => {
+                        taskFormFlag.value = true
+                        setTimeout(() => {
+                            taskFormRef.value.open('编辑终端型号', row)
+                        }, 10)
+                    }
+                },
+
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    click: row => {
+                        delDevType([row.id]).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        taskFormFlag.value = true
+    }
+})
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchState = ''
+
+provide('tableStore', tableStore)
+
+const add = () => {
+    taskFormFlag.value = true
+    setTimeout(() => {
+        taskFormRef.value.open('新增终端型号')
+    }, 10)
+}
+const okRun = () => {
+    runTimer(formDate.value).then(res => {
+        ElMessage.success('操作成功')
+        dialogVisible.value = false
+        tableStore.index()
+    })
+}
+onMounted(() => {
+    getIcdList().then(res => {
+        options.value = res.data
+    })
+    tableStore.index()
+})
+</script>
diff --git a/src/views/system/reportForms/index.vue b/src/views/system/reportForms/index.vue
index 31865bbc..98767625 100644
--- a/src/views/system/reportForms/index.vue
+++ b/src/views/system/reportForms/index.vue
@@ -51,7 +51,7 @@ const tableStore: any = new TableStore({
             }
         },
         {
-            title: '操作',
+             title: '操作',fixed: 'right',
             width: '220',
             render: 'buttons',
             buttons: [
diff --git a/src/views/system/scheduledTasks/index.vue b/src/views/system/scheduledTasks/index.vue
index cdd292fe..77cabb07 100644
--- a/src/views/system/scheduledTasks/index.vue
+++ b/src/views/system/scheduledTasks/index.vue
@@ -1,206 +1,206 @@
-<template>
-    <div class="default-main">
-        <div>
-            <TableHeader ref="TableHeaderRef">
-                <template #select>
-                    <el-form-item label="任务名称">
-                        <el-input v-model="tableStore.table.params.searchValue" maxlength="32" show-word-limit clearable
-                            placeholder="请输入任务名称" />
-                    </el-form-item>
-                    <el-form-item label="任务状态:">
-                        <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择任务状态">
-                            <el-option label="运行" :value="1"></el-option>
-                            <el-option label="停止" :value="2"></el-option>
-                        </el-select>
-                    </el-form-item>
-                </template>
-                <template #operation>
-                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增定时任务</el-button>
-                </template>
-            </TableHeader>
-            <Table ref="tableRef" />
-        </div>
-        <!-- 新增 -->
-        <taskForm ref="taskFormRef" @submit="tableStore.index()" />
-        <!-- 补招 -->
-        <el-dialog v-model="dialogVisible" title="选择补招时间" width="500">
-            <el-date-picker v-model="formDate.date" type="date" value-format="YYYY-MM-DD" placeholder="选择日期">
-            </el-date-picker>
-            <template #footer>
-
-                <el-button @click="dialogVisible = false">取消</el-button>
-                <el-button type="primary" @click="okRun">
-                    确认
-                </el-button>
-            </template>
-        </el-dialog>
-    </div>
-</template>
-<script setup lang="ts">
-import { ref, onMounted, provide, } from 'vue'
-import TableStore from '@/utils/tableStore'
-import Table from '@/components/table/index.vue'
-import TableHeader from '@/components/table/header/index.vue'
-import taskForm from '@/views/system/scheduledTasks/form.vue'
-import { formatDate } from '@/utils/formatTime'
-import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
-import { timerRun, runTimer, deleteTimer, stop, start } from '@/api/system-boot/csDictData'
-defineOptions({
-    name: 'system-boot/sysConfig/timer'
-})
-const formDate = ref({
-    date: '',
-    id: ''
-})
-const taskFormRef = ref()
-const dialogVisible = ref(false)
-const selectedTime = ref('')
-const tableStore: any = new TableStore({
-    url: '/system-boot/timer/list',
-    method: 'POST',
-    isWebPaging: true,
-    column: [
-        { field: 'timerName', title: '任务名称', },
-        { field: 'actionClass', title: '任务执行器' },
-        { field: 'cron', title: '定时任务表达式' },
-        { field: 'remark', title: '备注' },
-        // {
-        //     field: 'jobStatus', title: '状态', width: '100',
-        //     render: 'tag',
-        //     custom: {
-        //         0: 'danger',
-        //         1: 'success',
-        //         2: 'danger'
-        //     },
-        //     replaceValue: {
-        //         0: '未启动',
-        //         1: '运行中',
-        //         2: '未启动',
-        //     }
-        // },
-        {
-            title: '状态',
-            render: 'switch',
-            width: 100,
-            field: 'jobStatus',
-            activeText: '运行中',
-            activeValue: '1',
-            inactiveText: '未启动',
-            inactiveValue: '2',
-            onChangeField: (row: any, value: any) => {
-                if (row.jobStatus == 1) {
-                    stop({ id: row.id }).then(res => {
-                        ElMessage.success(res.message)
-                        tableStore.index()
-                    })
-                }else{
-                    start({ id: row.id }).then(res => {
-                        ElMessage.success(res.message)
-                        tableStore.index()
-                    })  
-                }
-
-
-            }
-        },
-        { field: 'sort', title: '排序', width: '80' },
-        {
-            title: '操作',
-            width: '220',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'primary',
-                    title: '执行',
-                    type: 'primary',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'primary',
-                        title: '是否确认执行该定时任务'
-                    },
-                    click: row => {
-                        timerRun({ id: row.id }).then(res => {
-                            ElMessage.success('执行成功')
-                            tableStore.index()
-
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '编辑',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-
-                    click: async row => {
-                        taskFormRef.value.open('编辑定时任务', row)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '补招',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-
-                    click: async row => {
-                        formDate.value.date = formatDate(new Date(), 'YYYY-MM-DD')
-                        formDate.value.id = row.id
-                        dialogVisible.value = true
-                    }
-                },
-                {
-                    name: 'del',
-                    text: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除？'
-                    },
-                    click: row => {
-                        deleteTimer([row.id]).then(res => {
-                            ElMessage.success('删除成功')
-                            tableStore.index()
-                        })
-                    }
-                },
-
-
-
-
-            ]
-        }
-    ],
-
-    loadCallback: () => { }
-})
-tableStore.table.params.searchValue = ''
-tableStore.table.params.searchState = ''
-
-provide('tableStore', tableStore)
-
-const add = () => {
-
-    setTimeout(() => {
-        taskFormRef.value.open('新增定时任务')
-    }, 10)
-}
-const okRun = () => {
-    runTimer(formDate.value).then(res => {
-        ElMessage.success('操作成功')
-        dialogVisible.value = false
-        tableStore.index()
-    })
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div class="default-main">
+        <div>
+            <TableHeader ref="TableHeaderRef">
+                <template #select>
+                    <el-form-item label="任务名称">
+                        <el-input v-model="tableStore.table.params.searchValue" maxlength="32" show-word-limit clearable
+                            placeholder="请输入任务名称" />
+                    </el-form-item>
+                    <el-form-item label="任务状态:">
+                        <el-select v-model="tableStore.table.params.searchState" clearable placeholder="请选择任务状态">
+                            <el-option label="运行" :value="1"></el-option>
+                            <el-option label="停止" :value="2"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </template>
+                <template #operation>
+                    <el-button icon="el-icon-Plus" type="primary" @click="add">新增定时任务</el-button>
+                </template>
+            </TableHeader>
+            <Table ref="tableRef" />
+        </div>
+        <!-- 新增 -->
+        <taskForm ref="taskFormRef" @submit="tableStore.index()" />
+        <!-- 补招 -->
+        <el-dialog v-model="dialogVisible" title="选择补招时间" width="500">
+            <el-date-picker v-model="formDate.date" type="date" value-format="YYYY-MM-DD" placeholder="选择日期">
+            </el-date-picker>
+            <template #footer>
+
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="okRun">
+                    确认
+                </el-button>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, } from 'vue'
+import TableStore from '@/utils/tableStore'
+import Table from '@/components/table/index.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import taskForm from '@/views/system/scheduledTasks/form.vue'
+import { formatDate } from '@/utils/formatTime'
+import { ElMessage, ElMessageBox, ElDatePicker } from 'element-plus'
+import { timerRun, runTimer, deleteTimer, stop, start } from '@/api/system-boot/csDictData'
+defineOptions({
+    name: 'system-boot/sysConfig/timer'
+})
+const formDate = ref({
+    date: '',
+    id: ''
+})
+const taskFormRef = ref()
+const dialogVisible = ref(false)
+const selectedTime = ref('')
+const tableStore: any = new TableStore({
+    url: '/system-boot/timer/list',
+    method: 'POST',
+    isWebPaging: true,
+    column: [
+        { field: 'timerName', title: '任务名称', },
+        { field: 'actionClass', title: '任务执行器' },
+        { field: 'cron', title: '定时任务表达式' },
+        { field: 'remark', title: '备注' },
+        // {
+        //     field: 'jobStatus', title: '状态', width: '100',
+        //     render: 'tag',
+        //     custom: {
+        //         0: 'danger',
+        //         1: 'success',
+        //         2: 'danger'
+        //     },
+        //     replaceValue: {
+        //         0: '未启动',
+        //         1: '运行中',
+        //         2: '未启动',
+        //     }
+        // },
+        {
+            title: '状态',
+            render: 'switch',
+            width: 100,
+            field: 'jobStatus',
+            activeText: '运行中',
+            activeValue: '1',
+            inactiveText: '未启动',
+            inactiveValue: '2',
+            onChangeField: (row: any, value: any) => {
+                if (row.jobStatus == 1) {
+                    stop({ id: row.id }).then(res => {
+                        ElMessage.success(res.message)
+                        tableStore.index()
+                    })
+                }else{
+                    start({ id: row.id }).then(res => {
+                        ElMessage.success(res.message)
+                        tableStore.index()
+                    })  
+                }
+
+
+            }
+        },
+        { field: 'sort', title: '排序', width: '80' },
+        {
+             title: '操作',fixed: 'right',
+            width: '220',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'primary',
+                    title: '执行',
+                    type: 'primary',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'primary',
+                        title: '是否确认执行该定时任务'
+                    },
+                    click: row => {
+                        timerRun({ id: row.id }).then(res => {
+                            ElMessage.success('执行成功')
+                            tableStore.index()
+
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '编辑',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: async row => {
+                        taskFormRef.value.open('编辑定时任务', row)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '补招',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+
+                    click: async row => {
+                        formDate.value.date = formatDate(new Date(), 'YYYY-MM-DD')
+                        formDate.value.id = row.id
+                        dialogVisible.value = true
+                    }
+                },
+                {
+                    name: 'del',
+                    text: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除？'
+                    },
+                    click: row => {
+                        deleteTimer([row.id]).then(res => {
+                            ElMessage.success('删除成功')
+                            tableStore.index()
+                        })
+                    }
+                },
+
+
+
+
+            ]
+        }
+    ],
+
+    loadCallback: () => { }
+})
+tableStore.table.params.searchValue = ''
+tableStore.table.params.searchState = ''
+
+provide('tableStore', tableStore)
+
+const add = () => {
+
+    setTimeout(() => {
+        taskFormRef.value.open('新增定时任务')
+    }, 10)
+}
+const okRun = () => {
+    runTimer(formDate.value).then(res => {
+        ElMessage.success('操作成功')
+        dialogVisible.value = false
+        tableStore.index()
+    })
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>
diff --git a/src/views/system/subject/index.vue b/src/views/system/subject/index.vue
index 3280e9ff..e38d3c0e 100644
--- a/src/views/system/subject/index.vue
+++ b/src/views/system/subject/index.vue
@@ -1,150 +1,150 @@
-<template>
-    <div class="default-main">
-        <TableHeader select ref="TableHeaderRef">
-            <template #operation>
-                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
-            </template>
-        </TableHeader>
-        <Table ref="tableRef" />
-        <formTab ref="formTabRef" v-if="show" @Cancels=";(show = false), tableStore.index()" />
-    </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 { activateTheme, deleteTheme } from '@/api/system/subject/index'
-import formTab from './form/index.vue'
-import { ElMessage } from 'element-plus'
-import { useConfig } from '@/stores/config'
-import { getTheme } from '@/api/systerm'
-const configStore = useConfig()
-defineOptions({
-    name: 'user-boot/function/functionTree'
-})
-
-const formTabRef = ref()
-const TableHeaderRef = ref()
-const show = ref(false)
-const tableStore: any = new TableStore({
-    url: '/system-boot/theme/getAllThemes',
-    method: 'GET',
-    column: [
-        {
-            field: 'index',
-            title: '序号',
-            width: '80',
-            formatter: (row: any) => {
-                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-            }
-        },
-        { field: 'name', title: '主题名称' },
-        { field: 'remark', title: '描述' },
-        { field: 'logoUrl', title: '主题图标', render: 'image' },
-
-        {
-            title: '操作',
-            width: '180',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '激活 ',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    disabled: row => {
-                        return row.active == 1
-                    },
-                    click: row => {
-                        activateTheme({ id: row.id }).then(res => {
-                            ElMessage({
-                                message: '激活成功!',
-                                type: 'success'
-                            })
-                            tableStore.index()
-                        })
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '修改 ',
-                    type: 'primary',
-                    icon: 'el-icon-Plus',
-                    render: 'basicButton',
-                    click: row => {
-                        show.value = true
-                        setTimeout(() => {
-                            formTabRef.value.open({
-                                text: '修改主题',
-                                row: row
-                            })
-                        }, 10)
-                    }
-                },
-                {
-                    name: 'edit',
-                    title: '删除',
-                    type: 'danger',
-                    icon: 'el-icon-Delete',
-                    render: 'confirmButton',
-                    popconfirm: {
-                        confirmButtonText: '确认',
-                        cancelButtonText: '取消',
-                        confirmButtonType: 'danger',
-                        title: '确定删除吗？'
-                    },
-                    click: row => {
-                        deleteTheme({ id: row.id }).then(res => {
-                            ElMessage({
-                                message: '删除成功!',
-                                type: 'success'
-                            })
-                            tableStore.index()
-                        })
-                    }
-                }
-            ]
-        }
-    ],
-
-    loadCallback: () => {
-        getTheme().then(res => {
-            let list: any = [
-                'elementUiPrimary',
-                'tableHeaderBackground',
-                'tableHeaderColor',
-                'tableCurrent',
-                'menuBackground',
-                'menuColor',
-                'menuTopBarBackground',
-                'menuActiveBackground',
-                'menuActiveColor',
-                'headerBarTabColor',
-                'headerBarBackground'
-            ]
-
-            window.localStorage.setItem('getTheme', JSON.stringify(res.data))
-            for (let i = 0; i < list.length; i++) {
-                configStore.setLayout(list[i], JSON.parse(res.data[list[i]]))
-            }
-            configStore.setLayout('elementUiPrimary', JSON.parse(res.data['elementUiPrimary']))
-        })
-    }
-})
-
-provide('tableStore', tableStore)
-// 新增主题
-const add = () => {
-    show.value = true
-    setTimeout(() => {
-        formTabRef.value.open({
-            text: '新增主题'
-        })
-    }, 10)
-}
-onMounted(() => {
-    tableStore.index()
-})
-</script>
+<template>
+    <div class="default-main">
+        <TableHeader select ref="TableHeaderRef">
+            <template #operation>
+                <el-button icon="el-icon-Plus" type="primary" @click="add">新增</el-button>
+            </template>
+        </TableHeader>
+        <Table ref="tableRef" />
+        <formTab ref="formTabRef" v-if="show" @Cancels=";(show = false), tableStore.index()" />
+    </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 { activateTheme, deleteTheme } from '@/api/system/subject/index'
+import formTab from './form/index.vue'
+import { ElMessage } from 'element-plus'
+import { useConfig } from '@/stores/config'
+import { getTheme } from '@/api/systerm'
+const configStore = useConfig()
+defineOptions({
+    name: 'user-boot/function/functionTree'
+})
+
+const formTabRef = ref()
+const TableHeaderRef = ref()
+const show = ref(false)
+const tableStore: any = new TableStore({
+    url: '/system-boot/theme/getAllThemes',
+    method: 'GET',
+    column: [
+        {
+            field: 'index',
+            title: '序号',
+            width: '80',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { field: 'name', title: '主题名称' },
+        { field: 'remark', title: '描述' },
+        { field: 'logoUrl', title: '主题图标', render: 'image' },
+
+        {
+             title: '操作',fixed: 'right',
+            width: '180',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'edit',
+                    title: '激活 ',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    disabled: row => {
+                        return row.active == 1
+                    },
+                    click: row => {
+                        activateTheme({ id: row.id }).then(res => {
+                            ElMessage({
+                                message: '激活成功!',
+                                type: 'success'
+                            })
+                            tableStore.index()
+                        })
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '修改 ',
+                    type: 'primary',
+                    icon: 'el-icon-Plus',
+                    render: 'basicButton',
+                    click: row => {
+                        show.value = true
+                        setTimeout(() => {
+                            formTabRef.value.open({
+                                text: '修改主题',
+                                row: row
+                            })
+                        }, 10)
+                    }
+                },
+                {
+                    name: 'edit',
+                    title: '删除',
+                    type: 'danger',
+                    icon: 'el-icon-Delete',
+                    render: 'confirmButton',
+                    popconfirm: {
+                        confirmButtonText: '确认',
+                        cancelButtonText: '取消',
+                        confirmButtonType: 'danger',
+                        title: '确定删除吗？'
+                    },
+                    click: row => {
+                        deleteTheme({ id: row.id }).then(res => {
+                            ElMessage({
+                                message: '删除成功!',
+                                type: 'success'
+                            })
+                            tableStore.index()
+                        })
+                    }
+                }
+            ]
+        }
+    ],
+
+    loadCallback: () => {
+        getTheme().then(res => {
+            let list: any = [
+                'elementUiPrimary',
+                'tableHeaderBackground',
+                'tableHeaderColor',
+                'tableCurrent',
+                'menuBackground',
+                'menuColor',
+                'menuTopBarBackground',
+                'menuActiveBackground',
+                'menuActiveColor',
+                'headerBarTabColor',
+                'headerBarBackground'
+            ]
+
+            window.localStorage.setItem('getTheme', JSON.stringify(res.data))
+            for (let i = 0; i < list.length; i++) {
+                configStore.setLayout(list[i], JSON.parse(res.data[list[i]]))
+            }
+            configStore.setLayout('elementUiPrimary', JSON.parse(res.data['elementUiPrimary']))
+        })
+    }
+})
+
+provide('tableStore', tableStore)
+// 新增主题
+const add = () => {
+    show.value = true
+    setTimeout(() => {
+        formTabRef.value.open({
+            text: '新增主题'
+        })
+    }, 10)
+}
+onMounted(() => {
+    tableStore.index()
+})
+</script>