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

src/components/cockpit/indicatorDetails/index.vue

@@ -6,7 +6,7 @@
             v-model="value"
             :style="{
                 height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px )`,
-                overflow: 'auto'
+                overflow: 'auto',
             }"
         >
             <template #date-cell="{ data }">
@@ -20,7 +20,7 @@
                         </template>
                         <div
                             :style="{
-                                height: `calc(${prop.height} / 5 ) `,
+                                height: `calc(${prop.height} / 5 - 47px) `,
                                 overflow: 'auto'
                             }"
                             v-html="getTextForDate(data.day)"
@@ -36,6 +36,7 @@ import { ref, onMounted, provide, reactive, watch, h } from 'vue'
 import TableStore from '@/utils/tableStore'
 import TableHeader from '@/components/table/header/index.vue'
 import { dayjs } from 'element-plus'
+import { overflow } from 'html2canvas/dist/types/css/property-descriptors/overflow'
 
 const prop = defineProps({
     w: { type: [String, Number] },