update

pages/appeal/index.vue

@@ -135,6 +135,7 @@ export default {
   width: 100%;
   height: 100vh;
   .banner {
+	position: relative;
     height: 25%;
     img {
       width: 100%;
@@ -142,6 +143,9 @@ export default {
     }
   }
   .menus {
+	position: absolute;
+	top: 18%;
+	left: 10%;  
     width: 80%;
     height: 15%;
     justify-content: space-evenly;
@@ -149,7 +153,7 @@ export default {
     margin: 0 auto;
     background-color: #fff;
     border-radius: 25rpx;
-    transform: translateY(-60%);
+    // transform: translateY(-60%);
     box-shadow: 0rpx 10rpx 5rpx rgb(212, 212, 212);
     .menu {
       .desc {
@@ -167,7 +171,8 @@ export default {
     }
   }
   .otherAppealList {
-    transform: translateY(-6%);
+	      margin-top:19%;
+    //transform: translateY(-6%);
   }
 }
 </style>

pages/metrics/importantPage/index.vue

@@ -38,6 +38,8 @@
 	      swiperList: [],
 	      projectList: ["新建", "续建"],
 	      active: 0,
+		  dateYear:'',
+		  dateMonth:'',
 		  projectData:[],
 	      // projectData: new Array(5).fill({
 	      //   title:"普汇中金生命科学国际合作中心",
@@ -47,8 +49,11 @@
 	    };
 	  },
 	  onLoad(option) {
+		  console.log(option)
 		  this.active = Number(option.idx)
-		  this.getProjectList(this.active)
+		  this.dateMonth = option.month;
+		  this.dateYear = option.year;
+		  this.getProjectList(this.active,option.year,option.month)
 	  },
 	  methods: {
 	    enterProjectDeatil(id) {
@@ -56,7 +61,7 @@
 			url:"/pages/metrics/projectPage/detail?id=" + id
 	      });
 	    },
-		getProjectList(tabVal){
+		getProjectList(tabVal,y,m){
 			let tabObj = {
 				0:'新建',
 				1:'续建',
@@ -83,7 +88,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) {
@@ -101,10 +108,10 @@
 	      that.active = idx;
 	      switch (idx) {
 	        case 0:
-	        that.getProjectList(0);
+	        that.getProjectList(0,this.dateYear,this.dateMonth);
 	          break;
 	        case 1:
-	        that.getProjectList(1);
+	        that.getProjectList(1,this.dateYear,this.dateMonth);
 	          break;
 	      }
 	    },

pages/metrics/index.vue

@@ -48,7 +48,7 @@
 		<!-- <qiun-title-bar title="工业产值"/> -->
 		<view class="title-second">工业产值</view>
 		<view class="charts-box">
-		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'},yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10}]}}" :chartData="chartData2"/>
+		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'},yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10,tofix:2}]}}" :chartData="chartData2"/>
 		</view>
 		
 		<qiun-title-bar title="工业投资" style="border-top:10rpx solid #f2f2f2" />
@@ -74,7 +74,7 @@
 		<!-- <qiun-title-bar title="工业投资额"/> -->
 		<view class="title-second">工业投资额</view>
 		<view class="charts-box">
-		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'},yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10}]}}" :chartData="industryData.chartData2"/>
+		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'},yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10,tofix:2}]}}" :chartData="industryData.chartData2"/>
 		</view>
 	
 	
@@ -101,7 +101,7 @@
 	    <!-- <qiun-title-bar title="工业投资额"/> -->
 		<view class="title-second">工业投资额</view>
 		<view class="charts-box">
-		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10}]}}" :chartData="importantData.chartData2"/>
+		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',yAxis:{boundaryGap:'justify',data:[{position:'left',textAlign:'left',fontSize:10,tofix:2}]}}" :chartData="importantData.chartData2"/>
 		</view>
 	
 	    <qiun-title-bar title="科技创新指标" style="border-top:10rpx solid #f2f2f2;margin-bottom: 10rpx;" />
@@ -470,7 +470,7 @@
 					  }else if(companyList.length === 0){
 						  this.companyOpts.enableScroll = false;
 					  }
-					  balanceList = balanceList.map((item)=>{ return (Number(item)/10000).toFixed(2)});
+					 // balanceList = balanceList.map((item)=>{ return (Number(item)/10000).toFixed(2)});
 					 //  res.data.data.month_list.forEach((item)=>{
 						// lineBalanceList.push(item.balance);
 						// lineLast.push(item.last_balance)
@@ -589,7 +589,8 @@
 			  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 ? (data.investment_count/10000).toFixed(2):0
+			  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 = []  
 			  }else{
@@ -763,7 +764,7 @@
 		  },
 		  goImportant(idx){
 			  uni.navigateTo({
-				url:'./importantPage/index?idx=' + idx
+				url:'./importantPage/index?idx=' + idx + '&year=' + this.dateYear + '&month=' + this.dateMonth
 			  })
 		  }
 	  }

pages/metrics/largeScale/detail.vue

@@ -3,7 +3,8 @@
 		<view class="title">
 		  <view class="logo">
 		    <!-- <image :src="globalUrl + company.pic_url" alt="" class="logo-img" mode="aspectFit"/> -->
-			<image src="/static/nodata.svg" alt="" class="logo-img" mode="aspectFit"/>
+			<image v-if="itemObj.logo" :src="itemObj.logo" alt="" class="logo-img" mode="aspectFit"/>
+			<image v-else src="/static/nodata.svg" alt="" class="logo-img" mode="aspectFit"/>
 		  </view>
 		  <view class="name">
 		    {{ itemObj.name || '-'}}
@@ -63,7 +64,7 @@
 			 <view class="term">
 					<view class="term-name">亩均排序:</view>
 					<view class="term-value-group">
-					  <p  class="term-value-item">{{ itemObj.aera_order || "-" }}</p>
+					  <p  class="term-value-item">{{ itemObj.area_order || "-" }}</p>
 					</view>
 			  </view>
 			 <view class="term">
@@ -241,7 +242,7 @@
 	  display: flex;
 	  align-items: center;
 	  .logo {
-	    margin-right: 30rpx;
+	    margin:10rpx 30rpx 0 20rpx;
 	    display: flex;
 	    justify-content: center;
 	    align-items: center;

pages/metrics/largeScale/index.vue

@@ -17,7 +17,8 @@
 			<image src="/static/selfCenter/add-icon.png" mode="aspectFit" class="addIcon" v-if="company.is_new"></image>
 		    <view class="title">
 		      <view class="logo">
-		        <image v-if="company.logo" :src="globalUrl + company.logo" alt="" class="logo-img" mode="aspectFit"/>
+		        <!-- <image v-if="company.logo" :src="globalUrl + company.logo" alt="" class="logo-img" mode="aspectFit"/> -->
+				<image v-if="company.logo" :src="company.logo" alt="" class="logo-img" mode="aspectFit"/>
 				<image v-else src="/static/nodata.svg" alt="" class="logo-img" mode="aspectFit"/>
 		      </view>
 		      <view class="name display-around-column" style="align-items: flex-start;width:65%">