|
|
@@ -96,7 +96,7 @@
|
|
|
<!-- <qiun-title-bar title="重点项目级别分布"/> -->
|
|
|
<view class="title-second">重点项目级别分布</view>
|
|
|
<view class="charts-box">
|
|
|
- <qiun-data-charts type="bar" background="#4C4C4C" :chartData="importantData.chartData" :opts="{xAxis:{labelCount:2},extra:{bar:{linearType:'custom',barBorderCircle:true}}}" />
|
|
|
+ <qiun-data-charts type="bar" background="#4C4C4C" :chartData="importantData.chartData" :opts="importantBarOpts" />
|
|
|
</view>
|
|
|
<!-- <qiun-title-bar title="工业投资额"/> -->
|
|
|
<view class="title-second">工业投资额</view>
|
|
|
@@ -192,6 +192,7 @@
|
|
|
},
|
|
|
chartDataBarOpt:{extra:{bar:{linearType:'custom',barBorderCircle:true}}},
|
|
|
companyOpts:{enableScroll: false,xAxis:{scrollShow: true,itemCount:5},yAxis:{data:[{min:0,max:3,tofix:2}]}},
|
|
|
+ importantBarOpts:{xAxis:{labelCount:2},extra:{bar:{linearType:'custom',barBorderCircle:true}}},
|
|
|
chartData1:{
|
|
|
"categories": [],
|
|
|
"series": [
|
|
|
@@ -251,6 +252,7 @@
|
|
|
{
|
|
|
name: "数量",
|
|
|
data: [],
|
|
|
+ format:'exceptZero',
|
|
|
},
|
|
|
]
|
|
|
},
|
|
|
@@ -585,16 +587,26 @@
|
|
|
});
|
|
|
},
|
|
|
importantFilter(data){
|
|
|
- let lineBalanceList = [], lineLast = [];
|
|
|
+ let barList = [],barObjList = [], lineBalanceList = [], lineLast = [];
|
|
|
this.importantData.importent_project_count = data.importent_project_count || '-';
|
|
|
this.importantData.new_project_count = data.new_project_count|| '-';
|
|
|
this.importantData.continue_project_count = data.continue_project_count|| '-';
|
|
|
this.importantData.investment_count = data.investment_count || 0;
|
|
|
//this.importantData.investment_count = data.investment_count ? (data.investment_count/10000).toFixed(2):0
|
|
|
if(data.province_level_count == 0 && data.city_level_count == 0 && data.area_level_count == 0 && data.new_city_level_count == 0){
|
|
|
- this.importantData.chartData.series[0].data = []
|
|
|
+ barList = [],barObjList = [];
|
|
|
}else{
|
|
|
- this.importantData.chartData.series[0].data = [data.province_level_count,data.city_level_count,data.area_level_count,data.new_city_level_count]
|
|
|
+ barList = [data.province_level_count,data.city_level_count,data.area_level_count,data.new_city_level_count]
|
|
|
+ barList.forEach((item)=>{
|
|
|
+ let dataObj = {
|
|
|
+ value:Number(item),
|
|
|
+ color:'#1890FF'
|
|
|
+ }
|
|
|
+ if(Number(item) === 0){
|
|
|
+ dataObj.color = '#4c4c4c'
|
|
|
+ }
|
|
|
+ barObjList.push(dataObj)
|
|
|
+ })
|
|
|
}
|
|
|
//this.importantData.chartData.series[0].data = [5,16,21]
|
|
|
for(let key in data.month_list ){
|
|
|
@@ -602,8 +614,10 @@
|
|
|
lineLast.push(data.month_list[key].last_balance)
|
|
|
}
|
|
|
lineBalanceList = lineBalanceList.splice(0,Number(this.dateMonth));
|
|
|
+ this.importantData.chartData.series[0].data = barObjList;
|
|
|
this.importantData.chartData2.series[0].data = lineBalanceList;
|
|
|
this.importantData.chartData2.series[1].data = lineLast;
|
|
|
+
|
|
|
},
|
|
|
getImportantChart(y,m){
|
|
|
let md5Sign = md5(
|