diff --git a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue index d0299233..f9680b29 100644 --- a/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue +++ b/src/views/pqs/supervise/terminal/components/interferenceUserTable.vue @@ -41,7 +41,7 @@ diff --git a/src/views/pqs/supervise/terminal/index.vue b/src/views/pqs/supervise/terminal/index.vue index 58774f56..14d08de3 100644 --- a/src/views/pqs/supervise/terminal/index.vue +++ b/src/views/pqs/supervise/terminal/index.vue @@ -2,7 +2,7 @@
- + @@ -28,15 +28,28 @@ import substationLedger from './components/substationLedger.vue' import deviceLedgerTable from './components/deviceLedgerTable.vue' import monitorLedgerTable from './components/monitorLedgerTable.vue' import { mainHeight } from '@/utils/layout' +import { useRoute } from 'vue-router' +const route = useRoute() +const id = ref('') defineOptions({ name: 'Supervision/Terminaldetection' }) const activeName = ref('1') -const network = ref('1') -const cycle = ref('1') -const Statistics = ref() -const compatibility = ref() + + +watch(() => route.query.t, async (newValue, oldValue) => { + if (route.fullPath.includes('Supervision/Terminaldetection')) { + let type = (route.query.type as string) || 'null' + if (type == '1') { + activeName.value = '1' + } else { + activeName.value = '4' + } + id.value = (route.query.id as string) || 'null' + id.value = id.value + '@' + route.query.t + } +}, {deep: true, immediate: true}) const layout = mainHeight(63) as any diff --git a/src/views/system/bpm/task/index.vue b/src/views/system/bpm/task/index.vue index 92d57bbb..29825594 100644 --- a/src/views/system/bpm/task/index.vue +++ b/src/views/system/bpm/task/index.vue @@ -10,9 +10,9 @@ - - - + + +
diff --git a/src/views/system/bpm/task/todo/index.vue b/src/views/system/bpm/task/todo/index.vue index 1ad08400..4710a2e9 100644 --- a/src/views/system/bpm/task/todo/index.vue +++ b/src/views/system/bpm/task/todo/index.vue @@ -3,9 +3,20 @@
@@ -143,7 +154,9 @@ const tableStore = new TableStore({ // 终端入网检测 || key == 'device_info_add' // 技术监督计划 - || key == 'sup_plan_add') { + || key == 'sup_plan_add' + // 台账管理 干扰源用户台账 + || key == 'build_user_info_archivist') { type = 1 } else if ( // 干扰源用户常态化管理