diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index 93c71aa..0dae3c9 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -15,6 +15,9 @@
class="table-com-search-form"
:label-width="90"
>
+
+
+
@@ -39,18 +42,21 @@
import { inject, ref, onMounted, nextTick, onUnmounted } from 'vue'
import type TableStore from '@/utils/tableStore'
import DatePicker from '@/components/form/datePicker/index.vue'
+import Area from '@/components/form/area/index.vue'
import { mainHeight } from '@/utils/layout'
-
+import { useDictData } from '@/stores/dictData'
const tableStore = inject('tableStore') as TableStore
const tableHeader = ref()
const datePickerRef = ref()
-
+const dictData = useDictData()
interface Props {
datePicker?: boolean
+ area?: boolean
}
const props = withDefaults(defineProps(), {
- datePicker: false
+ datePicker: false,
+ area: false
})
// 动态计算table高度
const resizeObserver = new ResizeObserver(entries => {
@@ -67,6 +73,9 @@ onMounted(() => {
tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
}
+ if (props.area) {
+ tableStore.table.params.deptIndex = dictData.state.area[0].id
+ }
nextTick(() => {
resizeObserver.observe(tableHeader.value)
const dom = document.getElementById('header-form') as HTMLElement
@@ -105,6 +114,9 @@ const onComSearch = async () => {
tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
}
+ if (props.area) {
+ tableStore.table.params.deptIndex = dictData.state.area[0].id
+ }
await tableStore.onTableAction('search', {})
}
diff --git a/src/views/Event-boot/Region/distribution.vue b/src/views/Event-boot/Region/distribution.vue
index f4627a6..6ece675 100644
--- a/src/views/Event-boot/Region/distribution.vue
+++ b/src/views/Event-boot/Region/distribution.vue
@@ -1,10 +1,8 @@
-
+
-
-
-
+
-
-
-
-
-
-
+
+
@@ -49,7 +45,7 @@ const tableStore = new TableStore({
})
provide('tableStore', tableStore)
-tableStore.table.params.deptIndex = dictData.state.area[0].id
+
tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', ['Load_Type'])[3]
tableStore.table.params.monitorFlag = 2
tableStore.table.params.powerFlag = 2
diff --git a/src/views/Event-boot/Region/statistics.vue b/src/views/Event-boot/Region/statistics.vue
index cd671ba..4d6e2a4 100644
--- a/src/views/Event-boot/Region/statistics.vue
+++ b/src/views/Event-boot/Region/statistics.vue
@@ -1,11 +1,7 @@
-
-
-
-
-
-
+
+
@@ -20,7 +16,7 @@