@@ -50,15 +62,16 @@ import {
// return;
// console.log(echarts);
import * as echarts from "echarts";
+import RegionPagine from "./RegionPagine.vue";
// import { ElMessage } from "element-plus";
const { proxy } = getCurrentInstance();
const loading = shallowRef(true);
let treeData = {};
-const snapTree = shallowRef({});
+const snapTree = shallowRef([]);
const industryTree = shallowRef({});
-
+const leftBoxPageNum = ref(1);
const searchRegionData = async (code, level) => {
if (level == "province") {
const provcode = code.substring(0, 2) + "0000";
@@ -96,7 +109,7 @@ const searchRegionData = async (code, level) => {
} else {
if (Object.keys(treeData).length) {
industryTree.value = treeData.industry ?? {};
- snapTree.value = treeData.count ?? {};
+ snapTree.value = treeData.count ?? [];
return treeData.count.find((item) => item.code == code) || false;
} else {
const { count, industry } = await countExpertByProvince();
@@ -237,7 +250,8 @@ function goBack() {
state.district.search("中国", async (status, result) => {
if (status == "complete") {
await getData(result.districtList[0], "", 100000);
- snapTree.value = formatData(treeData.count);
+ // snapTree.value = formatData(treeData.count);
+ snapTree.value = treeData.count;
}
});
}
@@ -414,7 +428,7 @@ function loadMap(mapName, data) {
borderColor: "#666666",
borderWidth: 0.5,
label: {
- show: true,
+ show: false,
textStyle: {
color: "#333333",
},
@@ -509,7 +523,7 @@ function loadMap(mapName, data) {
max-width: 250px;
min-width: 200px;
max-height: 256px;
- overflow: hidden;
+ // overflow: hidden;
background: rgba(4, 22, 65, 0.5);
border: 1px solid #0054ff;
color: rgba(161, 192, 255, 1);
@@ -535,4 +549,7 @@ function loadMap(mapName, data) {
width: 90px;
}
}
+.rightBox {
+ overflow: hidden;
+}
diff --git a/src/views/website/home/comp/index4.vue b/src/views/website/home/comp/index4.vue
index 7112289..a5dba17 100644
--- a/src/views/website/home/comp/index4.vue
+++ b/src/views/website/home/comp/index4.vue
@@ -11,7 +11,13 @@
地区
实验室数量