From 9ee495f40d0e72abd24cc7d12138a76ce11ea615 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 4 Jun 2024 18:06:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E8=BF=94=E5=9B=9E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../panorama/components/details/evaluate.vue  |  36 ++-
 .../harmonicSurvey/components/planManage.vue  |  18 +-
 .../components/undocumented/index.vue         |  22 +-
 src/views/pqs/supervise/plan/index.vue        |  24 +-
 src/views/pqs/supervise/retire/monitor.vue    |  48 ++--
 src/views/pqs/supervise/retire/terminal.vue   |  49 ++--
 .../components/jointDebugList/debug.vue       |  23 +-
 .../components/monitorpoint/index.vue         |  25 +-
 .../components/terminainal/index.vue          |  26 +-
 src/views/system/bpm/task/done/index.vue      |  20 +-
 src/views/system/bpm/task/index.vue           |   2 +-
 .../system/bpm/task/myInstance/index.vue      | 239 ++++++++++--------
 src/views/system/bpm/task/todo/index.vue      | 150 +++++------
 13 files changed, 404 insertions(+), 278 deletions(-)

diff --git a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
index 679d061e..ce49e317 100644
--- a/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
+++ b/src/views/pqs/qualityInspeection/panorama/components/details/evaluate.vue
@@ -24,8 +24,8 @@
                 </vxe-column>
                 <vxe-column field="qualifyData" title="指标合格率(%)" />
 
-                <vxe-colgroup title="电压偏差">
-                    <vxe-column field="vdevAssessLevel" title="评估结论">
+                <vxe-colgroup title="评估结论">
+                    <vxe-column field="vdevAssessLevel" title="电压偏差">
                         <template #default="scope">
                             <span
                                 class="conclusion"
@@ -43,10 +43,8 @@
                             </span>
                         </template>
                     </vxe-column>
-                    <vxe-column field="vdevQualifyData" title="指标合格率(%)" />
-                </vxe-colgroup>
-                <vxe-colgroup title="频率偏差">
-                    <vxe-column field="freqAssessLevel" title="评估结论">
+
+                    <vxe-column field="freqAssessLevel" title="频率偏差">
                         <template #default="scope">
                             <span
                                 class="conclusion"
@@ -64,10 +62,8 @@
                             </span>
                         </template>
                     </vxe-column>
-                    <vxe-column field="freqQualifyData" title="指标合格率(%)" />
-                </vxe-colgroup>
-                <vxe-colgroup title="电压总谐波畸变率">
-                    <vxe-column field="harmAssessLevel" title="评估结论">
+
+                    <vxe-column field="harmAssessLevel" title="电压总谐波畸变率">
                         <template #default="scope">
                             <span
                                 class="conclusion"
@@ -85,10 +81,8 @@
                             </span>
                         </template>
                     </vxe-column>
-                    <vxe-column field="harmQualifyData" title="指标合格率(%)" />
-                </vxe-colgroup>
-                <vxe-colgroup title="电压闪变">
-                    <vxe-column field="flickerAssessLevel" title="评估结论">
+
+                    <vxe-column field="flickerAssessLevel" title="电压闪变">
                         <template #default="scope">
                             <span
                                 class="conclusion"
@@ -106,10 +100,8 @@
                             </span>
                         </template>
                     </vxe-column>
-                    <vxe-column field="flickerQualifyData" title="指标合格率(%)" />
-                </vxe-colgroup>
-                <vxe-colgroup title="三相电压不平衡度">
-                    <vxe-column field="unbalanceAssessLevel" title="评估结论">
+
+                    <vxe-column field="unbalanceAssessLevel" title="三相电压不平衡度">
                         <template #default="scope">
                             <span
                                 class="conclusion"
@@ -127,7 +119,7 @@
                             </span>
                         </template>
                     </vxe-column>
-                    <vxe-column field="unbalanceQualifyData" title="指标合格率(%)" />
+                    <!-- <vxe-column field="unbalanceQualifyData" title="指标合格率(%)" /> -->
                 </vxe-colgroup>
             </vxe-table>
         </div>
@@ -193,13 +185,17 @@ const analysis = (e: any) => {
 
         let list: any = []
         let time: any = []
+        let mun: any = []
         res.data.forEach((item: any, num: any) => {
             time.push(item.deptName)
             list.push([])
             item.children.forEach((val: any, i: any) => {
+                mun.push(val.score == 3.14159 ? null : val.score)
                 list[num].push(val.score == 3.14159 ? null : val.score)
             })
         })
+        console.log('🚀 ~ getAssessTrend ~ mun:', mun)
+
         list.forEach((item: any, i: any) => {
             picEChart.value.options.series.push({
                 name: time[i],
@@ -207,6 +203,8 @@ const analysis = (e: any) => {
                 data: item
             })
         })
+        picEChart.value.yAxis.min = Math.min(...mun) < 1 ? 0 : (Math.min(...mun) - 0.5).toFixed(2)
+        picEChart.value.yAxis.max = Math.max(...mun) > 4.5 ? 5 : (Math.max(...mun) + 0.5).toFixed(2)
         loading.value = false
     })
 }
diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
index cb357c15..5e92402f 100644
--- a/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
+++ b/src/views/pqs/supervise/harmonicSurvey/components/planManage.vue
@@ -13,7 +13,7 @@
 import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
-import { ref, onMounted, provide, nextTick } from 'vue'
+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'
@@ -23,13 +23,14 @@ 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'
-const { push } = useRouter()
+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',
@@ -89,6 +90,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
+                        flag.value = true
                         handleAudit(row.processInstanceId,row.historyInstanceId)
                     }
                 },
@@ -198,6 +200,18 @@ onMounted(() => {
         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
+    }
+)
 </script>
 
 <style scoped lang="scss"></style>
diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
index ae764073..172a3ca2 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue
@@ -30,7 +30,7 @@
     <addForm ref="addForms" @onSubmit="tableStore.index()" openType="create"></addForm>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, nextTick } from 'vue'
+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'
@@ -47,7 +47,7 @@ import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 const dictData = useDictData()
-const { push } = useRouter()
+const { push, options, currentRoute } = useRouter()
 const TableHeaderRef = ref()
 const tableRef = ref()
 const areaOptionList = dictData.getBasicData('jibei_area')
@@ -56,6 +56,7 @@ 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,
@@ -133,6 +134,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
+                        flag.value = true
                         handleAudit(row.processInstanceId, row.historyInstanceId)
                     }
                 },
@@ -143,7 +145,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status !=3
+                        return row.createBy != adminInfo.$state.id || row.status != 3
                     },
                     click: row => {
                         addForms.value.open({
@@ -159,7 +161,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return row.createBy != adminInfo.$state.id || row.status !=1
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
                         cancelLeave(row)
@@ -238,6 +240,18 @@ const cancelLeave = async (row: any) => {
 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) => {
diff --git a/src/views/pqs/supervise/plan/index.vue b/src/views/pqs/supervise/plan/index.vue
index 3ff0386d..437f82fe 100644
--- a/src/views/pqs/supervise/plan/index.vue
+++ b/src/views/pqs/supervise/plan/index.vue
@@ -53,9 +53,10 @@ const adminInfo = useAdminInfo()
 defineOptions({
     name: 'plan'
 })
+const flag = ref(false)
 // const layout = mainHeight(120) as any
 const dictData = useDictData()
-const { push } = useRouter()
+const { push, options, currentRoute } = useRouter()
 const router = useRouter() // 路由对象
 const TableHeaderRef = ref()
 const tableRef = ref()
@@ -172,6 +173,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
+                        flag.value = true
                         handleDetails(row.processInstanceId, row.historyInstanceId)
                     },
                     disabled: row => {
@@ -208,9 +210,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return (
-                            row.createBy != adminInfo.$state.id || row.status !=3
-                        )
+                        return row.createBy != adminInfo.$state.id || row.status != 3
                     },
                     click: row => {
                         addForms.value.open({
@@ -226,9 +226,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-Open',
                     render: 'basicButton',
                     disabled: row => {
-                        return (
-                            row.createBy != adminInfo.$state.id || row.status != 1 
-                        )
+                        return row.createBy != adminInfo.$state.id || row.status != 1
                     },
                     click: row => {
                         cancelLeave(row)
@@ -359,4 +357,16 @@ const handleEffectProblem = (row: any) => {
         }
     })
 }
+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/retire/monitor.vue b/src/views/pqs/supervise/retire/monitor.vue
index 69ad1a6a..3ea3f6c2 100644
--- a/src/views/pqs/supervise/retire/monitor.vue
+++ b/src/views/pqs/supervise/retire/monitor.vue
@@ -1,6 +1,6 @@
 <!--待办事项列表-->
 <template>
-    <div class='default-main'>
+    <div>
         <TableHeader date-picker>
             <template v-slot:select>
                 <!--        <el-form-item label='任务名称'>-->
@@ -12,22 +12,21 @@
                 <!--        </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'></Table>
+        <Table ref="tableRef"></Table>
         <!--弹框-->
-        <device-quit-popup ref='deviceQuitPopup' />
-
+        <device-quit-popup ref="deviceQuitPopup" />
     </div>
 </template>
 
-<script setup lang='ts'>
+<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 { 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'
@@ -37,16 +36,20 @@ import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunni
 defineOptions({
     name: 'supervision/retire'
 })
-const { push } = useRouter()
+const { push, options, currentRoute } = useRouter()
 const deviceQuitPopup = ref()
+const flag = ref(false)
 
 const tableStore = new TableStore({
     url: '/supervision-boot/quitRunningDevice/list',
     method: 'POST',
+    publicHeight: 65,
     column: [
         { title: '序号', type: 'seq', width: 80 },
         {
-            title: '设备类型', field: 'deviceType', minWidth: 130,
+            title: '设备类型',
+            field: 'deviceType',
+            minWidth: 130,
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -62,7 +65,9 @@ const tableStore = new TableStore({
         { title: '设备名称', field: 'deviceName', minWidth: 130 },
         { title: '退役原因', field: 'propertyNo', minWidth: 130 },
         {
-            title: '设备状态', field: 'deviceStatus', minWidth: 130,
+            title: '设备状态',
+            field: 'deviceStatus',
+            minWidth: 130,
             render: 'tag',
             custom: {
                 0: 'success',
@@ -80,7 +85,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            field: 'status', title: '审核状态', minWidth: 100,
+            field: 'status',
+            title: '审核状态',
+            minWidth: 100,
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -111,7 +118,8 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        handleAudit(row.processInstanceId,row.historyInstanceId)
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
                     }
                 },
                 {
@@ -149,7 +157,6 @@ const tableStore = new TableStore({
                 delete tableStore.table.params[key]
             }
         }
-
     }
 })
 
@@ -166,7 +173,7 @@ const add = () => {
 }
 
 /** 流程实例详情 */
-const handleAudit = (instanceId: string,historyInstanceId:string) => {
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
     push({
         name: 'BpmProcessInstanceDetail',
         state: {
@@ -197,5 +204,16 @@ const cancelLeave = async (row: any) => {
     tableStore.index()
 }
 
-
+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/retire/terminal.vue b/src/views/pqs/supervise/retire/terminal.vue
index 0231a729..83642e00 100644
--- a/src/views/pqs/supervise/retire/terminal.vue
+++ b/src/views/pqs/supervise/retire/terminal.vue
@@ -1,6 +1,6 @@
 <!--待办事项列表-->
 <template>
-    <div class='default-main'>
+    <div>
         <TableHeader date-picker>
             <template v-slot:select>
                 <!--        <el-form-item label='任务名称'>-->
@@ -12,22 +12,21 @@
                 <!--        </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'></Table>
+        <Table ref="tableRef"></Table>
         <!--弹框-->
-        <device-quit-popup ref='deviceQuitPopup' />
-
+        <device-quit-popup ref="deviceQuitPopup" />
     </div>
 </template>
 
-<script setup lang='ts'>
+<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 { 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'
@@ -37,16 +36,19 @@ import { cancelQuitRunningDevice } from '@/api/supervision-boot/device/quitRunni
 defineOptions({
     name: 'supervision/retire'
 })
-const { push } = useRouter()
+const { push, options, currentRoute } = useRouter()
 const deviceQuitPopup = ref()
-
+const flag = ref(false)
 const tableStore = new TableStore({
     url: '/supervision-boot/quitRunningDevice/list',
     method: 'POST',
+    publicHeight: 65,
     column: [
         { title: '序号', type: 'seq', width: 80 },
         {
-            title: '设备类型', field: 'deviceType', minWidth: 130,
+            title: '设备类型',
+            field: 'deviceType',
+            minWidth: 130,
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -62,7 +64,9 @@ const tableStore = new TableStore({
         { title: '设备名称', field: 'deviceName', minWidth: 130 },
         { title: '退役原因', field: 'propertyNo', minWidth: 130 },
         {
-            title: '设备状态', field: 'deviceStatus', minWidth: 130,
+            title: '设备状态',
+            field: 'deviceStatus',
+            minWidth: 130,
             render: 'tag',
             custom: {
                 0: 'success',
@@ -80,7 +84,9 @@ const tableStore = new TableStore({
             }
         },
         {
-            field: 'status', title: '审核状态', minWidth: 100,
+            field: 'status',
+            title: '审核状态',
+            minWidth: 100,
             render: 'tag',
             custom: {
                 1: 'primary',
@@ -111,7 +117,8 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
-                        handleAudit(row.processInstanceId,row.historyInstanceId)
+                        flag.value = true
+                        handleAudit(row.processInstanceId, row.historyInstanceId)
                     }
                 },
                 {
@@ -149,7 +156,6 @@ const tableStore = new TableStore({
                 delete tableStore.table.params[key]
             }
         }
-
     }
 })
 
@@ -166,7 +172,7 @@ const add = () => {
 }
 
 /** 流程实例详情 */
-const handleAudit = (instanceId: string,historyInstanceId:string) => {
+const handleAudit = (instanceId: string, historyInstanceId: string) => {
     push({
         name: 'BpmProcessInstanceDetail',
         state: {
@@ -197,5 +203,16 @@ const cancelLeave = async (row: any) => {
     tableStore.index()
 }
 
-
+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/terminalNetworkDetection/components/jointDebugList/debug.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
index 61d12329..98b76ecc 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue
@@ -20,7 +20,13 @@
             label-position="right"
         >
             <el-form-item label="原因：" prop="reason">
-                <el-input v-model="form.reason" autocomplete="off" placeholder="请输入原因" />
+                <el-input
+                    v-model="form.reason"
+                    autocomplete="off"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    type="textarea"
+                    placeholder="请输入原因"
+                />
             </el-form-item>
         </el-form>
         <template #footer>
@@ -37,10 +43,10 @@ import { useDictData } from '@/stores/dictData'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { addMointorPointTempLinedebug } from '@/api/supervision-boot/jointDebugList/index'
 const emits = defineEmits(['onSubmit'])
-const props=defineProps({
-    debugId:{
-        type:String,
-        default:''
+const props = defineProps({
+    debugId: {
+        type: String,
+        default: ''
     }
 })
 const dictData = useDictData()
@@ -52,7 +58,7 @@ const selectFormType = ref('')
 selectFormType.value = '0'
 const resetForm = () => {
     form.value = {
-        reason: '', //填报人
+        reason: '' //填报人
     }
 }
 //初始化数据
@@ -101,9 +107,9 @@ const confirmForm = () => {
     ruleFormRef.value.validate(valid => {
         if (valid) {
             //提交监测点联调信息
-            form.value={
+            form.value = {
                 ...form.value,
-                id:props.debugId
+                id: props.debugId
             }
             addMointorPointTempLinedebug(form.value).then(res => {
                 ruleFormRef.value.resetFields()
@@ -118,4 +124,3 @@ const confirmForm = () => {
 }
 defineExpose({ open })
 </script>
-
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
index 64470ae7..3b3b871d 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/index.vue
@@ -27,7 +27,7 @@
     <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, nextTick } from 'vue'
+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'
@@ -42,14 +42,8 @@ import { cancelMointorPointFormData } from '@/api/supervision-boot/monitorpoint/
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 const dictData = useDictData()
-const { push, beforeEach } = useRouter()
-beforeEach((to, from) => {
-    if (from.path == '/bpm/instanceDetail') {
-        if (to.path == '/admin/terminalNetwotk') {
-            console.log('监测点2222')
-        }
-    }
-})
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
 const TableHeaderRef = ref()
 const tableRef = ref()
 const areaOptionList = dictData.getBasicData('jibei_area')
@@ -107,6 +101,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
+                        flag.value = true
                         handleAudit(row.processInstanceId, row.historyInstanceId)
                     }
                 },
@@ -205,6 +200,18 @@ const exportEvent = () => {
 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) => {
diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
index b418acd8..42ad2686 100644
--- a/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
+++ b/src/views/pqs/supervise/terminalNetworkDetection/components/terminainal/index.vue
@@ -12,7 +12,7 @@
     <addForm ref="addForms" @onSubmit="tableStore.index()"></addForm>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, nextTick } from 'vue'
+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'
@@ -27,20 +27,15 @@ import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
 const dictData = useDictData()
-const { push, beforeEach } = useRouter()
-beforeEach((to, from) => {
-    if (from.path == '/bpm/instanceDetail') {
-        if (to.path == '/admin/terminalNetwotk') {
-            console.log('终端1111')
-        }
-    }
-})
+const { push, options, currentRoute } = useRouter()
+
 const TableHeaderRef = ref()
 const tableRef = ref()
 const areaOptionList = dictData.getBasicData('jibei_area')
 const ruleFormRef = ref()
 const show: any = ref(false)
 const fileList = ref([])
+const flag = ref(false)
 const tableStore = new TableStore({
     url: '/supervision-boot/deVReport/list',
     publicHeight: 65,
@@ -137,6 +132,7 @@ const tableStore = new TableStore({
                     icon: 'el-icon-EditPen',
                     render: 'basicButton',
                     click: row => {
+                        flag.value = true
                         handleAudit(row.processInstanceId, row.historyInstanceId)
                     }
                 },
@@ -233,6 +229,18 @@ 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({
diff --git a/src/views/system/bpm/task/done/index.vue b/src/views/system/bpm/task/done/index.vue
index c597edf7..7123fbcc 100644
--- a/src/views/system/bpm/task/done/index.vue
+++ b/src/views/system/bpm/task/done/index.vue
@@ -17,7 +17,7 @@
 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 { onMounted, provide, ref,watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { dateFormatter, formatPast2 } from '@/utils/formatTime'
 
@@ -25,8 +25,8 @@ defineOptions({
   name: 'businessUser'
 })
 
-const { push } = useRouter()
-
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
 const tableStore = new TableStore({
   url: '/bpm-boot/bpm/task/doneList',
   method: 'POST',
@@ -87,6 +87,7 @@ const tableStore = new TableStore({
           icon: 'el-icon-EditPen',
           render: 'basicButton',
           click: row => {
+            flag.value = true
             handleAudit(row.processInstance.id)
           }
         }
@@ -118,4 +119,17 @@ const handleAudit = (instanceId: any) => {
     }
   })
 }
+
+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/index.vue b/src/views/system/bpm/task/index.vue
index 5f81ee21..cd9a0b2d 100644
--- a/src/views/system/bpm/task/index.vue
+++ b/src/views/system/bpm/task/index.vue
@@ -22,7 +22,7 @@ import MyInstance from './myInstance/index.vue'
 import { mainHeight } from '@/utils/layout'
 
 defineOptions({
-  // name: 'bpm/task'
+  name: 'bpm/task'
 })
 const activeName = ref('1')
 
diff --git a/src/views/system/bpm/task/myInstance/index.vue b/src/views/system/bpm/task/myInstance/index.vue
index 86b982e5..d0b02966 100644
--- a/src/views/system/bpm/task/myInstance/index.vue
+++ b/src/views/system/bpm/task/myInstance/index.vue
@@ -1,27 +1,23 @@
 <!--待办事项列表-->
 <template>
-  <div>
-    <TableHeader date-picker>
-      <template v-slot:select>
-        <el-form-item label='任务名称'>
-          <el-input
-              v-model='tableStore.table.params.searchValue'
-              placeholder='请输入任务名称'
-          ></el-input>
-        </el-form-item>
-      </template>
-
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef'></Table>
-  </div>
+    <div>
+        <TableHeader date-picker>
+            <template v-slot:select>
+                <el-form-item label="任务名称">
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称"></el-input>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref="tableRef"></Table>
+    </div>
 </template>
 
-<script setup lang='ts'>
+<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 { onMounted, provide, ref, watch } from 'vue'
 import { formatDate, formatPast2 } from '@/utils/formatTime'
 import { useRouter } from 'vue-router'
 import { useDictData } from '@/stores/dictData'
@@ -29,115 +25,134 @@ const dictData = useDictData()
 const categoryOptionList = dictData.getBasicData('flow_category')
 
 defineOptions({
-  name: 'businessUser'
+    name: 'businessUser'
 })
 
-const { push } = useRouter()
-
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
 
 const tableStore = new TableStore({
-  url: '/bpm-boot/bpm/processInstance/myPage',
-  method: 'POST',
-  publicHeight: 65,
-  column: [
-    {
-      field: 'index',
-      title: '序号',
-      width: '60',
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { title: '任务名称', field: 'name', minWidth: 130 },
-    { 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: [
+    url: '/bpm-boot/bpm/processInstance/myPage',
+    method: 'POST',
+    publicHeight: 65,
+    column: [
         {
-          name: 'productSetting',
-          title: '流程详情',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            handleAudit(row.id)
-          }
-        }
-      ]
-    }
-  ],
-  beforeSearchFun: () => {
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
-    }
+            field: 'index',
+            title: '序号',
+            width: '60',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '任务名称', field: 'name', minWidth: 130 },
+        {
+            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)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        for (let key in tableStore.table.params) {
+            if (tableStore.table.params[key] === '') {
+                delete tableStore.table.params[key]
+            }
+        }
+    }
 })
 
 onMounted(() => {
-  // 加载数据
-  tableStore.index()
+    // 加载数据
+    tableStore.index()
 })
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
 /** 处理审批按钮 */
 const handleAudit = (instanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    query: {
-      id: instanceId
-    }
-  })
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId
+        }
+    })
 }
-
+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 f268b5c5..72e32ddc 100644
--- a/src/views/system/bpm/task/todo/index.vue
+++ b/src/views/system/bpm/task/todo/index.vue
@@ -1,100 +1,106 @@
 <!--待办事项列表-->
 <template>
-  <div>
-    <TableHeader>
-      <template v-slot:select>
-        <el-form-item label='任务名称'>
-          <el-input
-              v-model='tableStore.table.params.searchValue'
-              placeholder='请输入任务名称'
-          ></el-input>
-        </el-form-item>
-      </template>
-
-    </TableHeader>
-    <!--表格-->
-    <Table ref='tableRef'></Table>
-  </div>
+    <div>
+        <TableHeader>
+            <template v-slot:select>
+                <el-form-item label="任务名称">
+                    <el-input v-model="tableStore.table.params.searchValue" placeholder="请输入任务名称"></el-input>
+                </el-form-item>
+            </template>
+        </TableHeader>
+        <!--表格-->
+        <Table ref="tableRef"></Table>
+    </div>
 </template>
 
-<script setup lang='ts'>
+<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 { onMounted, provide, ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
-
 defineOptions({
-  name: 'businessUser'
+    name: 'businessUser'
 })
 
-const { push } = useRouter()
-
+const { push, options, currentRoute } = useRouter()
+const flag = ref(false)
 
 const tableStore = new TableStore({
-  url: '/bpm-boot/bpm/task/todoList',
-  method: 'POST',
-  publicHeight: 65,
-  column: [
-    {
-      field: 'index',
-      title: '序号',
-      width: '60',
-      formatter: (row: any) => {
-        return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
-      }
-    },
-    { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
-    { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
-    { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
-    { title: '发起时间', field: 'createTime', minWidth: 170 },
-    { title: '当前任务', field: 'name', minWidth: 130 },
-    {
-      title: '操作',
-      align: 'center',
-      width: '230',
-      render: 'buttons',
-      buttons: [
+    url: '/bpm-boot/bpm/task/todoList',
+    method: 'POST',
+    publicHeight: 65,
+    column: [
         {
-          name: 'productSetting',
-          title: '办理',
-          type: 'primary',
-          icon: 'el-icon-EditPen',
-          render: 'basicButton',
-          click: row => {
-            handleAudit(row.processInstance.id)
-          }
+            field: 'index',
+            title: '序号',
+            width: '60',
+            formatter: (row: any) => {
+                return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
+            }
+        },
+        { title: '任务名称', field: 'processInstance.name', minWidth: 130 },
+        { title: '发起人', field: 'processInstance.startUser.name', minWidth: 130 },
+        { title: '发起部门', field: 'processInstance.startUser.deptName', minWidth: 130 },
+        { title: '发起时间', field: 'createTime', minWidth: 170 },
+        { title: '当前任务', field: 'name', minWidth: 130 },
+        {
+            title: '操作',
+            align: 'center',
+            width: '230',
+            render: 'buttons',
+            buttons: [
+                {
+                    name: 'productSetting',
+                    title: '办理',
+                    type: 'primary',
+                    icon: 'el-icon-EditPen',
+                    render: 'basicButton',
+                    click: row => {
+                        flag.value = true
+                        handleAudit(row.processInstance.id)
+                    }
+                }
+            ]
+        }
+    ],
+    beforeSearchFun: () => {
+        for (let key in tableStore.table.params) {
+            if (tableStore.table.params[key] === '') {
+                delete tableStore.table.params[key]
+            }
         }
-      ]
     }
-  ],
-  beforeSearchFun: () => {
-    for (let key in tableStore.table.params) {
-      if (tableStore.table.params[key] === '') {
-        delete tableStore.table.params[key]
-      }
-    }
-
-  }
 })
 
 onMounted(() => {
-  // 加载数据
-  tableStore.index()
+    // 加载数据
+    tableStore.index()
 })
 tableStore.table.params.searchValue = ''
 provide('tableStore', tableStore)
 
 /** 处理审批按钮 */
 const handleAudit = (instanceId: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    query: {
-      id: instanceId,
-      todo: 'todo'
-    }
-  })
+    push({
+        name: 'BpmProcessInstanceDetail',
+        query: {
+            id: instanceId,
+            todo: 'todo'
+        }
+    })
 }
-
+watch(
+    () => currentRoute.value.path,
+    () => {
+        if (flag.value && options.history.state.forward?.split('/')[1] == 'bpm') {
+            tableStore.index()
+            flag.value = false
+        }
+    },
+    {
+        deep: true
+    }
+)
 </script>