微调

src/components/cockpit/indicatorFittingChart/index.vue

@@ -1,14 +1,14 @@
 <template>
     <div>
         <!--主要监测点列表 -->
-        <TableHeader :showReset="false" >
+        <TableHeader :showReset="false" datePicker @selectChange="selectChange" v-if="fullscreen">
             <template v-slot:select>
                 <el-form-item label="关键词">
                     <el-input v-model="tableStore.table.params.searchValue" clearable placeholder="请输关键字" />
                 </el-form-item>
             </template>
         </TableHeader>
-        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height}  - 58px)`"></Table>
+        <Table ref="tableRef" @cell-click="cellClickEvent" :height="`calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`"></Table>
         <!-- 指标越限详情 -->
         <OverLimitDetails ref="OverLimitDetailsRef" />
     </div>
@@ -24,6 +24,8 @@ import { getTimeOfTheMonth } from '@/utils/formatTime'
 import { ElTag } from 'element-plus'
 import OverLimitDetails from '@/components/cockpit/listOfMainMonitoringPoints/components/overLimitDetails.vue'
 const prop = defineProps({
+    w: { type: String },
+    h: { type: String },
     width: { type: String },
     height: { type: String },
     timeKey: { type: String },
@@ -31,6 +33,22 @@ const prop = defineProps({
 })
 const dictData = useDictData()
 const OverLimitDetailsRef = ref()
+const headerHeight = ref(57)
+const selectChange = (showSelect: any, height: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
 const tableStore: any = new TableStore({
     url: '/user-boot/role/selectRoleDetail?id=0',
     method: 'POST',

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
     }

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'>

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'>

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))))
@@ -12,6 +14,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 +24,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) {
@@ -34,8 +40,10 @@ const calculateValue = (o: number, value: number, num: number, isMin: boolean) =
             calculatedValue = value - num * value
         } else {
             calculatedValue = value + num * value
+            
         }
     }
+
     if (base === 0.1) {
         return parseFloat(calculatedValue.toFixed(1))
     } else if (isMin) {
@@ -57,6 +65,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

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] || ''

src/views/govern/cloudDeviceEntry/index.vue

@@ -2296,10 +2296,15 @@ const area = () => {
 
 onMounted(() => {
     nodeData.value.level = 0
-    const dom = document.getElementById('navigation-splitpanes')
+    nextTick(() => {
-    if (dom) {
+        const dom = document.getElementById('navigation-splitpanes')
-        size.value = Math.round((180 / dom.offsetHeight) * 100)
+        if (dom && dom.offsetHeight > 0) {
-    }
+            size.value = Math.round((180 / dom.offsetHeight) * 100)
+        } else {
+            // 设置默认值
+            size.value = 20
+        }
+    })
 })
 area()
 </script>

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')
+    nextTick(() => {
-    if (dom) {
+        const dom = document.getElementById('navigation-splitpanes')
-
+        if (dom && dom.offsetHeight > 0) {
-        size.value = ((280 / (dom.offsetWidth - 7)) * 100)
+            size.value = ((280 / (dom.offsetWidth - 7)) * 100)
-    }
+        } else {
+            // 设置默认值
+            size.value = 20
+        }
+    })
 })
 
 // getTemplateByDept({ id: dictData.state.area[0].id }).then((res: any) => {

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
+                                    <el-popconfirm title="确定重启吗？" placement="bottom" @confirm="restart(data)">
-                                        class="box-item"
+                                        <template #reference>
-                                        title="确定重启吗？"
+                                            <el-tooltip content="重启" placement="top">
-                                        placement="bottom"
+                                                <el-button 
-                                        @confirm="restart(data)"
+                                                    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