修改区域

src/components/table/header/index.vue

@@ -15,6 +15,9 @@
                     class="table-com-search-form"
                     :label-width="90"
                 >
+                    <el-form-item label="区域" v-if="area">
+                        <Area v-model="tableStore.table.params.deptIndex" />
+                    </el-form-item>
                     <el-form-item label="日期" v-if="datePicker" style="grid-column: span 2; max-width: unset">
                         <DatePicker ref="datePickerRef"></DatePicker>
                     </el-form-item>
@@ -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<Props>(), {
-    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', {})
 }

src/views/Event-boot/Region/distribution.vue

@@ -1,10 +1,8 @@
 <template>
     <div class="default-main">
-        <TableHeader>
+        <TableHeader area>
             <template v-slot:select>
-                <el-form-item label="区域">
+             
-                    <Area ref="area" v-model="tableStore.table.params.deptIndex" />
-                </el-form-item>
                 <el-form-item label="统计类型">
                     <el-select
                         v-model="tableStore.table.params.statisticalType"
@@ -95,7 +93,6 @@ const tableStore = new TableStore({
 })
 provide('tableStore', tableStore)
 
-tableStore.table.params.deptIndex = dictData.state.area[0].id
 tableStore.table.params.statisticalType = dictData.getBasicData('Statistical_Type', ['Report_Type'])[0]
 tableStore.table.params.monitorFlag = 2
 tableStore.table.params.powerFlag = 2

src/views/Event-boot/Region/overview.vue

@@ -1,11 +1,7 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker>
+        <TableHeader date-picker area>
-            <template v-slot:select>
+           
-                <el-form-item label="区域">
-                    <Area v-model="tableStore.table.params.deptIndex" />
-                </el-form-item>
-            </template>
         </TableHeader>
         <el-tabs v-model="activeName" type="border-card" v-loading="tableStore.table.loading">
             <el-tab-pane label="图形" name="1">
@@ -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

src/views/Event-boot/Region/statistics.vue

@@ -1,11 +1,7 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker>
+        <TableHeader date-picker area>
-            <template v-slot:select>
+            <template v-slot:select></template>
-                <el-form-item label="区域">
-                    <Area v-model="tableStore.table.params.deptIndex" />
-                </el-form-item>
-            </template>
         </TableHeader>
         <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick" v-loading="tableStore.table.loading">
             <el-tab-pane label="暂降原因及类型统计" name="1">
@@ -20,7 +16,7 @@
 
 <script setup lang="ts">
 import TableHeader from '@/components/table/header/index.vue'
-import Area from '@/components/form/area/index.vue'
+
 import { useDictData } from '@/stores/dictData'
 import TableStore from '@/utils/tableStore'
 import { onMounted, reactive, ref, provide } from 'vue'
@@ -49,7 +45,6 @@ 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

src/views/dashboard/index.vue

@@ -1,12 +1,6 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker>
+        <TableHeader date-picker area></TableHeader>
-            <template v-slot:select>
-                <el-form-item label="区域">
-                    <Area v-model="tableStore.table.params.deptIndex" />
-                </el-form-item>
-            </template>
-        </TableHeader>
         <el-tabs v-model="activeName" type="border-card" v-loading="tableStore.table.loading">
             <el-tab-pane label="图形" name="1">
                 <Echart :list="list" ref="echarts" />
@@ -49,7 +43,6 @@ 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

src/views/voltage/sags/operationsManagement/index.vue

@@ -1,10 +1,8 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker>
+        <TableHeader date-picker area>
             <template v-slot:select>
-                <el-form-item label="区域">
+              
-                    <Area v-model="tableStore.table.params.deptIndex" />
-                </el-form-item>
                 <el-form-item label="终端状态">
                     <el-select
                         multiple
@@ -120,7 +118,6 @@ const tableStore = new TableStore({
         manufacturerForm.value = []
     }
 })
-tableStore.table.params.deptIndex = dictData.state.area[0].id
 tableStore.table.params.runFlag = []
 tableStore.table.params.comFlag = []
 tableStore.table.params.manufacturer = []

src/views/voltage/sags/operationsManagement/point.vue

@@ -1,8 +1,7 @@
 <template>
     <div class="default-main">
-        <TableHeader date-picker>
+        <TableHeader date-picker area>
             <template v-slot:select>
-                <el-form-item label="区域"><Area v-model="tableStore.table.params.deptIndex" /></el-form-item>
                 <el-form-item label="干扰源类型">
                     <el-select
                         multiple
@@ -143,7 +142,6 @@ const tableStore = new TableStore({
         scaleForm.value = []
     }
 })
-tableStore.table.params.deptIndex = dictData.state.area[0].id
 tableStore.table.params.scale = []
 tableStore.table.params.comFlag = []
 tableStore.table.params.loadType = []