Merge branch 'main' of http://192.168.1.22:3000/zcy/canneng-admin

src/components/echarts/MyEchart.vue

@@ -5,7 +5,7 @@
 <script setup lang="ts">
 import { onBeforeUnmount, onMounted, ref, defineExpose, watch } from 'vue'
 // import echarts from './echarts'
-import * as echarts from 'echarts'; // 全引入
+import * as echarts from 'echarts' // 全引入
 
 import 'echarts/lib/component/dataZoom'
 
@@ -146,8 +146,8 @@ const handlerYAxis = () => {
         })
     } else {
         return {
-            ...props.options.yAxis,
-            ...temp
+            ...temp,
+            ...props.options.yAxis
         }
     }
 }
@@ -178,8 +178,8 @@ const handlerXAxis = () => {
         })
     } else {
         return {
-            ...props.options.xAxis,
-            ...temp
+            ...temp,
+            ...props.options.xAxis
         }
     }
 }

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', {})
 }