-
+
+
+
@@ -209,6 +211,7 @@ export default {
await this.getAgencylist()//获取组织级别
await nextTick(500)
await this.loadOrgData()
+
await this.getApiData();
},
@@ -238,6 +241,15 @@ export default {
if (month2 < 10) {
month2 = '0' + month2;
}
+ if (month < 10) {
+ month = '0' + month;
+ }
+ if (day < 10) {
+ day = '0' + day;
+ }
+ if (day2 < 10) {
+ day2 = '0' + day2;
+ }
var t2 = year2 + '-' + month2 + '-' + day2;
var t1 = year + '-' + month + '-' + day;
// let t3 = formate(t2, style);
@@ -251,9 +263,19 @@ export default {
},
async getApiData () {
-
- await this.getLine()
+ await this.getLineChart()
await this.loadMapData();
+
+ this.assignData()
+ },
+
+ assignData () {
+ if (!this.showNoData) {
+ this.getLine()
+ }
+
+ this.loadMap()
+ this.isfirstInit = false
},
// 获取当前登录人员信息及组织信息
@@ -352,17 +374,17 @@ export default {
if (code === 0) {
this.legendArray = []
- if (data.under) {
+ if (data.under === 0 || data.under) {
this.under = data.under
this.legendArray.push(
{
color: this.colorArray[0],
- name: data.under + '以下'
+ name: data.under + '及以下'
}
)
}
- if (data.above) {
+ if (data.above === 0 || data.above) {
this.above = data.above
this.legendArray.push(
{
@@ -373,7 +395,7 @@ export default {
this.legendArray.push(
{
color: this.colorArray[2],
- name: data.above + '以上'
+ name: data.above + '及以上'
}
)
}
@@ -394,12 +416,12 @@ export default {
item.latitude = agencyItem.latitude
item.coordinates = agencyItem.coordinates
- if (this.under) {
+ if (this.under === 0 || this.under) {
if (item.count < this.under || item.count === this.under) {
item.color = this.colorArray[0]
item.fillColor = this.colorFillArray[0]
} else {
- if (this.above) {
+ if (this.above === 0 || this.above) {
if (item.count > this.under && item.count < this.above) {
item.color = this.colorArray[1]
item.fillColor = this.colorFillArray[1]
@@ -410,7 +432,6 @@ export default {
}
}
-
}
break
}
@@ -420,8 +441,7 @@ export default {
});
console.log(this.mapList)
- this.loadMap()
- this.isfirstInit = false
+
} else {
this.$message.error(msg);
@@ -446,7 +466,7 @@ export default {
},
getLine () {
if (this.lineInitState) {
- this.getLineChart()
+ this.assignLineChart()
} else {
setTimeout(() => {
this.getLine()
@@ -455,9 +475,13 @@ export default {
},
// 获取折线图
async getLineChart () {
- this.$refs.lineChart.clear()
+ if (!this.showNoData) {
+ this.$refs.lineChart.clear()
+ this.$refs.lineChart.showLoading()
+ }
+
const _that = this
- this.$refs.lineChart.showLoading()
+
const url = "/gov/project/project/projectdistributionanalysisleft";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/projectdistributionanalysisleft";
let params = {
@@ -467,28 +491,20 @@ export default {
};
const { data, code, msg } = await requestPost(url, params);
- this.$refs.lineChart.hideLoading()
+ if (!this.showNoData) {
+ this.$refs.lineChart.hideLoading()
+ }
if (code === 0) {
- // 获取pieChart配置
- this.lineOption = lineOption()
if (data && data.length > 0) {
this.lineList = data
- this.loadCategoryData()
-
-
-
- this.$refs.lineChart.setOption(this.lineOption, true)
- this.$refs.lineChart.setOption({
- xAxis: { data: this.xaxis },
- legend: { data: this.legend },
- series: this.series
- }, true)
+ this.showNoData = false
} else {
this.lineList = []
+ this.showNoData = true
}
-
+ this.loadCategoryData()
} else {
this.$message.error(msg);
@@ -496,60 +512,75 @@ export default {
},
+ assignLineChart () {
+ // 获取pieChart配置
+ this.lineOption = lineOption()
+
+ this.$refs.lineChart.setOption(this.lineOption, true)
+ this.$refs.lineChart.setOption({
+ xAxis: { data: this.xaxis },
+ legend: { data: this.legend },
+ series: this.series
+ }, true)
+ },
+
//解析折线图数据
loadCategoryData () {
this.xaxis = []
this.series = []
this.legend = []
- let num = this.lineList[0].categoryList.length
-
- let dataArray = new Array(num)
- //遍历每个分类
- this.lineList[0].categoryList.forEach((categoryItem, index) => {
- this.legend.push(categoryItem.categoryName)
- dataArray[index] = []
-
- });
+ if (this.lineList.length > 0) {
- //遍历每个时间
- this.lineList.forEach(item => {
- this.xaxis.push(item.time)
+ let num = this.lineList[0].categoryList.length
+ let dataArray = new Array(num)
//遍历每个分类
- item.categoryList.forEach((categoryItem, index) => {
- dataArray[index].push(categoryItem.count)
+ this.lineList[0].categoryList.forEach((categoryItem, index) => {
+ this.legend.push(categoryItem.categoryName)
+ dataArray[index] = []
+
});
- });
-
- //遍历第一组的分类
- this.lineList[0].categoryList.forEach((categoryItem, index) => {
-
- let object = {
- name: categoryItem.categoryName,
- type: 'line',
- smooth: true,
- barWidth: 15,
- areaStyle: {},
- itemStyle: {
- color: new echarts.graphic.LinearGradient(
- 0, 1, 0, 0,
- [
- { offset: 0, color: 'rgba(121, 55, 255, 0)' },
- { offset: 1, color: categoryItem.color }
- ]
- )
- },
- data: dataArray[index]
- }
- this.series.push(object)
+ //遍历每个时间
+ this.lineList.forEach(item => {
+ this.xaxis.push(item.time)
+ //遍历每个分类
+ item.categoryList.forEach((categoryItem, index) => {
+ dataArray[index].push(categoryItem.count)
+ });
- });
+ });
+
+ //遍历第一组的分类
+ this.lineList[0].categoryList.forEach((categoryItem, index) => {
+
+ let object = {
+ name: categoryItem.categoryName,
+ type: 'line',
+ smooth: true,
+ barWidth: 15,
+ areaStyle: {},
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(
+ 0, 1, 0, 0,
+ [
+ { offset: 0, color: 'rgba(121, 55, 255, 0)' },
+ { offset: 1, color: categoryItem.color }
+ ]
+ )
+ },
+ data: dataArray[index]
+ }
+ this.series.push(object)
+
+
+ });
+ }
},
handleChangeAgency (value) {
From 5787640869df6ab4c9d8f6690f63afee486258b7 Mon Sep 17 00:00:00 2001
From: jiangyy
Date: Thu, 6 Jan 2022 13:29:54 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../communityParty/regionalParty/activitys.vue | 14 +++++++++++++-
.../communityParty/regionalParty/activitysForm.vue | 13 ++++++++++++-
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 1638a07c..18f9d315 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -148,6 +148,16 @@
label="活动时间"
width="230">
+
+
+ 小程序
+ 管理平台
+
+
查看
- 修改
@@ -199,6 +210,7 @@
@dialogCancle="addFormCancle"
@dialogOk="addFormOk">
+
项目分布分析
-