From 773e59cdc3571ad0815f286bb8895a3f27a28961 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期五, 01 三月 2024 16:01:23 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/~xiaohui/daoAnOffice
---
src/views/index/center-map.vue | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 deletions(-)
diff --git a/src/views/index/center-map.vue b/src/views/index/center-map.vue
index 4ed9922..26f22a1 100644
--- a/src/views/index/center-map.vue
+++ b/src/views/index/center-map.vue
@@ -3,10 +3,13 @@
import { currentGET, GETNOBASE } from "@/api";
import { registerMap, getMap } from "echarts/core";
import { optionHandle, regionCodes } from "./center.map";
+import BorderBox13 from "@/components/datav/border-box-13";
import type { MapdataType } from "./center.map";
+import chart2 from "./chart2.vue"
+import chartgd from "./chartgd.vue"
const option = ref({});
const code = ref("china"); //china 浠ｈ〃涓浗 鍏朵粬鍦板競鏄鏀跨紪鐮�
-const centerMapRef = ref();
+
withDefaults(
defineProps<{
// 缁撴潫鏁板��
@@ -36,8 +39,7 @@
}
});
await nextTick();
- centerMapRef.value?.resize();
-
+ console.log(mapData)
option.value = optionHandle(regionCode, list, mapData);
};
@@ -56,10 +58,10 @@
mapjson = mapjson.geoJSON;
resolve(mapjson);
} else {
- mapjson = await GETNOBASE(`/map-geojson/${regionCode}.json`).then(
+ mapjson = await GETNOBASE(`./map-geojson/${regionCode}.json`).then(
(data) => data
);
- code.value=regionCode
+ code.value = regionCode;
registerMap(regionCode, {
geoJSON: mapjson as any,
specialAreas: {},
@@ -76,29 +78,39 @@
if (xzqData) {
getData(xzqData.adcode);
} else {
-
- window["$message"].warning("鏆傛棤涓嬬骇鍦板競")
+ window["$message"].warning("鏆傛棤涓嬬骇鍦板競");
}
};
+const dtFig =ref(0)
+const handlechan =()=>{
+ console.log(dtFig.value)
+ dtFig.value = 1
+}
</script>
<template>
<div class="centermap">
- <!-- <div class="maptitle">
+ <div class="maptitle" style="display:none;">
<div class="zuo"></div>
<span class="titletext">{{ title }}</span>
<div class="you"></div>
- </div> -->
+ </div>
<div class="mapwrap">
- <div class="quanguo" @click="getData('china')" v-if="code !== 'china'">
- 涓浗
- </div>
- <v-chart
- class="chart"
- :option="option"
- ref="centerMapRef"
- @click="mapClick"
- />
+ <BorderBox13>
+<!-- <div class="quanguo" @click="getData('china')" >-->
+<!-- 涓浗-->
+<!-- </div>-->
+
+ <chartgd @changeDt="handlechan" v-if="dtFig ==0"></chartgd>
+ <chart2 v-else></chart2>
+<!-- <v-chart-->
+<!-- class="chart"-->
+<!-- :option="option"-->
+<!-- ref="centerMapRef"-->
+<!-- @click="mapClick"-->
+<!-- v-if="JSON.stringify(option) != '{}'"-->
+<!-- />-->
+ </BorderBox13>
</div>
</div>
</template>
@@ -147,7 +159,8 @@
}
.mapwrap {
- height: 548px;
+ //height: 580px;
+ height: 900px;
width: 100%;
// padding: 0 0 10px 0;
box-sizing: border-box;
@@ -156,8 +169,7 @@
.quanguo {
position: absolute;
right: 20px;
- // top: -46px;
- top: 0;
+ top: -46px;
width: 80px;
height: 28px;
border: 1px solid #00eded;
@@ -169,7 +181,7 @@
cursor: pointer;
box-shadow: 0 2px 4px rgba(0, 237, 237, 0.5),
0 0 6px rgba(0, 237, 237, 0.4);
- z-index: 10;
+ z-index: 10;
}
}
}
--
Gitblit v1.8.0