From 00dd79e000480c4f97fdf884e0c7d7d0b2f5e79b Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Wed, 5 Nov 2025 15:09:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9echart=20y=E8=BD=B4?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/echartMethod.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utils/echartMethod.ts b/src/utils/echartMethod.ts
index 97a45dc..69d8e90 100644
--- a/src/utils/echartMethod.ts
+++ b/src/utils/echartMethod.ts
@@ -12,6 +12,8 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
     } else if (value > -1 && value < 0 && isMin == false) {
         return 0
     }
+    console.log('🚀 ~ calculateValue ~ Math.abs(o):', Math.abs(o))
+
     let base
     if (Math.abs(o) >= 100) {
         base = 100
@@ -20,7 +22,9 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
     } else if (Math.abs(o) >= 1) {
         base = 1
     } else {
-        base = 0.1
+        const multiple = 1 / 0.1
+        // 先放大→向上取整→再缩小
+        return Math.ceil(Math.abs(o) * multiple) / multiple
     }
     let calculatedValue
     if (isMin) {
@@ -36,6 +40,7 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
             calculatedValue = value + num * value
         }
     }
+    console.log('🚀 ~ calculateValue ~ base:', base)
     if (base === 0.1) {
         return parseFloat(calculatedValue.toFixed(1))
     } else if (isMin) {

From 35ce7314b038cc1113ab610138b5c3f3c97cc388 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Wed, 5 Nov 2025 15:10:44 +0800
Subject: [PATCH 2/3] =?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/cloudDevice.vue           |  3 +-
 src/components/tree/index.vue                 |  2 +-
 src/components/tree/select.vue                |  1 +
 src/utils/echartMethod.ts                     |  4 +++
 src/views/govern/alarm/Transient.vue          |  1 +
 src/views/govern/cloudDeviceEntry/index.vue   | 13 +++++---
 .../govern/reportCore/statisticsWx/index.vue  | 14 +++++---
 .../govern/setting/frontManagement/index.vue  | 33 ++++++++-----------
 8 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/components/tree/cloudDevice.vue b/src/components/tree/cloudDevice.vue
index 94574d1..e43c5f1 100644
--- a/src/components/tree/cloudDevice.vue
+++ b/src/components/tree/cloudDevice.vue
@@ -15,7 +15,7 @@
                     style='cursor: pointer' v-if='props.canExpand' /> -->
             </div>
             <el-tree :style="{ height:  'calc(100vh - 200px)' }"
-            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current 
+            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current :default-expand-all="false"
                 @check-change="checkTreeNodeChange" :filter-node-method='filterNode' node-key='id' v-bind='$attrs'>
                 <template #default='{ node, data }'>
                     <span class='custom-tree-node'>
@@ -75,7 +75,6 @@ const filterNode = (value: string, data: any, node: any) => {
 
 // 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
 const chooseNode = (value: string, data: any, node: any) => {
-
     if (data.name.indexOf(value) !== -1) {
         return true
     }
diff --git a/src/components/tree/index.vue b/src/components/tree/index.vue
index 44d7fda..af08273 100644
--- a/src/components/tree/index.vue
+++ b/src/components/tree/index.vue
@@ -29,7 +29,7 @@
             </div>
 
             <el-tree :style="{ height:  'calc(100vh - 200px)' }"
-            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current 
+            style=' overflow: auto;' ref='treeRef' :props='defaultProps' highlight-current :default-expand-all="false"
                 @check-change="checkTreeNodeChange" :filter-node-method='filterNode' node-key='id' v-bind='$attrs'>
                 <template #default='{ node, data }'>
                     <span class='custom-tree-node'>
diff --git a/src/components/tree/select.vue b/src/components/tree/select.vue
index 6ee2936..ece3dee 100644
--- a/src/components/tree/select.vue
+++ b/src/components/tree/select.vue
@@ -24,6 +24,7 @@
                 @node-click="handleNodeClick"
                 :default-checked-keys="defaultCheckedKeys"
                 v-bind='$attrs'
+                :default-expand-all="false"
                 >
                 <template #default='{ node, data }'>
                     <span class='custom-tree-node'>
diff --git a/src/utils/echartMethod.ts b/src/utils/echartMethod.ts
index 97a45dc..65cd6a1 100644
--- a/src/utils/echartMethod.ts
+++ b/src/utils/echartMethod.ts
@@ -1,3 +1,5 @@
+import { number } from "vue-types"
+
 const dataProcessing = (arr: any[]) => {
     return arr
         .filter(item => typeof item === 'number' || (typeof item === 'string' && !isNaN(parseFloat(item))))
@@ -34,6 +36,7 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
             calculatedValue = value - num * value
         } else {
             calculatedValue = value + num * value
+            
         }
     }
     if (base === 0.1) {
@@ -57,6 +60,7 @@ export const yMethod = (arr: any) => {
     minValue = Math.min(...numList)
     const o = maxValue - minValue
     min = calculateValue(o, minValue, num, true)
+
     max = calculateValue(o, maxValue, num, false)
     // if (-100 >= minValue) {
     //     min = Math.floor((minValue + num * minValue) / 100) * 100
diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index 7ba9730..abff634 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -313,6 +313,7 @@ const sourceChange = (e: any) => {
             tableStore.table.params.engineeringid = e[1] || ''
             tableStore.table.params.projectId = e[2] || ''
         }
+        
     }
 
     // tableStore.table.params.engineeringid = e[1] || ''
diff --git a/src/views/govern/cloudDeviceEntry/index.vue b/src/views/govern/cloudDeviceEntry/index.vue
index f26704a..4ecc170 100644
--- a/src/views/govern/cloudDeviceEntry/index.vue
+++ b/src/views/govern/cloudDeviceEntry/index.vue
@@ -2296,10 +2296,15 @@ const area = () => {
 
 onMounted(() => {
     nodeData.value.level = 0
-    const dom = document.getElementById('navigation-splitpanes')
-    if (dom) {
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
-    }
+    nextTick(() => {
+        const dom = document.getElementById('navigation-splitpanes')
+        if (dom && dom.offsetHeight > 0) {
+            size.value = Math.round((180 / dom.offsetHeight) * 100)
+        } else {
+            // 设置默认值
+            size.value = 20
+        }
+    })
 })
 area()
 </script>
diff --git a/src/views/govern/reportCore/statisticsWx/index.vue b/src/views/govern/reportCore/statisticsWx/index.vue
index 3300437..4025566 100644
--- a/src/views/govern/reportCore/statisticsWx/index.vue
+++ b/src/views/govern/reportCore/statisticsWx/index.vue
@@ -99,11 +99,15 @@ tableStore.table.params.resourceType = 1
 tableStore.table.params.customType = 1
 const flag = ref(true)
 onMounted(() => {
-    const dom = document.getElementById('navigation-splitpanes')
-    if (dom) {
-
-        size.value = ((280 / (dom.offsetWidth - 7)) * 100)
-    }
+    nextTick(() => {
+        const dom = document.getElementById('navigation-splitpanes')
+        if (dom && dom.offsetHeight > 0) {
+            size.value = ((280 / (dom.offsetWidth - 7)) * 100)
+        } else {
+            // 设置默认值
+            size.value = 20
+        }
+    })
 })
 
 // getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {
diff --git a/src/views/govern/setting/frontManagement/index.vue b/src/views/govern/setting/frontManagement/index.vue
index acc0d21..46bb72d 100644
--- a/src/views/govern/setting/frontManagement/index.vue
+++ b/src/views/govern/setting/frontManagement/index.vue
@@ -31,6 +31,7 @@
                     </template>
                     <template v-slot:operation>
                         <el-button type="primary" class="ml10" @click="add" icon="el-icon-Plus">新增</el-button>
+                        
                     </template>
                 </TableHeader>
                 <Table
@@ -81,30 +82,23 @@
                                     </el-tooltip>
                                 </template>
                                 <template v-else>
-                                    <el-popconfirm
-                                        class="box-item"
-                                        title="确定重启吗？"
-                                        placement="bottom"
-                                        @confirm="restart(data)"
-                                    >
+                                    <el-popconfirm title="确定重启吗？" placement="bottom" @confirm="restart(data)">
+                                        <template #reference>
+                                            <el-tooltip content="重启" placement="top">
+                                                <el-button 
+                                                    style="margin-left: 4px" 
+                                                    icon="el-icon-Refresh" 
+                                                    type="warning" 
+                                                    link
+                                                />
+                                            </el-tooltip>
+                                        </template>
                                         <template #actions="{ confirm, cancel }">
                                             <el-button size="small" @click="cancel">取消</el-button>
                                             <el-button type="warning" size="small" @click="confirm">确认</el-button>
                                         </template>
-
-                                        <template #reference>
-                                            <el-tooltip content="重启" placement="top">
-                                                <el-button
-                                                    style="margin-left: 4px"
-                                                    icon="el-icon-Refresh"
-                                                    type="warning"
-                                                    link
-                                                    @click.stop
-                                                ></el-button>
-                                            </el-tooltip>
-                                        </template>
                                     </el-popconfirm>
-                                </template>
+                                </template> 
                             </div>
                         </div>
                     </template>
@@ -433,6 +427,7 @@ const currentChangeEvent = () => {
 
 // 重启进程
 const restart = (data: any) => {
+
     restartProcess({
         nodeId: nodeId.value,
         processNo: data.processNo

From d1e7aab8764bb18add955be69da85e639cd527e7 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Wed, 5 Nov 2025 15:12:06 +0800
Subject: [PATCH 3/3] =?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/utils/echartMethod.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/echartMethod.ts b/src/utils/echartMethod.ts
index 2468070..31bb9e0 100644
--- a/src/utils/echartMethod.ts
+++ b/src/utils/echartMethod.ts
@@ -43,7 +43,7 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
             
         }
     }
-    console.log('🚀 ~ calculateValue ~ base:', base)
+
     if (base === 0.1) {
         return parseFloat(calculatedValue.toFixed(1))
     } else if (isMin) {