修改 echart文件

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/views/Event-boot/Region/components/Compatibility.vue

@@ -43,7 +43,8 @@
         </el-radio-group>
     </div>
     <my-echart class="bars_w" :options="echartList" />
-    <vxe-table class="dw" :data="TableData" v-bind="defaultAttribute">
+
+    <vxe-table class="dw" :data="TableData" height="50px" v-bind="defaultAttribute">
         <vxe-column field="name" title="名称" width="100px"></vxe-column>
         <vxe-column field="totalEvents" title="事件总数" width="100px"></vxe-column>
         <vxe-column field="tolerable" title="可容忍" width="100px"></vxe-column>
@@ -145,8 +146,8 @@ const info = async (list: any) => {
         color: ['#FF8C00', '#00BFFF', 'green', 'red'],
         xAxis: {
             type: 'log',
-            // min: '0.001',
-            // max: '1000',
+            min: '0.001',
+            max: '1000',
             name: 's',
             splitLine: { show: false }
         },
@@ -245,8 +246,8 @@ const info = async (list: any) => {
         color: ['yellow', 'green', 'red'],
         xAxis: {
             type: 'log',
-            // min: '0.001',
-            // max: '1000',
+            min: '0.001',
+            max: '1000',
             name: 's',
             splitLine: { show: false }
         },

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

@@ -1,23 +1,5 @@
 <template>
     <div class="default-main">
-        <!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">
-            <el-form-item label="区域">
-                <Area v-model="formInline.deptIndex" ref="area" />
-            </el-form-item>
-            <el-form-item label="统计类型:">
-                <el-select
-                    v-model="formInline.statisticalType"
-                    value-key="id"
-                    placeholder="请选择统计类型"
-                    size="large"
-                >
-                    <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item" />
-                </el-select>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="onSubmit">查询</el-button>
-            </el-form-item>
-        </el-form> -->
         <TableHeader>
             <template v-slot:select>
                 <el-form-item label="区域">
@@ -35,8 +17,8 @@
                 </el-form-item>
             </template>
         </TableHeader>
-        <div v-loading="tableStore.table.loading">
-            <el-row :gutter="10">
+        <div v-loading="tableStore.table.loading" class="pr10">
+            <el-row>
                 <el-col :span="12">
                     <MyEchartMap
                         ref="EchartMap"