diff --git a/new-digital-agriculture-screen/src/views/entities/components/categoryCharts.vue b/new-digital-agriculture-screen/src/views/entities/components/categoryCharts.vue
index 7e654b2..2027b24 100644
--- a/new-digital-agriculture-screen/src/views/entities/components/categoryCharts.vue
+++ b/new-digital-agriculture-screen/src/views/entities/components/categoryCharts.vue
@@ -14,16 +14,16 @@ const data = ref([
value: 10.8,
itemStyle: { color: '#5b7bc7', opacity: 0.8 },
},
- {
- name: ' 合作社',
- value: 18.4,
- itemStyle: { color: '#8ed0f3', opacity: 0.8 },
- },
- {
- name: ' 村集体',
- value: 14.3,
- itemStyle: { color: '#65be97', opacity: 0.8 },
- },
+ // {
+ // name: ' 合作社',
+ // value: 18.4,
+ // itemStyle: { color: '#8ed0f3', opacity: 0.8 },
+ // },
+ // {
+ // name: ' 村集体',
+ // value: 14.3,
+ // itemStyle: { color: '#65be97', opacity: 0.8 },
+ // },
{
name: ' 个体',
value: 23.7,
diff --git a/new-digital-agriculture-screen/src/views/entities/components/entitiesMap.vue b/new-digital-agriculture-screen/src/views/entities/components/entitiesMap.vue
index 13c213a..5fad641 100644
--- a/new-digital-agriculture-screen/src/views/entities/components/entitiesMap.vue
+++ b/new-digital-agriculture-screen/src/views/entities/components/entitiesMap.vue
@@ -23,7 +23,7 @@ import { ref, reactive } from 'vue';
const unit = ref('家');
const list = reactive([
- { title: '年总产值', value: 3.49, color: '#01FEFD', unit: '亿元' },
+ { title: '年总产值', value: 3.49, color: '#01FEFD', unit: '万元' },
{ title: '年人均收入', value: 6.98, color: '#FEF906', unit: '万元' },
]);
diff --git a/new-digital-agriculture-screen/src/views/entities/components/entitiesStatistics.vue b/new-digital-agriculture-screen/src/views/entities/components/entitiesStatistics.vue
index 5ebd08b..a494c28 100644
--- a/new-digital-agriculture-screen/src/views/entities/components/entitiesStatistics.vue
+++ b/new-digital-agriculture-screen/src/views/entities/components/entitiesStatistics.vue
@@ -38,7 +38,6 @@ const state = reactive({
backgroundColor: 'rgba(0,0,0,0.5)',
borderColor: '#35d0c0',
formatter: (data) => {
- console.log('data', data);
const params = data[0];
let str = `
${params.name}
diff --git a/new-digital-agriculture-screen/src/views/entities/components/valueCharts.vue b/new-digital-agriculture-screen/src/views/entities/components/valueCharts.vue
new file mode 100644
index 0000000..397fe75
--- /dev/null
+++ b/new-digital-agriculture-screen/src/views/entities/components/valueCharts.vue
@@ -0,0 +1,153 @@
+
+
+
+
diff --git a/new-digital-agriculture-screen/src/views/entities/index.vue b/new-digital-agriculture-screen/src/views/entities/index.vue
index c3bfd86..e2a351d 100644
--- a/new-digital-agriculture-screen/src/views/entities/index.vue
+++ b/new-digital-agriculture-screen/src/views/entities/index.vue
@@ -10,21 +10,19 @@
:value-field="'value'"
:down-width="''"
:options="[
- { label: '全县', value: '530926' },
- { label: '耿马镇', value: '42611' },
- { label: '勐撒镇', value: '9259' },
- { label: '勐永镇', value: '17787' },
- { label: '孟定镇', value: '42610' },
- { label: '勐简乡', value: '17788' },
- { label: '贺派乡', value: '40161' },
- { label: '四排山乡', value: '40163' },
- { label: '大兴乡', value: '40159' },
+ { label: '全县', value: 'all' },
+ { label: '耿马镇', value: '耿马镇' },
+ { label: '勐撒镇', value: '勐撒镇' },
+ { label: '勐永镇', value: '勐永镇' },
+ { label: '孟定镇', value: '孟定镇' },
+ { label: '大兴乡', value: '大兴乡' },
]"
:is-down="true"
@command="handleCommand"
>
-
+
+
@@ -98,6 +96,7 @@ import entitiesStatistics from './components/entitiesStatistics.vue';
import entitiesCategoryCharts from './components/entitiesCategoryCharts.vue';
import entitiesMap from './components/entitiesMap.vue';
import { sleep } from '@/utils';
+import ValueCharts from '@/views/entities/components/valueCharts.vue';
const oneRef = ref(null);
const thirdRef = ref(null);
@@ -113,12 +112,11 @@ const loadData = async () => {
await sleep(500);
state.data = {
one: [
- { value: 5, name: '2020' },
- { value: 36, name: '2021' },
- { value: 70, name: '2022' },
- { value: 56, name: '2023' },
- { value: 70, name: '2024' },
- { value: 20, name: '2025' },
+ { value: 3500, name: '耿马镇' },
+ { value: 6000, name: '勐撒镇' },
+ { value: 4000, name: '勐永镇' },
+ { value: 8000, name: '孟定镇' },
+ { value: 12000, name: '大兴乡' },
],
third: [
{ value: 98, value1: 88, name: '耿马镇' },