From d113df832d2590a76419ed1574d00a836e1ab6bf Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Fri, 24 Oct 2025 11:17:18 +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

---
 src/components/tree/govern/selectTree.vue     |  2 +-
 src/components/tree/select.vue                |  2 -
 src/views/govern/device/control/index.vue     | 42 ++++++++++++++++---
 .../govern/device/control/tabs/event.vue      |  3 +-
 .../govern/monitorRecall/eventRecall.vue      | 24 +++++++----
 src/views/govern/monitorRecall/index.vue      |  7 ++--
 6 files changed, 60 insertions(+), 20 deletions(-)

diff --git a/src/components/tree/govern/selectTree.vue b/src/components/tree/govern/selectTree.vue
index e31c6ba..d1f1bdb 100644
--- a/src/components/tree/govern/selectTree.vue
+++ b/src/components/tree/govern/selectTree.vue
@@ -63,7 +63,7 @@ const info = () => {
         nextTick(() => {
             if (arr3.length) {
                 //初始化选中
-                treRef.value.treeRef1.setCurrentKey(arr3[0].id)
+                treRef.value.treeRef.setCurrentKey(arr3[0].id)
                 // 注册父组件事件
                 emit('init', {
                     level: 2,
diff --git a/src/components/tree/select.vue b/src/components/tree/select.vue
index b0582fa..6ee2936 100644
--- a/src/components/tree/select.vue
+++ b/src/components/tree/select.vue
@@ -24,8 +24,6 @@
                 @node-click="handleNodeClick"
                 :default-checked-keys="defaultCheckedKeys"
                 v-bind='$attrs'
-           
-            
                 >
                 <template #default='{ node, data }'>
                     <span class='custom-tree-node'>
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index c7720ee..fc5e48f 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -10,6 +10,15 @@
         <div class="device-control-right" v-if="deviceData">
             <el-descriptions title="监测点信息" class="mb10" width="180" :column="3" border>
                 <template #extra>
+                    <!-- <el-button v-if="deviceType == '1'"  type="primary" @click="handleDownLoadTemplate">
+                        模版下载
+                    </el-button> -->
+                    <!-- <el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Connection" @click="handleImport">
+                        离线补召
+                    </el-button>
+                    <el-button v-if="deviceType == '1'" type="primary" icon="el-icon-Monitor" @click="handleaddDevice">
+                        在线补召
+                    </el-button> -->
                     <el-button
                         v-if="deviceType == '1'"
                         type="primary"
@@ -36,6 +45,9 @@
                     }}
                 </el-descriptions-item>
 
+                <!-- <el-descriptions-item label="安装位置" width="160">
+                    {{ devData.position || '/' }}
+                </el-descriptions-item> -->
 
                 <el-descriptions-item label="PT变比" width="160">
                     {{ devData.ptRatio || '/' }}
@@ -44,9 +56,28 @@
                     {{ devData.ctRatio || '/' }}
                 </el-descriptions-item>
 
-            
+                <!-- <el-descriptions-item label="名称">
+                    {{ devData.name ? devData.name : '/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="类型">
+                    {{ echoName(devData.devType, devTypeOptions) }}
+                </el-descriptions-item>
+
+                <el-descriptions-item label="接入方式">
+                    {{ devData.devAccessMethod ? devData.devAccessMethod : '/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="网络设备ID">
+                    {{ devData.ndid ? devData.ndid : '/' }}
+                </el-descriptions-item>
+                <el-descriptions-item label="型号">
+                    {{ echoName(devData.devModel, devModelOptions) }}
+                </el-descriptions-item>
+                <el-descriptions-item label="接入日期">
+                    {{ devData.time ? devData.time : '/' }}
+                </el-descriptions-item> -->
             </el-descriptions>
-            <el-tabs v-model.trim="dataSet" type="border-card" class="mb10" @tab-click="handleClick">
+            <el-tabs v-model.trim="dataSet" type="border-card" class="device-control-box-card" @tab-click="handleClick">
+               
                 <el-tab-pane
                     lazy
                     :label="item.name"
@@ -468,7 +499,7 @@
                     v-if="dataSet.indexOf('_event') != -1"
                     v-loading="tableLoading"
                 >
-                    <Event ref="eventRef" :device-type="deviceType"></Event>
+                    <Event ref="eventRef"></Event>
                 </div>
                 <!-- 测试项记录 -->
                 <div
@@ -898,7 +929,6 @@ const nodeClick = async (e: anyObj) => {
 const deviceType = ref('0')
 const pointTypeChange = (val: any, obj: any) => {
     deviceType.value = val
-    console.log('pointTypeChange', val)
     nodeClick(obj)
 }
 const realTimeRef: any = ref()
@@ -1390,7 +1420,9 @@ const echoName = (value: any, arr: any[]) => {
     return value ? arr.find(item => item.value == value)?.label : '/'
 }
 
-onMounted(() => {})
+onMounted(() => {
+   
+})
 onBeforeUnmount(() => {
     clearInterval(realDataTimer.value)
     clearInterval(trendTimer.value)
diff --git a/src/views/govern/device/control/tabs/event.vue b/src/views/govern/device/control/tabs/event.vue
index ab9f656..487f2d5 100644
--- a/src/views/govern/device/control/tabs/event.vue
+++ b/src/views/govern/device/control/tabs/event.vue
@@ -13,7 +13,7 @@ import TableStore from '@/utils/tableStore'
 import Table from '@/components/table/index.vue'
 import TableHeader from '@/components/table/header/index.vue'
 import waveFormAnalysis from './components/waveFormAnalysis.vue'
-import { ArrowLeft } from '@element-plus/icons-vue'
+import { ArrowLeft, Message } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
 import { analyseWave,getFileByEventId } from '@/api/common'
 import { getFileZip } from '@/api/cs-harmonic-boot/datatrend'
@@ -173,6 +173,7 @@ const tableStore: any = new TableStore({
                  },
                  click: row => {
                         getFileByEventId(row.id).then(res => { 
+                            ElMessage.success(res.message)
                             tableStore.index()
                         })
                  }   
diff --git a/src/views/govern/monitorRecall/eventRecall.vue b/src/views/govern/monitorRecall/eventRecall.vue
index 9e8bf19..4ac7599 100644
--- a/src/views/govern/monitorRecall/eventRecall.vue
+++ b/src/views/govern/monitorRecall/eventRecall.vue
@@ -41,7 +41,7 @@ const tableStore: any = new TableStore({
          {
             field: 'engineeringName',
             title: '项目名称',
-            minWidth: 170,
+        
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -49,7 +49,7 @@ const tableStore: any = new TableStore({
         {
             field: 'projectName',
             title: '工程名称',
-            minWidth: 170,
+       
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -57,7 +57,7 @@ const tableStore: any = new TableStore({
          {
             field: 'deviceName',
             title: '设备名称',
-            minWidth: 170,
+      
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -65,7 +65,7 @@ const tableStore: any = new TableStore({
          {
             field: 'lineName',
             title: '监测点名称',
-            minWidth: 170,
+     
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -73,15 +73,15 @@ const tableStore: any = new TableStore({
         {
             field: 'logTime',
             title: '补召时间',
-            minWidth: 170,
+       
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
         },
          {
             field: 'log',
-            title: '日志',
-            minWidth: 170,
+            title: '类型',
+      
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
@@ -89,7 +89,15 @@ const tableStore: any = new TableStore({
          {
             field: 'status',
             title: '状态',
-            minWidth: 170,
+       
+            formatter: row => {
+                return row.cellValue ? row.cellValue : '/'
+            }
+        },
+        {
+            field: 'result',
+            title: '结果',
+     
             formatter: row => {
                 return row.cellValue ? row.cellValue : '/'
             }
diff --git a/src/views/govern/monitorRecall/index.vue b/src/views/govern/monitorRecall/index.vue
index 24b00c6..aebea12 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"  @checkChange="handleCheckedNodesChange"></PointTree>
+        <PointTree @node-click="nodeClick" @init="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"> 
@@ -42,7 +42,7 @@ const checkedNodes = ref<any[]>([]) // 存储左侧树勾选的节点
 const currentNode = ref<any>(null) // 存储当前点击的树节点
 
 defineOptions({
-    name: 'govern/monitorRecall/index'
+    name: '/cs-device-boot/monitorRecall'
 })
 
 // 处理子组件传递的勾选节点变化
@@ -78,6 +78,7 @@ const triggerEventRecallQuery = () => {
         if (activeTab.value === 'deviceInfo2' && eventRef.value) {
             // 将当前点击的节点传递给暂态补召组件
             if (eventRef.value.handleTreeNodeClick) {
+
                 eventRef.value.handleTreeNodeClick(currentNode.value)
             }
         }
@@ -85,7 +86,7 @@ const triggerEventRecallQuery = () => {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .device-control {
     display: flex;
     height: 100%;