From 0a3994b8a4e5d89639a0348f28754fc595d4d0e9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 17 Oct 2022 17:26:18 +0800
Subject: [PATCH] 相同投入品合并，优化显示
---
src/views/manage/index.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/views/manage/index.vue b/src/views/manage/index.vue
index ab9ab79..fca13c9 100644
--- a/src/views/manage/index.vue
+++ b/src/views/manage/index.vue
@@ -618,7 +618,7 @@
farmSelectQuery,
} from "@/api/farm/farmingrecord"
-import publicjs from '@/utils/public'
+import publicjs, { deepClone } from '@/utils/public'
import dateUtilsJs from '@/utils/dateUtils'
export default {
@@ -698,8 +698,8 @@
inputNZ_nzname: "",
inputTRP_nzname: "",
inputNCP_nzname: "",
- nsSelectTime: [dateUtilsJs.getSpecifyDayDate(30),dateUtilsJs.getToDay()],
- nzSelectTime: [dateUtilsJs.getSpecifyDayDate(30),dateUtilsJs.getToDay()]
+ nsSelectTime: [dateUtilsJs.getSpecifyDayDate(30),dateUtilsJs.getDayLast()],
+ nzSelectTime: [dateUtilsJs.getSpecifyDayDate(30),dateUtilsJs.getDayLast()]
}
},
created () {
@@ -1053,7 +1053,21 @@
const chartDom = document.getElementById(dom)
const myChart = this.$echarts.init(chartDom)
myChart.clear()
- var nztrData = this.nztr
+
+ var temp = deepClone(this.nztr)
+ let idArr = [] //相同id放在同一数组中
+ let resultArr = [] //最终结果数组
+ for(let i = 0;i < temp.length; i++){
+ let index = idArr.indexOf(temp[i].agrname)
+ if(index > -1){ //有相同id存在的话,获取index索引位置
+ resultArr[index].cnum += temp[i].cnum //cnum
+ }else{
+ idArr.push(temp[i].agrname)
+ resultArr.push(temp[i])
+ }
+ }
+
+ var nztrData = resultArr
var nztrX = []
var nztrY = []
for (let i = 0; i < nztrData.length; i++) {
@@ -1085,6 +1099,7 @@
axisLabel: {
color: "rgba(255,255,255,.4)",
rotate: 0,
+ interval:0
},
},
yAxis: {
--
Gitblit v1.9.3