修改前端问题

pages/metrics/index.vue

@@ -33,15 +33,18 @@
 				 <view>同比增长{{advanced_increase_ratio}}%</view>
 			 </view>
 		</view>
-		<qiun-title-bar title="2021年规上工业任务目标"/>
+		<!-- <qiun-title-bar title="2021年规上工业任务目标"/> -->
+		<view class="title-second">2021年规上工业任务目标</view>
 		<view class="charts-box">
-		    <qiun-data-charts type="bar"   background="#4C4C4C" :opts="{xAxis:{max:40},extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="chartData"/>
+		    <qiun-data-charts type="bar"   background="#4C4C4C" :opts="{extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="chartData"/>
 		</view>
-		<qiun-title-bar title="先进制造业产值(亿元)"/>
+		<!-- <qiun-title-bar title="先进制造业产值(亿元)"/> -->
+		<view class="title-second">先进制造业产值(亿元)</view>
 		<view class="charts-box">
 		    <qiun-data-charts  type="column"  :chartData="chartData1" background="#4C4C4C"/>
 		</view>
-		<qiun-title-bar title="工业产值"/>
+		<!-- <qiun-title-bar title="工业产值"/> -->
+		<view class="title-second">工业产值</view>
 		<view class="charts-box">
 		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'}}" :chartData="chartData2"/>
 		</view>
@@ -61,11 +64,13 @@
 				 <view>{{industryData.discuss_project_count}}</view>
 			 </view>
 		</view>
-		<qiun-title-bar title="2021年工业投资任务目标"/>
+		<!-- <qiun-title-bar title="2021年工业投资任务目标"/> -->
+		<view class="title-second">2021年工业投资任务目标</view>
 		<view class="charts-box">
-		    <qiun-data-charts type="bar"   background="#4C4C4C" :opts="{xAxis:{max:40},extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="industryData.chartData"/>
+		    <qiun-data-charts type="bar"   background="#4C4C4C" :opts="{extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="industryData.chartData"/>
 		</view>
-		<qiun-title-bar title="工业投资额"/>
+		<!-- <qiun-title-bar title="工业投资额"/> -->
+		<view class="title-second">工业投资额</view>
 		<view class="charts-box">
 		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'}}" :chartData="industryData.chartData2"/>
 		</view>
@@ -86,11 +91,13 @@
 	    		 <view>{{importantData.investment_count}}</view>
 	    	 </view>
 	    </view>
-	    <qiun-title-bar title="重点项目级别分布"/>
+	    <!-- <qiun-title-bar title="重点项目级别分布"/> -->
+		<view class="title-second">重点项目级别分布</view>
 	    <view class="charts-box">
 	        <qiun-data-charts type="bar"   background="#4C4C4C" :opts="{extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="importantData.chartData"/>
 	    </view>
-	    <qiun-title-bar title="工业投资额"/>
+	    <!-- <qiun-title-bar title="工业投资额"/> -->
+		<view class="title-second">重点项目级别分布</view>
 		<view class="charts-box">
 		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'}}" :chartData="importantData.chartData2"/>
 		</view>
@@ -99,29 +106,29 @@
 	    <view class="block-box display-around items-center">
 	    	 <view class="block-box-content" style="width:47%;color: #555;" @click="goScale('科技创新企业','high_tech')">
 	    		 <view>国家高新技术企业</view>
-	    		 <view>{{techData.target.high}}/<text style="color: red;">{{techData.finish.high}}</text></view>
+	    		 <view>{{techData.target.high ||'-'}}/<text style="color: red;">{{techData.finish.high ||'-'}}</text></view>
 	    	 </view>
 	    	 <view class="block-box-content" style="width:47%;color: #555;" @click="goScale('科技创新企业','tech')">
 	    		 <view>科技型中小企业</view>
-	    		 <view>{{techData.target.mini}}/<text style="color: red;">{{techData.finish.mini}}</text></view>
+	    		 <view>{{techData.target.mini ||'-'}}/<text style="color: red;">{{techData.finish.mini ||'-'}}</text></view>
 	    	 </view>
 		</view>
 		<view class="display-around-column items-center" style="height: 620rpx; margin: 10rpx 0 10rpx 0;">
 		   <view class="block-box-content" style="width:97%;color: #555;" @click="goScale('科技创新企业','standard_industry')">
 		   				 <view>累计研发投入规上工业企业</view>
-		   				 <view>{{techData.target.standard_industry}}/<text style="color: red;">{{techData.finish.standard_industry}}</text></view>
+		   				 <view>{{techData.target.standard_industry ||'-'}}/<text style="color: red;">{{techData.finish.standard_industry ||'-'}}</text></view>
 		   </view>
 		   <view class="block-box-content" style="width:97%;color: #555;" @click="goScale('科技创新企业','standard_service')">
 		   				 <view>累计研发投入规上服务业企业</view>
-		   				 <view>{{techData.target.standard_service}}/<text style="color: red;">{{techData.finish.standard_service}}</text></view>
+		   				 <view>{{techData.target.standard_service ||'-'}}/<text style="color: red;">{{techData.finish.standard_service ||'-'}}</text></view>
 		    </view>
 		    <view class="block-box-content" style="width:97%;color: #555;" @click="goScale('科技创新企业','rd_five_percent' )">
 		   				 <view>累计研发投入占主营业务5%的企业</view>
-		   				 <view>{{techData.target.rd_five_percent}}/<text style="color: red;">{{techData.finish.rd_five_percent}}</text></view>
+		   				 <view>{{techData.target.rd_five_percent ||'-'}}/<text style="color: red;">{{techData.finish.rd_five_percent ||'-'}}</text></view>
 		   </view>
 		   <view class="block-box-content" style="width:97%;color: #555;" @click="goScale('科技创新企业','rd_five_million')">
 		   				 <view>累计研发投入500万以上的企业</view>
-		   				 <view>{{techData.target.rd_five_million}}/<text style="color: red;">{{techData.finish.rd_five_million}}</text></view>
+		   				 <view>{{techData.target.rd_five_million ||'-'}}/<text style="color: red;">{{techData.finish.rd_five_million ||'-'}}</text></view>
 		   </view>
 	   </view>
 	
@@ -135,11 +142,13 @@
 	    		</view>
 	    	</view>
 	    </view>
-		<qiun-title-bar title="各新城规上工业企业数量"/>
+		<!-- <qiun-title-bar title="各新城规上工业企业数量"/> -->
+		<view class="title-second">各新城{{sortSelect}}</view>
 		<view class="charts-box">
 			<qiun-data-charts  type="column"  :chartData="ereaData.chartDataBar" background="#4C4C4C"/>
 		</view>
-		<qiun-title-bar title="各新城规上工业企业数量占比"/>
+		<!-- <qiun-title-bar title="各新城规上工业企业数量占比"/> -->
+		<view class="title-second">各新城{{sortSelect}}占比</view>
 		<view class="charts-box" style="margin-bottom: 20rpx;">
 			<qiun-data-charts   type="pie" :chartData="ereaData.chartDataPie" background="#4C4C4C"/>
 		</view>
@@ -164,14 +173,14 @@
 				categories: ["工业增加值增速", "先进制造业总产值"],
 				series: [
 					{   name: "目标任务",
+					    otherData:[],
 						data: [],
-						otherData:[],
 						format:'moreDataShow',
 						textSize:10
 					},
 				    {   name: "目前已完成", 
+					    otherData:[],
 						data: [],
-						otherData:[],
 						format:'moreDataShow',
 						textSize:10
 					},
@@ -333,26 +342,30 @@
 			    success: (res) => {
 			      if (res.data.code === 200) {
 				   let targetData = [],targetData1 = [],finishData = [],finishData1 = [];
-				   this.standard_sized_count = res.data.data.standard_sized_count;
-				   this.standard_sized_increase_ratio = res.data.data.standard_sized_increase_ratio;
-				   this.advanced_count = res.data.data.advanced_count;
-				   this.advanced_increase_ratio = res.data.data.advanced_increase_ratio;
-				   res.data.data.target.forEach((item,index)=>{
-					   if(item.source !== '0'){
-						   targetData.push(Number(item.increase_balance))
-						   targetData1.push(Number(item.increase_ratio))
-					   }
-				   })
-				   res.data.data.finish.forEach((item,index)=>{
-					   if(item.source !== '0'){
-						   finishData.push(Number(item.increase_balance))
-						   finishData1.push(Number(item.increase_ratio))
-					   }
-				   })
-				   this.chartData.series[0].data = targetData
-				   this.chartData.series[0].otherData = targetData1
-				   this.chartData.series[1].data = finishData
-				   this.chartData.series[1].otherData = finishData1
+				   this.standard_sized_count = res.data.data.standard_sized_count || '-';
+				   this.standard_sized_increase_ratio = res.data.data.standard_sized_increase_ratio || '-';
+				   this.advanced_count = res.data.data.advanced_count || '-';
+				   this.advanced_increase_ratio = res.data.data.advanced_increase_ratio || '-';
+				   if(res.data.data.target.length){
+					   res.data.data.target.forEach((item,index)=>{
+						   if(item.source !== '0'){
+							   targetData.push(Number(item.increase_balance))
+							   targetData1.push(Number(item.increase_ratio))
+						   }
+					   })
+				   }
+				   if(res.data.data.finish.length){
+					   res.data.data.finish.forEach((item,index)=>{
+						   if(item.source !== '0'){
+							   finishData.push(Number(item.increase_balance))
+							   finishData1.push(Number(item.increase_ratio))
+						   }
+					   })
+				   }
+				   this.chartData.series[0].data = targetData1
+				   this.chartData.series[0].otherData = targetData
+				   this.chartData.series[1].data = finishData1
+				   this.chartData.series[1].otherData = finishData
 			      }
 			    },
 			    fail: () => {
@@ -414,9 +427,9 @@
 		  },
 		  industryFilter(data){
 			  let targetData = [],targetData1 = [],finishData = [],finishData1 = [],lineBalanceList = [], lineLast = [];
-			  this.industryData.discuss_project_count = data.discuss_project_count;
-			  this.industryData.industrial_investment_project_count = data.industrial_investment_project_count;
-			  this.industryData.instore_project_count = data.instore_project_count;
+			  this.industryData.discuss_project_count = data.discuss_project_count || '-';
+			  this.industryData.industrial_investment_project_count = data.industrial_investment_project_count || '-';
+			  this.industryData.instore_project_count = data.instore_project_count || '-';
 			  if(data.target.length){
 				   let targetList = data.target;
 				   targetData = [targetList[0].store_balance,targetList[0].tech_balance];
@@ -480,10 +493,10 @@
 		  },
 		  importantFilter(data){
 			  let 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;
+			  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|| '-';
 			  this.importantData.chartData.series[0].data = [data.city_level_count,data.area_level_count,data.new_city_level_count] 
 			  //this.importantData.chartData.series[0].data = [5,16,21]
 			  for(let key in data.month_list ){
@@ -576,6 +589,7 @@
 			  this.ereaData.chartDataBar.categories = categoriesList;
 			  this.ereaData.chartDataPie.categories = categoriesList;
 			  this.ereaData.chartDataBar.series[0].data = barData;
+			  pieData.forEach((item)=>{item.value = Number(item.value)})
 			  this.ereaData.chartDataPie.series[0].data = pieData;
 		  },
 		  getEreaInfos(y,m,select){
@@ -690,4 +704,12 @@
 		color: #fff;
 		background-color:#F2F2F2;
 	}
+	.title-second {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		text-align: center;
+		font-size: 30rpx;
+		/* font-weight: 550; */
+	}
 </style>

pages/metrics/largeScale/detail.vue

@@ -49,7 +49,7 @@
 			 <view class="term">
 					<view class="term-name">规上工业企业:</view>
 					<view class="term-value-group">
-					  <p  class="term-value-item">{{ highType[itemObj.high_tech] || "-" }}</p>
+					  <p  class="term-value-item">{{ standard_sized[itemObj.standard_sized] || "-" }}</p>
 					</view>
 			  </view>
 			<view class="term">
@@ -87,7 +87,7 @@
 			 <view class="term">
 					<view class="term-name">本年度生产总值:</view>
 					<view class="term-value-group">
-					  <p  class="term-value-item">{{ itemObj.industry_money || "-" }}</p>
+					  <p  class="term-value-item">{{ itemObj.value_last_year || "-" }} 万元</p>
 					</view>
 			  </view>
 			<view class="term">
@@ -107,7 +107,7 @@
 		  return{
 			  dateYear:new Date().getFullYear(),
 			  dateMonth:new Date().getMonth() + 1,
-			  arrayMonth:["1", "2","3", "4","5", "6","7", "8","9", "10","11", "12"],
+			  arrayMonth:["1","2","3", "4","5", "6","7", "8","9", "10","11", "12"],
 			  chartData:{
 				 // "categories": ["1月", "2月","3月", "4月","5月", "6月","7月", "8月","9月", "10月","11月", "12月"],
 				  "categories":[],
@@ -117,18 +117,24 @@
 			  },
 			  itemObj:{},
 			  advancedType:{
-					  '0':'是',
-					  '1':'否'
+					  '0':'否',
+					  '1':'是'
 			  },
 			  highType:{
-					  '0':'是',
-					  '1':'否'
+					'0':'否',
+					'1':'是'
+			  },
+			  standard_sized:{
+					'0':'否',
+					'1':'是'
 			  },
 			  nowId:''
 		 }
 	  },
 	  onLoad(option) {
 		this.nowId = option.id;  
+		this.dateYear = Number(option.year);
+		this.dateMonth = Number(option.month);
 		this.getCompanyInfo(this.dateYear,this.dateMonth,option.id)
 	  },
 	  methods:{

pages/metrics/largeScale/index.vue

@@ -22,7 +22,7 @@
 		      </view>
 		      <view class="name display-around-column" style="align-items: flex-start;">
 		         <view>{{ company.name || '-'}}</view>
-				 <view class="isAdvanced" v-show="company.advanced">先进制造业</view>
+				 <view class="isAdvanced" v-show="company.advanced !== '0'">先进制造业</view>
 		      </view>
 		    </view>
 		    <view class="info">
@@ -114,7 +114,7 @@
 		  },
 		  toDetail(id){
 			  uni.navigateTo({
-			  	url:'./detail' + '?id=' + id
+			  	url:'./detail' + '?id=' + id + '&year=' + this.yearVal + '&month=' + this.monthVal
 			  })
 		  },
 		  getCompany(y,m,sort) {

pages/metrics/projectPage/detail.vue

@@ -130,12 +130,13 @@
 				  '1':'续建'
 			  },
 			  industryType:{
-				  '0':'是',
-				  '1':'否'
+				  '0':'否',
+				  '1':'是'
 			  },
 			  investmentType:{
 				 // '0':'是',
-				  '1':'社会投资'
+				  '1':'社会投资',
+				  '2':'政府投资'
 			  }
 		 }
 	  },

pages/metrics/projectPage/index.vue

@@ -11,7 +11,7 @@
 		<view class="project-box">
 			<view class="project-content display-around-column" v-for="(item, idx) in projectData" :key="idx" 
 			:class="{ borderBottom: idx == projectData.length - 1 }" @click="enterProjectDeatil(item.id)">
-				<view class="display-between items-center pos-class">
+				<view class="display-between items-center pos-class"  :class="{ marginTop20: active === 2 }" >
 					<view style="font-size: 30rpx;">{{item.name}}</view>
 					<image v-if="item.importent === '1'" src="/static/important_icon.png" mode="aspectFit" style="width:80rpx;height: 80rpx;"></image>
 				</view>
@@ -53,6 +53,9 @@
 	  },
 	  methods: {
 	    enterProjectDeatil(id) {
+			if(this.active == '2'){
+				return
+			}
 	      uni.navigateTo({
 			url:"/pages/metrics/projectPage/detail?id=" + id
 	      });
@@ -154,4 +157,7 @@
 	.borderBottom {
 		border-bottom: 1px solid #f2f2f2;
 	}
+	.marginTop20 {
+		margin-top: 20rpx;
+	}
 </style>

uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -54,8 +54,9 @@ const cfu = {
   "option":{},
   //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
   "formatter":{
-    "moreDataShow":function(val,index,opts,series){return val +'亿' + ';同比增长' + series.otherData[index] + '%'},
+    "moreDataShow":function(val,index,opts,series){return series.otherData[index] +'亿' + ';同比增长' + val + '%'},
     "yAxisDemo2":function(val){return val.toFixed(2)},
+	"fix1":function(val,index,opts,series){return series.otherData[index] + '%'},
     "xAxisDemo1":function(val){return val+'年'},
     "xAxisDemo2":function(val){return formatDateTime(val,'h:m')},
     "seriesDemo1":function(val){return val+'元'},
@@ -346,6 +347,13 @@ const cfu = {
       "axisLine":false
   	},
   	"yAxis": {
+		"data": [
+			{
+				"type": "categories",
+				"fontSize": 10,
+				"textAlign": "left",
+			}
+		]
   	},
   	"legend": {
   	},