From 703d0a94961ca7a50125e005bc5414836a79daba Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jul 2022 09:51:56 +0800
Subject: [PATCH] 市场流通
---
src/views/home/index.vue | 114 ++++++++++++-------------------------
src/api/farm/farmingrecord.js | 9 +++
2 files changed, 47 insertions(+), 76 deletions(-)
diff --git a/src/api/farm/farmingrecord.js b/src/api/farm/farmingrecord.js
index bd1b740..36aef08 100644
--- a/src/api/farm/farmingrecord.js
+++ b/src/api/farm/farmingrecord.js
@@ -162,6 +162,15 @@
}
})
}
+export const selectMarketDistrict = (params) => {
+ return request({
+ url: '/sale/sale/selectMarketDistrict',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
export const countTaskNum = (params) => {
return request({
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 09ceaee..29851f1 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -276,23 +276,12 @@
<div class="market-content">
<div id="marketChartQx" class="market-chart"></div>
<div class="market-list">
- <div class="market-list-item">
+ <div class="market-list-item" v-for="(item,index) in marketDistrict" :key="index">
<div>
<div class="t-border"></div>
<div class="t-item">
- <div>湖北省</div>
- <div>300公斤</div>
- </div>
- <div class="b-border"></div>
- </div>
- </div>
-
- <div class="market-list-item">
- <div>
- <div class="t-border"></div>
- <div class="t-item">
- <div>湖北省</div>
- <div>300公斤</div>
+ <div>{{item.name}}</div>
+ <div>{{item.num}}公斤</div>
</div>
<div class="b-border"></div>
</div>
@@ -366,7 +355,8 @@
pagePalnt,
SelectCount,
selctSaletCount,
- selctSaletZ
+ selctSaletZ,
+ selectMarketDistrict
} from '@/api/farm/farmingrecord'
// eslint-disable-next-line no-unused-vars
import { selectXCount } from '@/api/land/land'
@@ -390,6 +380,8 @@
salaNum: [],
// 每月销售统计
salaNumY: [],
+ // 市场流通
+ marketDistrict: [],
farmProfiles: false
}
},
@@ -402,6 +394,7 @@
this.SelectCount()
this.selctSaletCount()
this.selctSaletZ()
+ this.selectMarketDistrict()
},
mounted () {
this.initRightPie('EquipmentEcharts')
@@ -742,6 +735,13 @@
this.initLine('TrendEcharts')
})
},
+ // 按行政区统计市场流通
+ selectMarketDistrict () {
+ var that = this
+ selectMarketDistrict().then((res) => {
+ that.marketDistrict = res.data.data
+ })
+ },
// 统计今年和去年的销售总额
selctSaletZ () {
var that = this
@@ -814,69 +814,31 @@
const chartDom = document.getElementById(dom)
console.log(chartDom, 456)
const myChart = this.$echarts.init(chartDom)
- var geoCoordMap = {
- '绥化': [126.968887, 46.653845],
- '哈尔滨': [126.534967, 45.803775],
- '佳木斯': [130.306119, 46.799608],
- '鹤岗': [130.284147, 47.34582],
- '双鸭山': [131.135587, 46.675373],
- '伊春': [128.844938, 47.735185],
- '大庆': [125.104093, 46.59994],
- '齐齐哈尔': [123.912076, 47.360706],
- '长春': [125.285367, 43.841975],
- '牡丹江': [129.613981, 44.558693],
- '大连': [121.593961, 38.907619],
- '海拉尔区': [119.736279, 49.212189]
+ var marketData = this.marketDistrict
+ var geoCoordMap = {}
+ var GZData = []
+ geoCoordMap['出发地'] = [115.17473025869447, 27.407869370774904]
+ for (let i = 0; i < marketData.length; i++) {
+ var xy = []
+ var xs = {}
+ var fram = {}
+ var framList = []
+ xy.push(marketData[i].lat)
+ xy.push(marketData[i].lng)
+ xs = {
+ name: marketData[i].name,
+ value: marketData[i].num
+ }
+ fram = {
+ name: '出发地'
+ }
+ framList.push(fram)
+ framList.push(xs)
+ GZData.push(framList)
+ geoCoordMap[marketData[i].name] = xy
}
- var GZData = [
- [{ name: '哈尔滨' }, {
- name: '绥化',
- value: 95
- }],
- [{ name: '哈尔滨' }, {
- name: '佳木斯',
- value: 90
- }],
- [{ name: '哈尔滨' }, {
- name: '鹤岗',
- value: 80
- }],
- [{ name: '哈尔滨' }, {
- name: '伊春',
- value: 70
- }],
- [{ name: '哈尔滨' }, {
- name: '双鸭山',
- value: 60
- }],
- [{ name: '哈尔滨' }, {
- name: '大庆',
- value: 50
- }],
- [{ name: '哈尔滨' }, {
- name: '齐齐哈尔',
- value: 40
- }],
- [{ name: '哈尔滨' }, {
- name: '长春',
- value: 20
- }],
- [{ name: '哈尔滨' }, {
- name: '牡丹江',
- value: 10
- }],
- [{ name: '哈尔滨' }, {
- name: '大连',
- value: 25
- }],
- [{ name: '哈尔滨' }, {
- name: '海拉尔区',
- value: 25
- }]
- ]
-
- var seriesMap = [['哈尔滨', GZData]]
+ var seriesMap = [['出发地', GZData]]
// 初始化数据
// var geoCoordMap = data.result.geoCoordMap;
--
Gitblit v1.9.3