Browse Source

修改细节

wzz 4 years ago
parent
commit
e684668a0f
2 changed files with 20 additions and 9 deletions
  1. 13 2
      pages/metrics/largeScale/detail.vue
  2. 7 7
      pages/metrics/largeScale/index.vue

+ 13 - 2
pages/metrics/largeScale/detail.vue

@@ -109,9 +109,10 @@
 			  dateMonth:new Date().getMonth() + 1,
 			  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": ["1月", "2月","3月", "4月","5月", "6月","7月", "8月","9月", "10月","11月", "12月"],
+				  "categories":[],
 				  "series": [
-						{name: "本年度",data: [15,10,16,23,21,36,25,7,18,29,33,12]},
+						{name: "本年度",data: [],textSize:'10'},
 					]
 			  },
 			  itemObj:{},
@@ -170,6 +171,16 @@
 		      success: (res) => {
 		        if (res.data.code === 200) {
 		           this.itemObj = res.data.data;
+				   let chartList = res.data.data.month_list;
+				   let chartCategories = [], chartData = [];
+				   if(chartList.length){
+					  chartList.forEach((item)=>{
+						   chartCategories.push(item.month + '月')
+						   chartData.push(item.balance)
+					  }) 
+					   this.chartData.categories = chartCategories;
+					   this.chartData.series[0].data = chartData;
+				   }
 		        }
 		      },
 		      fail: () => {

+ 7 - 7
pages/metrics/largeScale/index.vue

@@ -21,7 +21,7 @@
 				<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;">
-		         <view>{{ company.name }}</view>
+		         <view>{{ company.name || '-'}}</view>
 				 <view class="isAdvanced" v-show="company.advanced">先进制造业</view>
 		      </view>
 		    </view>
@@ -29,20 +29,20 @@
 		      <view class="view">
 		        <view class="info_t">亩均排序</view>
 		        <view class="name">
-		          {{ company.representative || 'A'}}
+		          {{ company.aera_order || '-'}}
 		        </view>
 		      </view>
 		      <view class="line"></view>
 		      <view class="view">
 		        <view class="info_t">总产值</view>
-		        {{ company.total_balance }}(亿元)
+		        {{ company.total_balance}}(亿元)
 			<!-- 	 <text v-if="company.capital_type == '1'">美元</text>
 				 <text v-else>人民币</text> -->
 		      </view>
 		      <view class="line"></view>
 		      <view class="view">
 		        <view class="info_t">产值增速</view>
-		        {{ company.total_ratio }}
+		        {{ company.total_ratio}}
 		      </view>
 		    </view>
 		  </view>
@@ -167,14 +167,14 @@
 		    let url =
 		      getApp().globalData.shareUrl +
 		      "api/api.php" +
-		      "?method=stat&action=advanced_company_list &timestamp=" +
+		      "?method=stat&action=advanced_company_list&timestamp=" +
 		      getApp().globalData.globalTimestamp +
 		      "&sign=" +
 		      md5Sign;
 		    let postData = {
 				   year : y,
 				   month: m,
-				   order: sort
+				   order:'area'
 		    };
 		    uni.request({
 		      url: url,
@@ -205,7 +205,7 @@
 		    let url =
 		      getApp().globalData.shareUrl +
 		      "api/api.php" +
-		      "?method=stat&action=advanced_company_list&timestamp=" +
+		      "?method=stat&action=tech_company_list&timestamp=" +
 		      getApp().globalData.globalTimestamp +
 		      "&sign=" +
 		      md5Sign;