From cb9b8121532586874136ead50c1b18e28fe483b9 Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Tue, 13 Aug 2024 10:50:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=B0=E5=9B=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                                  |  2 +-
 .../Pages/ChartItemSetting/GlobalSetting.vue          | 11 +++++------
 src/packages/components/Charts/Maps/MapBase/config.ts |  1 +
 .../components/Charts/Maps/MapBase/config.vue         |  5 +++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.env b/.env
index d8481af0..cad75cf2 100644
--- a/.env
+++ b/.env
@@ -5,7 +5,7 @@ VITE_DEV_PORT = '8080'
 # VITE_DEV_PATH = 'http://192.168.0.34:11887'
 VITE_DEV_PATH = 'http://192.168.0.34:8102/'
 # VITE_DEV_PATH = 'http://192.168.0.120:3001'
-VITE_DEV_TOKEN = 'dd23c593-c823-4eb3-86d0-54ec77c99880'
+VITE_DEV_TOKEN = '09c7cb6a-ab85-4c92-ad0f-5a25d72d71f7'
 
 # production path
 VITE_PRO_PATH = 'http://192.168.0.235:8177'
diff --git a/src/components/Pages/ChartItemSetting/GlobalSetting.vue b/src/components/Pages/ChartItemSetting/GlobalSetting.vue
index e36a9892..e42cb2df 100644
--- a/src/components/Pages/ChartItemSetting/GlobalSetting.vue
+++ b/src/components/Pages/ChartItemSetting/GlobalSetting.vue
@@ -158,7 +158,7 @@
         ></n-select>
       </setting-item>
     </setting-item-box>
-    <setting-item-box name="最小值" alone v-if="xAxis.type === 'value'">
+    <setting-item-box name="最小值" alone v-if="'min' in xAxis">
       <setting-item name="">
         <n-input-number v-model:value="xAxis.min" size="small"/>
       </setting-item>
@@ -256,7 +256,7 @@
           ></n-select>
         </setting-item>
       </setting-item-box>
-      <setting-item-box name="最小值" alone v-if="yAxis.type === 'value'">
+      <setting-item-box name="最小值" alone v-if="'min' in yAxis">
         <setting-item name="">
           <n-input-number v-model:value="yAxis.min" size="small"/>
         </setting-item>
@@ -348,7 +348,7 @@
 </template>
 
 <script setup lang="ts">
-import { PropType, computed, watch } from 'vue'
+import { PropType, computed, watch, Ref } from 'vue'
 import { GlobalThemeJsonType } from '@/settings/chartThemes/index'
 import { axisConfig, legendConfig } from '@/packages/chartConfiguration/echarts/index'
 import { CollapseItem, SettingItemBox, SettingItem, GlobalSettingPosition } from '@/components/Pages/ChartItemSetting'
@@ -380,12 +380,11 @@ const title = computed(() => {
   return props.optionData.title
 })
 
-const xAxis = computed(() => {
+const xAxis: Ref<any> = computed(() => {
   return props.optionData.xAxis
 })
 
-const yAxisArr = computed(() => {
-  console.log(props.optionData.yAxis)
+const yAxisArr: Ref<any> = computed(() => {
   return props.optionData.yAxis
 })
 
diff --git a/src/packages/components/Charts/Maps/MapBase/config.ts b/src/packages/components/Charts/Maps/MapBase/config.ts
index a714114e..1c7a230f 100644
--- a/src/packages/components/Charts/Maps/MapBase/config.ts
+++ b/src/packages/components/Charts/Maps/MapBase/config.ts
@@ -51,6 +51,7 @@ export const option = {
   },
   series: [
     {
+      animation: false,
       name: '',
       type: 'effectScatter',
       coordinateSystem: 'geo',
diff --git a/src/packages/components/Charts/Maps/MapBase/config.vue b/src/packages/components/Charts/Maps/MapBase/config.vue
index 3b7590ea..f7637c0c 100644
--- a/src/packages/components/Charts/Maps/MapBase/config.vue
+++ b/src/packages/components/Charts/Maps/MapBase/config.vue
@@ -206,6 +206,11 @@
   </CollapseItem>
   <CollapseItem name="标记" :expanded="true">
     <SettingItemBox name="样式">
+      <SettingItem name="开启动画">
+        <n-space>
+          <n-switch v-model:value="seriesList[0].animation" size="small"></n-switch>
+        </n-space>
+      </SettingItem>
       <SettingItem name="大小">
         <n-input-number v-model:value="seriesList[0].symbolSize" size="small" :min="0"></n-input-number>
       </SettingItem>