Merge branch 'main' of http://192.168.1.22:3000/Web/admin-govern

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/utils/echartMethod.ts

@@ -14,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
@@ -22,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) {
@@ -39,6 +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) {