修改问题

pages/metrics/index.vue

@@ -17,31 +17,33 @@
 		<qiun-title-bar title="规上工业企业"/>
 	    <view class="block-box display-wrap items-center" style="justify-content: space-evenly;height: 340rpx;">
 			 <view class="block-box-content" style="background-color: #77AFCA;" @click="goScale('规上工业企业')">
-				 <view>规上工业企业</view>
+				 <view class="font-size30">规上工业企业</view>
 				 <view>{{standard_sized_count}}</view>
 			 </view>
 			 <view class="block-box-content" style="background-color: #A5C9D3;">
-				 <view>工业增加值增速</view>
+				 <view class="font-size30">工业增加值增速</view>
 				 <view>同比增长{{standard_sized_increase_ratio}}%</view>
 			 </view>
 			 <view class="block-box-content" style="background-color: #8D7E95;" @click="goScale('先进制造业企业')">
-				 <view>先进制造业</view>
+				 <view class="font-size30">先进制造业</view>
 				 <view>{{advanced_count}}</view>
 			 </view>
 			 <view class="block-box-content" style="background-color: #C1ABBC;">
-				 <view>先进制造业总产值</view>
+				 <view class="font-size30">先进制造业总产值</view>
 				 <view>同比增长{{advanced_increase_ratio}}%</view>
 			 </view>
 		</view>
 		<!-- <qiun-title-bar title="2021年规上工业任务目标"/> -->
 		<view class="title-second">{{dateYear}}年规上工业任务目标</view>
-		<view class="charts-box">
+		<view class="charts-box" style="position: relative;">
 		    <qiun-data-charts type="bar" background="#4C4C4C" :opts="{extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="chartData"/>
+			<view class="pos-font" style="top: 26%;">增速</view>
+			<view class="pos-font" style="top: 64.5%;">总产值</view>
 		</view>
 		<!-- <qiun-title-bar title="先进制造业产值(亿元)"/> -->
 		<view class="title-second">先进制造业产值(亿元)</view>
 		<view class="charts-box">
-		    <qiun-data-charts  type="column" :chartData="chartData1" background="#4C4C4C" :ontouch="true" :opts="{enableScroll: true,xAxis:{scrollShow: true,itemCount:5}}"/>
+		    <qiun-data-charts  type="column" :chartData="chartData1" background="#4C4C4C" :ontouch="true" :opts="{enableScroll: true,xAxis:{scrollShow: true,itemCount:5},yAxis:{splitNumber:3}}"/>
 		</view>
 		<!-- <qiun-title-bar title="工业产值"/> -->
 		<view class="title-second">工业产值</view>
@@ -52,15 +54,15 @@
 		<qiun-title-bar title="工业投资" style="border-top:10rpx solid #f2f2f2" />
 		<view class="block-box display-around items-center">
 			 <view class="block-box-content" style="width:30%;background-color:#F2CD4F;" @click="goProject(0)">
-				 <view>在库项目</view>
+				 <view class="font-size30">在库项目</view>
 				 <view>{{industryData.instore_project_count}}</view>
 			 </view>
 			 <view class="block-box-content" style="width:30%;background-color: #9776F2;" @click="goProject(1)">
-				 <view>技改项目</view>
+				 <view class="font-size30">技改项目</view>
 				 <view>{{industryData.industrial_investment_project_count}}</view>
 			 </view>
 			 <view class="block-box-content" style="width:30%;background-color: #51A9E3;" @click="goProject(2)">
-				 <view>在谈项目</view>
+				 <view class="font-size30">在谈项目</view>
 				 <view>{{industryData.discuss_project_count}}</view>
 			 </view>
 		</view>
@@ -79,22 +81,22 @@
 	    <qiun-title-bar title="重点项目" style="border-top:10rpx solid #f2f2f2" />
 	    <view class="block-box display-around items-center">
 	    	 <view class="block-box-content" style="width:30%;background-color:#F2CD4F;" @click="goImportant(0)">
-	    		 <view>重点项目</view>
+	    		 <view class="font-size30">重点项目</view>
 	    		 <view>{{importantData.importent_project_count}}</view>
 	    	 </view>
 	    	 <view class="block-box-content" style="width:30%;background-color: #9776F2;" @click="goImportant(0)">
-	    		 <view>新建/续建</view>
+	    		 <view class="font-size30">新建/续建</view>
 	    		 <view>{{importantData.new_project_count}}/{{importantData.continue_project_count}}</view>
 	    	 </view>
 	    	 <view class="block-box-content" style="width:30%;background-color: #51A9E3;">
-	    		 <view>总投资(万元)</view>
+	    		 <view class="font-size30">总投资(亿元)</view>
 	    		 <view>{{importantData.investment_count}}</view>
 	    	 </view>
 	    </view>
 	    <!-- <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:{format:'fix0'},extra:{bar:{linearType:'custom',barBorderCircle:true}}}" />
+	        <qiun-data-charts type="bar"  background="#4C4C4C" :chartData="importantData.chartData" :opts="{xAxis:{labelCount:2},extra:{bar:{linearType:'custom',barBorderCircle:true}}}" />
 	    </view>
 	    <!-- <qiun-title-bar title="工业投资额"/> -->
 		<view class="title-second">工业投资额</view>
@@ -105,29 +107,29 @@
 	    <qiun-title-bar title="科技创新指标" style="border-top:10rpx solid #f2f2f2;margin-bottom: 10rpx;" />
 	    <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 class="font-size30">国家高新技术企业</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 class="font-size30">科技型中小企业</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 class="font-size30">累计研发投入规上工业企业</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 class="font-size30">累计研发投入规上服务业企业</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 class="font-size30">累计研发投入占主营业务5%的企业</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 class="font-size30">累计研发投入500万以上的企业</view>
 		   				 <view>{{techData.target.rd_five_million ||'-'}}/<text style="color: red;">{{techData.finish.rd_five_million ||'-'}}</text></view>
 		   </view>
 	   </view>
@@ -162,7 +164,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:[],
 			  arrayNewCity:['规上工业企业数量','工业产值及增速','工业增加值增速','工业投资及增速','工业技改及增速'],
 			  sortSelect:'规上工业企业数量',
 			  standard_sized_count:'',
@@ -170,7 +172,7 @@
 			  advanced_count:'',
 			  advanced_increase_ratio:'',
 			  chartData:{
-				categories: [ "工业增加值增速","先进制造业总产值" ],
+				categories: [ "工业增加值","先进制造业" ],//增速,总产值
 				series: [
 					{   name: "目标任务",
 					    otherData:[],
@@ -302,6 +304,7 @@
 		 }
 	  },
 	  onLoad() {
+		this.makeMonthArr(this.dateYear)  
 	  	this.topChartFn(this.dateYear,this.dateMonth)
 	  },
 	  methods:{
@@ -313,6 +316,19 @@
 			  this.getTechInfo(year,month);
 			  this.getEreaInfos(year,month,1);
 		  },
+		  makeMonthArr(y){
+			  this.arrayMonth = [];
+			  if(y == new Date().getFullYear()){
+				  let length = new Date().getMonth() + 1;
+				  for(let i = 1 ; i <= length; i++){
+					  this.arrayMonth.push(i)
+				  }
+				  this.dateMonth = length;
+			  }else {
+				  this.arrayMonth = ["1", "2","3", "4","5", "6","7", "8","9", "10","11", "12"]
+			  }
+			  this.topChartFn(this.dateYear,this.dateMonth)
+		  },
 		  getStandardChart(y,m){
 			  let md5Sign = md5(
 			    "method=" +
@@ -445,32 +461,47 @@
 			  });
 		  },
 		  industryFilter(data){
-			  let targetData = [],targetData1 = [],finishData = [],finishData1 = [],lineBalanceList = [], lineLast = [];
+			  let targetData = [],targetData1 = [],finishData = [],finishData1 = [],lineBalanceList = [], lineLast = [],storeRatio = '',techRatio = '';
 			  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];
-				   targetData1 = [targetList[0].store_ratio,targetList[0].tech_ratio]
-			  }else{
-					targetData = [0,0];targetData1 = [0,0]
+				   targetList.forEach((item)=>{
+					   if(item.source === '3'){
+							storeRatio = Number(item.increase_ratio) || 0
+					   }
+					   if(item.source === '4'){
+							techRatio = Number(item.increase_ratio) || 0					 
+					   }
+					   if(item.source !== '0'){
+						   targetData.push(Number(item.increase_balance))
+						   targetData1.push(Number(item.increase_ratio))
+					   }
+				   })
 			  }
 			  if(data.finish.length){
 					let finishList = data.finish;
-					finishData = [finishList[0].store_balance,finishList[0].tech_balance];
-					finishData1 = [finishList[0].store_ratio,finishList[0].tech_ratio]
-			  }else{
-			  		finishData = [0,0];finishData1 = [0,0]
+					let dataStoreObj = {
+					   value:Number(finishList[0].store_ratio),
+					   color:Number(finishList[0].store_ratio) > storeRatio ? '#68d889' : '#cc0000'
+					}
+					finishData1.push(dataStoreObj)
+					let dataTechObj = {
+					   value:Number(finishList[0].tech_ratio),
+					   color:Number(finishList[0].tech_ratio) > techRatio ? '#68d889' : '#cc0000'
+					}
+					finishData1.push(dataTechObj)
+					finishData = [Number(finishList[0].store_balance),Number(finishList[0].tech_balance)];
 			  }
 			  for(let key in data.month_list ){
 					 lineBalanceList.push(data.month_list[key].balance)
 					 lineLast.push(data.month_list[key].last_balance)
 			  }
-			  this.industryData.chartData.series[0].data = targetData
-			  this.industryData.chartData.series[0].otherData = targetData1
-			  this.industryData.chartData.series[1].data = finishData
-			  this.industryData.chartData.series[1].otherData = finishData1
+			  this.industryData.chartData.series[0].data = targetData1
+			  this.industryData.chartData.series[0].otherData = targetData
+			  this.industryData.chartData.series[1].data = finishData1
+			  this.industryData.chartData.series[1].otherData = finishData
 			  this.industryData.chartData2.series[0].data = lineBalanceList;
 			  this.industryData.chartData2.series[1].data = lineLast;
 		  },
@@ -515,7 +546,7 @@
 			  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.investment_count = data.investment_count ? (data.investment_count/10000).toFixed(2):0
 			  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 ){
@@ -651,7 +682,8 @@
 		  },
 		  bindDateChange(e){
 			   this.dateYear = e.target.value
-			   this.topChartFn(this.dateYear,this.dateMonth)
+			   this.makeMonthArr(e.target.value);
+			   
 		  },
 		  bindDateMonthChange(e){
 			   this.dateMonth = this.arrayMonth[e.target.value]
@@ -669,7 +701,7 @@
 		  },
 		  goProject(idx){
 			  uni.navigateTo({
-			  	url:'./projectPage/index?idx=' + idx
+			  	url:'./projectPage/index?idx=' + idx + '&year=' + this.dateYear + '&month=' + this.dateMonth
 			  })
 		  },
 		  goImportant(idx){
@@ -717,7 +749,7 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		font-size: 30rpx;
+		font-size: 34rpx;
 		border-radius: 10rpx;
 		width: 45%;
 		height: 140rpx;
@@ -732,4 +764,15 @@
 		font-size: 30rpx;
 		/* font-weight: 550; */
 	}
+	.pos-font {
+		position: absolute;
+		color: rgba(255, 255, 255, 0.8);
+		font-size: 20rpx;
+		text-align: center;
+		width: 110rpx;
+		font-weight: 600;
+	}
+	.font-size30 {
+		font-size: 30rpx;
+	}
 </style>

pages/metrics/largeScale/detail.vue

@@ -42,8 +42,8 @@
 		  </view>
 			<view class="term">
 					<view class="term-name">注册资本:</view>
-					<view class="term-value-group">
-					  <p  class="term-value-item">{{ itemObj.capital || "-" }}万人民币/万美金</p>
+					<view class="term-value-group" v-if="itemObj.capital">
+					  <p  class="term-value-item">{{ itemObj.capital || "-" }} <text v-show ="(itemObj.capital).indexOf('元') =='-1'">{{capitalObjType[itemObj.capital_type]}}</text></p>
 					</view>
 			 </view>
 			 <view class="term">
@@ -118,6 +118,10 @@
 			  totalBalance:'',
 			  totalRatio:'',
 			  itemObj:{},
+			  capitalObjType:{
+				  '0':'万人民币',
+				  '1':'万美金',
+			  },
 			  advancedType:{
 					  '0':'否',
 					  '1':'是'

pages/metrics/projectPage/detail.vue

@@ -142,10 +142,10 @@
 	  },
 	  onLoad(option) {
 		console.log(option)
-		this.getProjectDetail(option.id)
+		this.getProjectDetail(option.id,option.year,option.month)
 	  },
 	  methods:{
-		  getProjectDetail(ids){
+		  getProjectDetail(ids,y,m){
 		  	let md5Sign = md5(
 		  	  "method=" +
 		  	    "stat" +
@@ -168,7 +168,9 @@
 		  	    "content-type": "application/x-www-form-urlencoded",
 		  	  },
 		  	  data: {
-		  		id : ids
+		  		id : ids,
+				year : y,
+				month: m,
 		  	  },
 		  	  success: (res) => {
 		  	    if (res.data.code === 200) {

pages/metrics/projectPage/index.vue

@@ -44,12 +44,16 @@
 	  //       maxMony: "160000（万元）",
 			// id:'1'
 	  //     }),
-		  projectData:[]
+		  projectData:[],
+		  dateYear:'',
+		  dateMonth:''
 	    };
 	  },
 	  onLoad(option) {
 		  this.active = Number(option.idx)
-		  this.getProjectList(this.active)
+		  this.dateYear = option.year
+		  this.dateMonth = option.month
+		  this.getProjectList(this.active,this.dateYear,this.dateMonth)
 	  },
 	  methods: {
 	    enterProjectDeatil(id) {
@@ -57,10 +61,10 @@
 				return
 			}
 	      uni.navigateTo({
-			url:"/pages/metrics/projectPage/detail?id=" + id
+			url:"/pages/metrics/projectPage/detail?id=" + id + '&year=' + this.dateYear + '&month=' + this.dateMonth
 	      });
 	    },
-		getProjectList(tabVal){
+		getProjectList(tabVal,y,m){
 			let tabObj = {
 				0:'在库',
 				1:'技改',
@@ -88,7 +92,9 @@
 			    "content-type": "application/x-www-form-urlencoded",
 			  },
 			  data: {
-				tab : tabObj[tabVal]
+				tab : tabObj[tabVal],
+				year:y,
+				month:m
 			  },
 			  success: (res) => {
 			    if (res.data.code === 200) {
@@ -106,13 +112,13 @@
 	      that.active = idx;
 	      switch (idx) {
 	        case 0:
-	       that.getProjectList(idx);
+	       that.getProjectList(idx,this.dateYear,this.dateMonth);
 	          break;
 	        case 1:
-	       that.getProjectList(idx);
+	       that.getProjectList(idx,this.dateYear,this.dateMonth);
 	          break;
 	        case 2:
-	       that.getProjectList(idx);
+	       that.getProjectList(idx,this.dateYear,this.dateMonth);
 	          break;
 	      }
 	    },