From 20a24c996d4c5bd448d575e5590f0262556f043a Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 7 Jul 2021 15:28:11 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20entity=E6=9E=B6=E5=AD=90=E3=80=81?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF=E4=BD=93=E7=A7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/css/common.scss | 6 ++++++
src/components/entities/entities.scss | 10 ++++++++++
src/utils/tools.js | 2 +-
src/views/charts/Chart.vue | 7 +++----
src/views/entities/EntityExplorer.vue | 13 ++++++++++---
5 files changed, 30 insertions(+), 8 deletions(-)
create mode 100644 src/components/entities/entities.scss
diff --git a/src/assets/css/common.scss b/src/assets/css/common.scss
index e60b3cef..dc43eb28 100644
--- a/src/assets/css/common.scss
+++ b/src/assets/css/common.scss
@@ -54,3 +54,9 @@ th *:first-letter,
.header__operations *:first-letter {
text-transform: capitalize;
}
+
+.outer-box {
+ padding: 10px;
+ height: 100%;
+ width: 100%;
+}
diff --git a/src/components/entities/entities.scss b/src/components/entities/entities.scss
new file mode 100644
index 00000000..adcb8d33
--- /dev/null
+++ b/src/components/entities/entities.scss
@@ -0,0 +1,10 @@
+.cn-entities {
+ display: grid;
+ grid-template-rows: 32px auto;
+ grid-template-columns: 250px auto;
+ grid-gap: 10px 20px;
+ padding: 20px;
+ height: 100%;
+ width: 100%;
+ background-color: #fff;
+}
\ No newline at end of file
diff --git a/src/utils/tools.js b/src/utils/tools.js
index 12b7aa39..b1b5c6a6 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -433,7 +433,7 @@ export function getCapitalGeo (countryId) {
return data[countryId]
}
-export function JSONParse (data) {
+function JSONParse (data) {
const firstParse = JSON.parse(data)
if (typeof firstParse === 'string') {
return JSON.parse(firstParse)
diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue
index a5fbd2f4..fa5ceec3 100644
--- a/src/views/charts/Chart.vue
+++ b/src/views/charts/Chart.vue
@@ -140,7 +140,6 @@
import * as echarts from 'echarts'
import * as am4Core from '@amcharts/amcharts4/core'
import * as am4Maps from '@amcharts/amcharts4/maps'
-import am4GeoDataWorldLow from '@amcharts/amcharts4-geodata/worldChinaLow'
import { shallowRef } from 'vue'
import {
@@ -166,9 +165,9 @@ import ChartMap from '@/components/charts/ChartMap'
import PieTable from '@/components/charts/PieTable'
import StatisticsLegend from '@/components/charts/StatisticsLegend'
import ChartTablePagination from '@/components/charts/ChartTablePagination'
-import { chartTableDefaultPageSize, chartTableTopOptions } from '@/utils/constants'
+import { chartTableDefaultPageSize, chartTableTopOptions, storageKey } from '@/utils/constants'
import { get } from '@/utils/http'
-import { replaceUrlPlaceholder, getCapitalGeo } from '@/utils/tools'
+import { replaceUrlPlaceholder, getCapitalGeo, getGeoData } from '@/utils/tools'
export default {
name: 'Chart',
@@ -430,7 +429,7 @@ export default {
},
initMap (id) {
const chart = am4Core.create(id, am4Maps.MapChart)
- chart.geodata = am4GeoDataWorldLow
+ chart.geodata = getGeoData(storageKey.iso36112WorldLow)
chart.projection = new am4Maps.projections.Miller()
const polygonSeries = chart.series.push(new am4Maps.MapPolygonSeries())
polygonSeries.useGeodata = true
diff --git a/src/views/entities/EntityExplorer.vue b/src/views/entities/EntityExplorer.vue
index 260376e7..77ad4d9b 100644
--- a/src/views/entities/EntityExplorer.vue
+++ b/src/views/entities/EntityExplorer.vue
@@ -1,5 +1,12 @@
-
+
-