From e97aa2cd0eb1418a720a1d8ce27db1db8d895491 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Wed, 22 Oct 2025 15:32:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=8F=AC=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cs-device-boot/recall.ts              |   1 +
 src/components/tree/govern/selectTree.vue     |   6 +-
 src/components/tree/select.vue                |  26 +++-
 .../govern/monitorRecall/eventRecall.vue      | 122 ++++++++++++------
 src/views/govern/monitorRecall/index.vue      |  55 +++-----
 5 files changed, 126 insertions(+), 84 deletions(-)

diff --git a/src/api/cs-device-boot/recall.ts b/src/api/cs-device-boot/recall.ts
index b79d4eb..e354eec 100644
--- a/src/api/cs-device-boot/recall.ts
+++ b/src/api/cs-device-boot/recall.ts
@@ -17,3 +17,4 @@ export function fileRecall(data: any) {
        data: data
     })
 }
+
diff --git a/src/components/tree/govern/selectTree.vue b/src/components/tree/govern/selectTree.vue
index 7667247..e31c6ba 100644
--- a/src/components/tree/govern/selectTree.vue
+++ b/src/components/tree/govern/selectTree.vue
@@ -1,5 +1,5 @@
 <template>
-    <Tree ref="treRef" :width="width" :data="tree" default-expand-all @changePointType="changePointType" @checkedNodesChange="handleCheckedNodesChange"/>
+    <Tree ref="treRef" :width="width" :data="tree" default-expand-all  @checkedNodesChange="handleCheckedNodesChange"/>
 </template>
 
 <script lang="ts" setup>
@@ -78,9 +78,7 @@ const info = () => {
         })
     })
 }
-const changePointType = (val: any, obj: any) => {
-    emit('pointTypeChange', val, obj)
-}
+
 // 处理子组件传递的勾选节点变化，并转发给父组件
 const handleCheckedNodesChange = (nodes: any[]) => {
     // 先给父组件
diff --git a/src/components/tree/select.vue b/src/components/tree/select.vue
index dfed1ee..b0582fa 100644
--- a/src/components/tree/select.vue
+++ b/src/components/tree/select.vue
@@ -11,10 +11,22 @@
                     </template>
                 </el-input>
             </div>
-            <el-tree :style="{ height:  'calc(100vh)' }"
-                style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current 
-                :filter-node-method='filterNode' node-key='id' v-bind='$attrs'
-                show-checkbox @check="handleCheckChange" :default-checked-keys="defaultCheckedKeys">
+             <el-tree 
+                :style="{ height: 'calc(100vh)' }"
+                style='overflow: auto;' 
+                ref='treeRef' 
+                :props='defaultProps' 
+                highlight-current 
+                :filter-node-method='filterNode' 
+                node-key='id' 
+                show-checkbox 
+                @check="handleCheckChange" 
+                @node-click="handleNodeClick"
+                :default-checked-keys="defaultCheckedKeys"
+                v-bind='$attrs'
+           
+            
+                >
                 <template #default='{ node, data }'>
                     <span class='custom-tree-node'>
                         <Icon :name='data.icon' style='font-size: 16px' :style='{ color: data.color }'
@@ -100,6 +112,12 @@ const chooseNode = (value: string, data: any, node: any) => {
     return false
 }
 
+
+// 处理节点点击事件
+const handleNodeClick = (data: any, node: any, event: any) => {
+ 
+}
+
 // 存储所有勾选的节点
 const checkedNodes = ref<any[]>([])
 const defaultCheckedKeys = ref<string[]>([])
diff --git a/src/views/govern/monitorRecall/eventRecall.vue b/src/views/govern/monitorRecall/eventRecall.vue
index 1161ed2..56dfdc4 100644
--- a/src/views/govern/monitorRecall/eventRecall.vue
+++ b/src/views/govern/monitorRecall/eventRecall.vue
@@ -16,9 +16,10 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import { Setting } from '@element-plus/icons-vue'
-import {eventRecall,fileRecall} from '@/api/cs-device-boot/recall'
+import {eventRecall,fileRecall,logRecall} from '@/api/cs-device-boot/recall'
 import { ElMessage } from 'element-plus'
-import DatePicker from '@/components/form/datePicker/time.vue'
+import { el } from 'element-plus/es/locale'
+
 
 const props = defineProps({
     checkedNodes: {
@@ -27,11 +28,8 @@ const props = defineProps({
     }
 });
 
-const headerRef = ref()
-const datePickerRef = ref()
-
 const tableStore: any = new TableStore({
-    url: '/cs-device-boot/portableOfflLog/queryMainLogPage',
+    url: '/cs-device-boot/csTerminalReply/bzLogs',
     publicHeight: 0,
     method: 'POST',
     column: [
@@ -39,6 +37,14 @@ const tableStore: any = new TableStore({
             title: '序号', width: 80, formatter: (row: any) => {
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
+        },
+         {
+            field: 'engineeringName',
+            title: '项目名称',
+            minWidth: 170,
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
+            }
         },
         {
             field: 'projectName',
@@ -48,45 +54,56 @@ const tableStore: any = new TableStore({
                 return row.cellValue ? row.cellValue : '/'
             }
         },
-        { field: 'successCount', title: '成功解析数', minWidth: 150 },
-        { field: 'startTime', title: '导入开始时间', minWidth: 170, sortable: true },
-        { field: 'endTime', title: '导入结束时间', minWidth: 170 , sortable: true},
-        {
-            title: '解析状态',
-            field: 'status',
-            width: 100,
-            render: 'tag',
-            custom: {
-                0: 'warning',
-                1: 'success',
-                2: 'danger',
-                3: 'primary'
-            },
-            replaceValue: {
-                0: '未解析',
-                1: '解析成功',
-                2: '解析失败',
-                3: '文件不存在'
+         {
+            field: 'deviceName',
+            title: '设备名称',
+            minWidth: 170,
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+         {
+            field: 'lineName',
+            title: '监测点名称',
+            minWidth: 170,
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
             }
         },
         {
-            title: '操作',
-            width: '100',
-            render: 'buttons',
-            buttons: [
-                {
-                    name: 'edit',
-                    title: '详情',
-                    type: 'primary',
-                    icon: 'el-icon-EditPen',
-                    render: 'basicButton',
-                    click: row => {
-                    }
-                }
-            ]
-        }
+            field: 'logTime',
+            title: '补召时间',
+            minWidth: 170,
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+         {
+            field: 'log',
+            title: '日志',
+            minWidth: 170,
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+         {
+            field: 'status',
+            title: '状态',
+            minWidth: 170,
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+     
     ],
     beforeSearchFun: () => {
+        if (!nodeClick.value || nodeClick.value.level !== 3) {
+            ElMessage.warning('请先选中监测点')
+            return  // 阻止查询
+        }
+        if (nodeClick.value) {
+            tableStore.table.params.searchValue = nodeClick.value.id
+        }
     },
     loadCallback: () => {
        
@@ -95,6 +112,26 @@ const tableStore: any = new TableStore({
 
 provide('tableStore', tableStore)
 
+const nodeClick = ref(null)
+// 处理父组件传递的树节点点击事件
+const handleTreeNodeClick = (node: any) => {
+    nodeClick.value = node
+    if (tableStore && tableStore.index) {
+        // 判断当前节点是否为监测点层级
+        if (node) {
+            if (node.level !== 3) { 
+                ElMessage.warning('请先选中监测点')
+                return
+            }
+        }else {
+             ElMessage.warning('请先选中监测点')
+             return
+        }
+        tableStore.index()
+    }
+}
+
+
 const recall1 = async () => {
     if (!props.checkedNodes || props.checkedNodes.length === 0) {
         ElMessage.warning('请先勾选监测点')
@@ -125,8 +162,9 @@ const recall2 = async () => {
 }
 
 
-onMounted(() => {
-    tableStore.index()
+// 暴露方法给父组件调用
+defineExpose({
+    handleTreeNodeClick
 })
 </script>
 
diff --git a/src/views/govern/monitorRecall/index.vue b/src/views/govern/monitorRecall/index.vue
index e85c7d8..24b00c6 100644
--- a/src/views/govern/monitorRecall/index.vue
+++ b/src/views/govern/monitorRecall/index.vue
@@ -6,7 +6,7 @@
         style="position: relative"
     >
         <!-- @init="nodeClick" -->
-        <PointTree @node-click="nodeClick" @pointTypeChange="pointTypeChange" @checkChange="handleCheckedNodesChange"></PointTree>
+        <PointTree @node-click="nodeClick"  @checkChange="handleCheckedNodesChange"></PointTree>
         <div class="device-control-right" >
            <el-tabs  type="border-card" class="mb10" @tab-click="handleClick" v-model="activeTab">
                 <el-tab-pane label="稳态补召" name="deviceInfo1"> 
@@ -39,6 +39,7 @@ const eventRef = ref()
 const loading = ref(false)
 const activeTab = ref('deviceInfo1')
 const checkedNodes = ref<any[]>([]) // 存储左侧树勾选的节点
+const currentNode = ref<any>(null) // 存储当前点击的树节点
 
 defineOptions({
     name: 'govern/monitorRecall/index'
@@ -46,55 +47,41 @@ defineOptions({
 
 // 处理子组件传递的勾选节点变化
 const handleCheckedNodesChange = (nodes: any[]) => {
-
-   checkedNodes.value = nodes
-   
-   // 将勾选的节点传递给当前激活的tab组件
-   if (activeTab.value === 'deviceInfo1' && steadyRef.value) {
-       // 如果steadyRecall组件有接收勾选节点的方法，可以调用
-       if (steadyRef.value.setCheckedNodes) {
-           steadyRef.value.setCheckedNodes(nodes)
-       }
-   } else if (activeTab.value === 'deviceInfo2' && eventRef.value) {
-       // 如果eventRecall组件有接收勾选节点的方法，可以调用
-       if (eventRef.value.setCheckedNodes) {
-           eventRef.value.setCheckedNodes(nodes)
-       }
-   }
+    checkedNodes.value = nodes
 }
 
 // tab切换时的处理
 const handleClick = (tab: any) => {
     activeTab.value = tab.props.name
-    
     // tab切换时刷新对应组件的数据
     nextTick(() => {
         if (tab.props.name === 'deviceInfo1' && steadyRef.value) {
-            // 刷新稳态补召数据
-            if (steadyRef.value.refreshData) {
-                steadyRef.value.refreshData(checkedNodes.value)
-            } else if (steadyRef.value.getTableParams) {
-                // 如果有getTableParams方法，调用它
-                steadyRef.value.getTableParams({ nodes: checkedNodes.value })
-            }
+            
         } else if (tab.props.name === 'deviceInfo2' && eventRef.value) {
-            // 刷新暂态补召数据
-            if (eventRef.value.refreshData) {
-                eventRef.value.refreshData(checkedNodes.value)
-            } else if (eventRef.value.getTableParams) {
-                // 如果有getTableParams方法，调用它
-                eventRef.value.getTableParams({ nodes: checkedNodes.value })
-            }
+            // tab切换后触发查询
+            triggerEventRecallQuery()
         }
     })
 }
 
 const nodeClick = (node: any) => {
-    
+     currentNode.value = node
+    // 只有在暂态补召页面时才触发查询
+    if (activeTab.value === 'deviceInfo2') {
+        triggerEventRecallQuery()
+    }
 }
 
-const pointTypeChange = (type: any, node: any) => {
-
+// 触发暂态补召查询
+const triggerEventRecallQuery = () => {
+    nextTick(() => {
+        if (activeTab.value === 'deviceInfo2' && eventRef.value) {
+            // 将当前点击的节点传递给暂态补召组件
+            if (eventRef.value.handleTreeNodeClick) {
+                eventRef.value.handleTreeNodeClick(currentNode.value)
+            }
+        }
+    })
 }
 </script>