From c2f23aa957daa4ae561377fb6d234d2597b5b96c Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Thu, 28 May 2026 20:36:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cockpit/governanceReport/index.vue        | 42 ++++++++++++++++---
 .../listOfMainMonitoringPoints/index.vue      |  1 +
 src/components/tree/govern/deviceTree.vue     |  6 +--
 src/components/tree/govern/getMarketList.vue  |  4 +-
 .../tree/govern/officialUserTree.vue          |  2 +-
 src/views/govern/alarm/index.vue              |  8 ++--
 src/views/govern/device/disposition/index.vue | 35 ++++++++++++----
 .../govern/device/officialUser/index.vue      |  1 +
 src/views/govern/device/tourist/index.vue     |  8 ++--
 9 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/src/components/cockpit/governanceReport/index.vue b/src/components/cockpit/governanceReport/index.vue
index 993a89b..12e6f1d 100644
--- a/src/components/cockpit/governanceReport/index.vue
+++ b/src/components/cockpit/governanceReport/index.vue
@@ -1,15 +1,37 @@
 <template>
     <div>
         <!--治理效果报表 -->
-        <TableHeader :showReset="false"  :timeKeyList="prop.timeKey" ref="TableHeaderRef" datePicker @selectChange="selectChange" v-if="fullscreen">
+        <TableHeader
+            :showReset="false"
+            :timeKeyList="prop.timeKey"
+            ref="TableHeaderRef"
+            datePicker
+            @selectChange="selectChange"
+            v-if="fullscreen"
+        >
             <template v-slot:select>
                 <el-form-item label="模板策略">
-                    <el-select filterable v-model="tableStore.table.params.tempId" placeholder="请选择模板策略" clearable>
-                        <el-option v-for="item in templateList" :key="item.id" :label="item.excelName" :value="item.id" />
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.tempId"
+                        placeholder="请选择模板策略"
+                        clearable
+                    >
+                        <el-option
+                            v-for="item in templateList"
+                            :key="item.id"
+                            :label="item.excelName"
+                            :value="item.id"
+                        />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="监测对象">
-                    <el-select filterable v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable>
+                    <el-select
+                        filterable
+                        v-model="tableStore.table.params.sensitiveUserId"
+                        placeholder="请选择监测对象"
+                        clearable
+                    >
                         <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
                     </el-select>
                 </el-form-item>
@@ -43,7 +65,7 @@ const prop = defineProps({
     h: { type: [String, Number] },
     width: { type: [String, Number] },
     height: { type: [String, Number] },
-   timeKey: { type: Array as () => string[] },
+    timeKey: { type: Array as () => string[] },
     timeValue: { type: Object },
     interval: { type: Number }
 })
@@ -59,13 +81,21 @@ const idList = ref()
 // 监测对象
 const initListByIds = () => {
     getListByIds({}).then((res: any) => {
-        if (res.data.length > 0) {
+        if (res.data?.length > 0) {
             idList.value = res.data
 
             if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
                 tableStore.table.params.sensitiveUserId = idList.value[0].id
             }
             templateListData()
+        } else {
+            querySysExcel({}).then(res => {
+                templateList.value = res.data.filter(item => item.excelType == 4)
+                if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
+                    tableStore.table.params.tempId = templateList.value[0].id
+                }
+            })
+            tableStore.table.loading = false
         }
     })
 }
diff --git a/src/components/cockpit/listOfMainMonitoringPoints/index.vue b/src/components/cockpit/listOfMainMonitoringPoints/index.vue
index 84dea16..024d351 100644
--- a/src/components/cockpit/listOfMainMonitoringPoints/index.vue
+++ b/src/components/cockpit/listOfMainMonitoringPoints/index.vue
@@ -150,6 +150,7 @@ const indicatorList = ref()
 
 const initLineList = async () => {
     cslineList({}).then(res => {
+        setTime()
         if (res.data.length == 0) {
             lineShow.value = false
             return (tableStore.table.loading = false)
diff --git a/src/components/tree/govern/deviceTree.vue b/src/components/tree/govern/deviceTree.vue
index 4472a64..d16ec3a 100644
--- a/src/components/tree/govern/deviceTree.vue
+++ b/src/components/tree/govern/deviceTree.vue
@@ -140,7 +140,7 @@ const info = (type?: string) => {
                 if (type == '2') {
                     //初始化选中
 
-                    treRef.value?.treeRef4.setCurrentKey(arr4[0].id)
+                    treRef.value?.treeRef4.setCurrentKey(arr4[0]?.id)
                     // 注册父组件事件
                     emit('init', {
                         level: 2,
@@ -150,7 +150,7 @@ const info = (type?: string) => {
                     return
                 }
                 if (arr.length > 0) {
-                    treRef.value.treeRef1.setCurrentKey(arr[0].id)
+                    treRef.value.treeRef1.setCurrentKey(arr[0]?.id)
                     // 注册父组件事件
                     emit('init', {
                         level: 2,
@@ -158,7 +158,7 @@ const info = (type?: string) => {
                     })
                     return
                 } else if (arr2.length > 0) {
-                    treRef.value.treeRef2.setCurrentKey(arr2[0].id)
+                    treRef.value.treeRef2.setCurrentKey(arr2[0]?.id)
                     // 注册父组件事件
                     emit('init', {
                         level: 2,
diff --git a/src/components/tree/govern/getMarketList.vue b/src/components/tree/govern/getMarketList.vue
index d0d6846..439e99c 100644
--- a/src/components/tree/govern/getMarketList.vue
+++ b/src/components/tree/govern/getMarketList.vue
@@ -19,9 +19,11 @@ getMarketList().then((res: any) => {
                 color: 'royalblue'
             }
         })
+                console.log("🚀 ~ royalblue:")
+        
         emit('selectUser', tree.value[0])
         nextTick(() => {
-            treRef.value.treeRef.setCurrentKey(tree.value[0].id)
+            treRef.value.treeRef.setCurrentKey(tree.value[0]?.id)
         })
     }
 })
diff --git a/src/components/tree/govern/officialUserTree.vue b/src/components/tree/govern/officialUserTree.vue
index 8412ec3..e6da327 100644
--- a/src/components/tree/govern/officialUserTree.vue
+++ b/src/components/tree/govern/officialUserTree.vue
@@ -21,7 +21,7 @@ getFormalUserList().then((res: any) => {
         })
         emit('selectUser', tree.value[0])
         nextTick(() => {
-            treRef.value.treeRef.setCurrentKey(tree.value[0].id)
+            treRef.value.treeRef.setCurrentKey(tree.value[0]?.id)
         })
     }
 })
diff --git a/src/views/govern/alarm/index.vue b/src/views/govern/alarm/index.vue
index 4cb7ee1..892beae 100644
--- a/src/views/govern/alarm/index.vue
+++ b/src/views/govern/alarm/index.vue
@@ -7,15 +7,15 @@
             <el-tab-pane label="前置告警" name="2">
                 <Front v-if="activeName == '2'" :deviceTree="deviceTree" :key="key" />
             </el-tab-pane>
-            <!-- <el-tab-pane label="稳态越限告警" name="3">
+            <el-tab-pane label="稳态越限告警" name="3">
                 <Steady v-if="activeName == '3'" :deviceTree="deviceTree" :key="key" />
-            </el-tab-pane> -->
+            </el-tab-pane>
             <el-tab-pane label="暂态事件" name="4">
                 <Transient v-if="activeName == '4'" :deviceTree="deviceTree" :key="key" />
             </el-tab-pane>
-            <!-- <el-tab-pane label="异常事件" name="5">
+            <el-tab-pane label="异常事件" name="5">
                 <Abnormal v-if="activeName == '5'" :deviceTree="deviceTree" :key="key" />
-            </el-tab-pane> -->
+            </el-tab-pane>
         </el-tabs>
     </div>
 </template>
diff --git a/src/views/govern/device/disposition/index.vue b/src/views/govern/device/disposition/index.vue
index 2926be9..de2e3ec 100644
--- a/src/views/govern/device/disposition/index.vue
+++ b/src/views/govern/device/disposition/index.vue
@@ -1,12 +1,10 @@
 <template>
-    <div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+    <div class="device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
         <GetMarketList @node-click="selectUser" @selectUser="selectUser"></GetMarketList>
         <div class="device-manage-right" :style="{ height: pageHeight.height }">
             <el-descriptions title="用户基本信息" class="mb10" :column="2" border>
                 <template #extra>
-                    <el-button type="primary" icon="el-icon-Sort" @click="getMarketEnginner">
-                        绑定工程
-                    </el-button>
+                    <el-button type="primary" icon="el-icon-Sort" @click="getMarketEnginner">绑定工程</el-button>
                 </template>
                 <el-descriptions-item label="名称">
                     {{ user.name }}
@@ -29,18 +27,36 @@
                 </vxe-table>
             </div>
         </div>
-        <el-dialog v-model.trim="dialogVisible" title="绑定工程" class="cn-operate-dialog" :close-on-click-modal="false">
-            <el-input maxlength="32" show-word-limit v-model.trim="filterText" icon="el-icon-Search" placeholder="请输入内容"
-                clearable style="margin-bottom: 10px">
+        <el-dialog
+            v-model.trim="dialogVisible"
+            title="绑定工程"
+            class="cn-operate-dialog"
+            :close-on-click-modal="false"
+        >
+            <el-input
+                maxlength="32"
+                show-word-limit
+                v-model.trim="filterText"
+                icon="el-icon-Search"
+                placeholder="请输入内容"
+                clearable
+                style="margin-bottom: 10px"
+            >
                 <template #prefix>
                     <Icon name="el-icon-Search" style="font-size: 16px" />
                 </template>
             </el-input>
 
-            <vxe-table ref="tableRef" v-bind="defaultAttribute" :data="tableData2.filter((item: any) => {
+            <vxe-table
+                ref="tableRef"
+                v-bind="defaultAttribute"
+                :data="tableData2.filter((item: any) => {
                 return item.name.includes(filterText)
             })
-                " height="500px" style="width: 100%">
+                "
+                height="500px"
+                style="width: 100%"
+            >
                 <vxe-column type="checkbox" width="60"></vxe-column>
                 <vxe-column field="name" title="工程名称"></vxe-column>
             </vxe-table>
@@ -77,6 +93,7 @@ const filterText = ref('')
 const tableRef = ref()
 
 const selectUser = (e: any) => {
+    if (e == undefined) return (loading.value = false)
     user.value = e
     loading.value = true
     queryByUseId({
diff --git a/src/views/govern/device/officialUser/index.vue b/src/views/govern/device/officialUser/index.vue
index c77be8d..8fc2e9a 100644
--- a/src/views/govern/device/officialUser/index.vue
+++ b/src/views/govern/device/officialUser/index.vue
@@ -171,6 +171,7 @@ const defaultProps = {
     label: 'name'
 }
 const selectUser = (e: any) => {
+      if (e == undefined) return (loading.value = false)
     user.value = e
     loading.value = true
 
diff --git a/src/views/govern/device/tourist/index.vue b/src/views/govern/device/tourist/index.vue
index 01eb7c4..089db13 100644
--- a/src/views/govern/device/tourist/index.vue
+++ b/src/views/govern/device/tourist/index.vue
@@ -28,7 +28,7 @@ import { mainHeight } from '@/utils/layout'
 import { getVisitorConfig, updateVisitorConfig } from '@/api/cs-device-boot/user'
 import { ref, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
-import { debounce  } from 'lodash-es'
+import { debounce } from 'lodash-es'
 const pageHeight = mainHeight(60)
 const loading = ref(true)
 const defaultCheckedKeys: any = ref([])
@@ -36,7 +36,7 @@ const tableData = ref([])
 const treeRef = ref(null)
 const ignoreCheckChange = ref(false)
 const checkChange = (data: any) => {
-    console.log('🚀 ~ checkChange ~ data:', data)
+    if (data == undefined) return (loading.value = false)
     if (data.data.pName == '便携式设备') {
         if (ignoreCheckChange.value) {
             ignoreCheckChange.value = false // 清除标记，不影响后续正常触发
@@ -57,7 +57,7 @@ const checkChange = (data: any) => {
         updateVisitorConfigs()
     }
 }
-const updateVisitorConfigs = debounce (() => {
+const updateVisitorConfigs = debounce(() => {
     const result = Array.from(new Set(defaultCheckedKeys.value))
     updateVisitorConfig(
         result.map(item => {
@@ -70,7 +70,7 @@ const updateVisitorConfigs = debounce (() => {
             getVisitorConfigs()
         }
     })
-},500)
+}, 500)
 const getVisitorConfigs = () => {
     getVisitorConfig().then((res: any) => {
         if (res.code === 'A0000') {