diff --git a/src/views/dataV/img/3.png b/src/views/dataV/img/3.png
index b171387..b9f690c 100644
Binary files a/src/views/dataV/img/3.png and b/src/views/dataV/img/3.png differ
diff --git a/src/views/dataV/img/leftTitle.png b/src/views/dataV/img/leftTitle.png
index 7930f16..3f37e6d 100644
Binary files a/src/views/dataV/img/leftTitle.png and b/src/views/dataV/img/leftTitle.png differ
diff --git a/src/views/dataV/img/leftTitle_old.png b/src/views/dataV/img/leftTitle_old.png
new file mode 100644
index 0000000..7930f16
Binary files /dev/null and b/src/views/dataV/img/leftTitle_old.png differ
diff --git a/src/views/dataV/index.vue b/src/views/dataV/index.vue
index 8ca4bd1..3d78190 100644
--- a/src/views/dataV/index.vue
+++ b/src/views/dataV/index.vue
@@ -49,7 +49,7 @@ export default {
return {
baseId: null,
titleList: [
- { name: '产业分布', type: 'pageOne' },
+ { name: '首\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0页', type: 'pageOne' },
{ name: '科技支撑', type: 'pageTwo' },
{ name: '产业基地', type: 'pageThree' },
{ name: '全维监测', type: 'pageFour' },
diff --git a/src/views/dataV/pageOne/AreaCount.vue b/src/views/dataV/pageOne/AreaCount.vue
index defc302..da49d37 100644
--- a/src/views/dataV/pageOne/AreaCount.vue
+++ b/src/views/dataV/pageOne/AreaCount.vue
@@ -39,7 +39,8 @@ export default {
xAxis: [
{
type: 'category',
- data: ['产业园规划', '标准农田', '种植业', '标注养殖', '养殖业', '高标准农田'],
+ // data: ['产业园规划', '标准农田', '种植业', '标注养殖', '养殖业', '高标准农田'],
+ data: ['1月', '2月', '3月', '4月', '5月', '6月'],
axisLine: {
lineStyle: {
color: '#FFFFFF',
@@ -109,7 +110,47 @@ export default {
},
label: {
normal: {
- show: true,
+ show: false,
+ lineHeight: 30,
+ formatter: '{c}',
+ position: 'top',
+ textStyle: {
+ color: '#00D6F9',
+ fontSize: 16,
+ },
+ },
+ },
+ },
+ {
+ type: 'line',
+ data: [90, 100, 107, 63, 105, 56],
+ barWidth: '14px',
+ itemStyle: {
+ normal: {
+ color: this.$echarts.graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: 'rgba(0,244,255,1)', // 0% 处的颜色
+ },
+ {
+ offset: 1,
+ color: 'rgba(0,77,167,1)', // 100% 处的颜色
+ },
+ ],
+ false
+ ),
+ shadowColor: 'rgba(0,160,221,1)',
+ shadowBlur: 4,
+ },
+ },
+ label: {
+ normal: {
+ show: false,
lineHeight: 30,
formatter: '{c}',
position: 'top',
diff --git a/src/views/dataV/pageOne/HomeCount.vue b/src/views/dataV/pageOne/HomeCount.vue
index ba09077..e18fdcb 100644
--- a/src/views/dataV/pageOne/HomeCount.vue
+++ b/src/views/dataV/pageOne/HomeCount.vue
@@ -3,7 +3,7 @@
@@ -30,10 +30,11 @@ export default {
data() {
return {
dataList: [
- { name: '龙头企业', nums: 10, imgs: require('../img/5.png'), homer: '(家)' },
- { name: '入园参与', nums: 28, imgs: require('../img/6.png'), homer: '(家)' },
- { name: '家庭农场', nums: 56, imgs: require('../img/7.png'), homer: '(家)' },
- { name: '合作社', nums: 811, imgs: require('../img/8.png'), homer: '(家)' },
+ { name: '农户', nums: 125, imgs: require('../img/5.png'), homer: '(家)' },
+ { name: '农企/合作社', nums: 28, imgs: require('../img/6.png'), homer: '(家)' },
+ { name: '生产加工企业', nums: 56, imgs: require('../img/7.png'), homer: '(家)' },
+ { name: '农资企业', nums: 811, imgs: require('../img/8.png'), homer: '(家)' },
+ { name: '种源企业', nums: 69, imgs: require('../img/5.png'), homer: '(家)' },
],
};
},
@@ -104,10 +105,13 @@ export default {
}
}
.topList:nth-child(3) {
- margin-top: 30px;
+ margin-top: 16px;
}
.topList:nth-child(4) {
- margin-top: 30px;
+ margin-top: 16px;
+ }
+ .topList:nth-child(5) {
+ margin-top: 16px;
}
}
}
diff --git a/src/views/dataV/pageOne/MapChart.vue b/src/views/dataV/pageOne/MapChart.vue
index ca41e6a..70389d4 100644
--- a/src/views/dataV/pageOne/MapChart.vue
+++ b/src/views/dataV/pageOne/MapChart.vue
@@ -8,35 +8,41 @@
-
农业总产值(亿元)
-
1,000.00
+
+
农业人口(万人)
+
20.49
-
产业园总产值(亿元)
-
27.51
+
+
耕地面积(万亩)
+
100.45
-
主导鸡肉产量(吨)
-
30,656.00
+
+
农业总产值(亿元)
+
90.83
-
主导小麦产量(吨)
-
44,120.00
+
人均增收(万元)
+
1.02
-

+
diff --git a/src/views/dataV/pageOne/greenIndustry.vue b/src/views/dataV/pageOne/greenIndustry.vue
index 1e71406..e195b99 100644
--- a/src/views/dataV/pageOne/greenIndustry.vue
+++ b/src/views/dataV/pageOne/greenIndustry.vue
@@ -21,12 +21,12 @@ export default {
data() {
return {
list: [
- { name: '农产品认证', num: 40.2, percent: '%', img: require('../img/10.png') },
- { name: '农产品面积', num: 5475, percent: '亩', img: require('../img/11.png') },
- { name: '综合利用率', num: 93.9, percent: '%', img: require('../img/12.png') },
- { name: '化肥利用率', num: 40.2, percent: '%', img: require('../img/13.png') },
- { name: '农药利用率', num: 40.7, percent: '%', img: require('../img/14.png') },
- { name: '监测合格率', num: 99.9, percent: '%', img: require('../img/15.png') },
+ { name: '种子使用', num: 4900.67, percent: '吨', img: require('../img/10.png') },
+ { name: '农药使用', num: 5100.15, percent: '吨', img: require('../img/11.png') },
+ { name: '化肥使用', num: 9100.59, percent: '吨', img: require('../img/12.png') },
+ { name: '饲料', num: 89043.09, percent: '吨', img: require('../img/13.png') },
+ { name: '兽药', num: 110.34, percent: '吨', img: require('../img/14.png') },
+ { name: '农机使用', num: 8100.86, percent: '台', img: require('../img/15.png') },
],
};
},
diff --git a/src/views/dataV/pageOne/index.vue b/src/views/dataV/pageOne/index.vue
index a028f8b..16b6628 100644
--- a/src/views/dataV/pageOne/index.vue
+++ b/src/views/dataV/pageOne/index.vue
@@ -48,7 +48,7 @@ export default {
data() {
return {
bg: require('../img/bg.png'),
- title: ['集约经营主体', '主导产业面积', '产业绿色发展', '主导产业产值', '主导产业占比'],
+ title: ['经营主体数据统计', '溯源赋码与扫码数据统计', '使用投入品数据统计', '土地分布数据', '种养殖数据统计'],
};
},
watch: {
diff --git a/src/views/dataV/pageOne/industrypercent.vue b/src/views/dataV/pageOne/industrypercent.vue
index 7c810ae..df5844a 100644
--- a/src/views/dataV/pageOne/industrypercent.vue
+++ b/src/views/dataV/pageOne/industrypercent.vue
@@ -183,7 +183,7 @@ export default {
this.statusChart.resize();
},
initChart2() {
- let data = ['三产产值', '二产产值', '一产产值', '产园总产值'];
+ let data = ['种植面积', '养殖面积', '种植基地', '养殖基地'];
let option = {
grid: {
top: '8%',
@@ -197,7 +197,7 @@ export default {
axisPointer: {
type: 'shadow',
},
- formatter: '{b0}: {c0}亿元',
+ formatter: '{b0}: {c0}',
},
xAxis: {
@@ -246,7 +246,8 @@ export default {
color: 'white',
fontSize: 12,
},
- formatter: '{c}' + '亿元',
+ // formatter: '{c}' + '亿元',
+ formatter: '{c}',
},
},
itemStyle: {
diff --git a/src/views/dataV/pageOne/moneyIndustry.vue b/src/views/dataV/pageOne/moneyIndustry.vue
index 978c9d0..020bc55 100644
--- a/src/views/dataV/pageOne/moneyIndustry.vue
+++ b/src/views/dataV/pageOne/moneyIndustry.vue
@@ -9,27 +9,27 @@ export default {
return {
chartData: [
{
- name: '三产产值',
+ name: '三岔河镇',
value: 50,
test: '备注1',
},
{
- name: '二产产值',
+ name: '大寺乡',
value: 60,
test: '备注2',
},
{
- name: '二产产值',
+ name: '凤山镇',
value: 66,
test: '备注3',
},
{
- name: '一产产值',
+ name: '小湾镇',
value: 72,
test: '备注4',
},
{
- name: '产园总产值',
+ name: '勐佑镇',
value: 80,
test: '备注5',
},
@@ -61,7 +61,7 @@ export default {
axisPointer: {
type: 'shadow',
},
- formatter: '{b0}: {c0}亿元',
+ formatter: '{b0}: {c0}万亩',
},
legend: {
show: false,
@@ -165,7 +165,7 @@ export default {
color: 'white',
fontSize: 16,
},
- formatter: '{c}' + '亿元',
+ formatter: '{c}' + '万亩',
},
},
barWidth: 12,