From 794646c00133cb94d8003ac3e87b1a8deb459036 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Sat, 14 Sep 2024 10:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/interferenceUserTable.vue      | 22 ++++++++++++++++--
 src/views/pqs/supervise/terminal/index.vue    | 23 +++++++++++++++----
 src/views/system/bpm/task/index.vue           |  6 ++---
 src/views/system/bpm/task/todo/index.vue      | 21 +++++++++++++----
 4 files changed, 58 insertions(+), 14 deletions(-)

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 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, provide, nextTick } from 'vue'
+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'
@@ -52,7 +52,7 @@ 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 } from '@/api/supervision-boot/interfere/index'
+import { cancelFormData, getUserReportById } from '@/api/supervision-boot/interfere/index'
 import { deleteUserReport } from '@/api/supervision-boot/delete/index'
 const addForms = ref()
 const dictData = useDictData()
@@ -357,4 +357,22 @@ const exportExcelTemplate = () => {
 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/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 @@
     <div class='default-main'>
         <el-tabs v-model='activeName' type='border-card'>
             <el-tab-pane label='干扰源用户台账' name='1' >
-                <interferenceUserTable v-if="activeName == '1'" />
+                <interferenceUserTable :id='id' v-if="activeName == '1'" />
             </el-tab-pane>
             <el-tab-pane label='敏感及重要用户台账' name='2' >
                 <sensitiveUserTable v-if="activeName == '2'" />
@@ -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
 </script>
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 @@
       <el-tab-pane label='我发起的' name='3'>
         <MyInstance v-if="activeName == '3'" />
       </el-tab-pane>
-      <el-tab-pane label='预告警单任务' name='4'>
-        <AlarmTask v-if="activeName == '4'" />
-      </el-tab-pane>
+<!--      <el-tab-pane label='预告警单任务' name='4'>-->
+<!--        <AlarmTask v-if="activeName == '4'" />-->
+<!--      </el-tab-pane>-->
     </el-tabs>
   </div>
 </template>
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 @@
   <div>
     <TableHeader>
       <template v-slot:select>
-        <el-form-item label='任务名称'>
-          <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称'></el-input>
-        </el-form-item>
+<!--        <el-form-item label='任务名称'>-->
+<!--          <el-input v-model='tableStore.table.params.searchValue' placeholder='请输入任务名称'></el-input>-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item label='任务类型'>-->
+<!--          <el-select v-model="tableStore.table.params.runF" clearable placeholder="请选择任务类型">-->
+<!--            <el-option-->
+<!--                v-for="item in runFlagList"-->
+<!--                :key="item.id"-->
+<!--                :label="item.name"-->
+<!--                :value="item.id"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       </template>
     </TableHeader>
     <!--表格-->
@@ -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 (
                 // 干扰源用户常态化管理