修改问题

pages/metrics/importantPage/index.vue

@@ -21,7 +21,7 @@
 				</view>
 				<view class="display-flex-start pos-class" style="margin-bottom: 20rpx;">
 					<view class="left-title">总投资</view>
-					<view>{{item.investment_count}}</view>
+					<view>{{item.investment_count}}(万元)</view>
 				</view>
 			</view>
 		</view>
@@ -87,7 +87,8 @@
 			  },
 			  success: (res) => {
 			    if (res.data.code === 200) {
-		             this.projectData = res.data.data 
+		             this.projectData = res.data.data;
+					 this.$forceUpdate();
 			    }
 			  },
 			  fail: () => {

pages/metrics/index.vue

@@ -34,7 +34,7 @@
 			 </view>
 		</view>
 		<!-- <qiun-title-bar title="2021年规上工业任务目标"/> -->
-		<view class="title-second">2021年规上工业任务目标</view>
+		<view class="title-second">{{dateYear}}年规上工业任务目标</view>
 		<view class="charts-box">
 		    <qiun-data-charts type="bar"   background="#4C4C4C" :opts="{extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="chartData"/>
 		</view>
@@ -97,7 +97,7 @@
 	        <qiun-data-charts type="bar"   background="#4C4C4C" :opts="{extra:{bar:{linearType:'custom',barBorderCircle:true}}}" :chartData="importantData.chartData"/>
 	    </view>
 	    <!-- <qiun-title-bar title="工业投资额"/> -->
-		<view class="title-second">重点项目级别分布</view>
+		<view class="title-second">工业投资额</view>
 		<view class="charts-box">
 		  <qiun-data-charts type="demotype" :opts="{fontColor:'#666',xAxis:{boundaryGap:'justify'}}" :chartData="importantData.chartData2"/>
 		</view>
@@ -170,7 +170,7 @@
 			  advanced_count:'',
 			  advanced_increase_ratio:'',
 			  chartData:{
-				categories: ["工业增加值增速", "先进制造业总产值"],
+				categories: [ "先进制造业总产值" ,"工业增加值增速"],
 				series: [
 					{   name: "目标任务",
 					    otherData:[],
@@ -264,7 +264,7 @@
 					  "categories": [],
 					  "series": [
 							{
-								"name": "各新城规上工业企业数量",
+								"name":'',
 								"data": [],
 							}
 						]
@@ -403,7 +403,7 @@
 				  if (res.data.code === 200) {
 					  let categoriesList = [],balanceList = [],lineBalanceList = [], lineLast = [];
 					  res.data.data.company_list.forEach((item)=>{
-						categoriesList.push(item.name);
+						categoriesList.push(item.short_name);
 						balanceList.push(item.balance)
 					  })
 					 //  res.data.data.month_list.forEach((item)=>{
@@ -588,9 +588,10 @@
 			  }
 			  this.ereaData.chartDataBar.categories = categoriesList;
 			  this.ereaData.chartDataPie.categories = categoriesList;
+			  this.ereaData.chartDataBar.series[0].name =  "各新城" + this.sortSelect;
 			  this.ereaData.chartDataBar.series[0].data = barData;
 			  pieData.forEach((item)=>{item.value = Number(item.value)})
-			  this.ereaData.chartDataPie.series[0].data = pieData;
+			  this.ereaData.chartDataPie.series[0].data =pieData.filter((item)=>{return item.name !== '西咸新区'});
 		  },
 		  getEreaInfos(y,m,select){
 			  let md5Sign = md5(

pages/metrics/largeScale/detail.vue

@@ -22,7 +22,7 @@
 				</view>
 			</view>
 		</view>
-		<qiun-title-bar title="工业产值(亿元)"/>
+		<qiun-title-bar title="工业产值(万元)"/>
 		<view class="charts-box">
 		    <qiun-data-charts  type="line"  :chartData="chartData" background="#4C4C4C"/>
 		</view>
@@ -69,7 +69,7 @@
 			 <view class="term">
 					<view class="term-name">规上评定时间:</view>
 					<view class="term-value-group">
-					  <p  class="term-value-item">{{ itemObj.advanced_update_time || "-" }}</p>
+					  <p  class="term-value-item">{{ itemObj.standard_sized_date || "-" }}</p>
 					</view>
 			  </view>
 			<view class="term">

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 !== '0'">先进制造业</view>
+				 <view class="isAdvanced" v-show="company.advanced && company.advanced !== '0'">先进制造业</view>
 		      </view>
 		    </view>
 		    <view class="info">
@@ -90,7 +90,6 @@
 	  },
 	  methods:{
 		  bindSortChange(e){
-			  console.log(e)
 			  let sortObj = {
 				  '0' : '',
 				  '1' : 'total_balance desc',
@@ -148,6 +147,9 @@
 		      success: (res) => {
 		        if (res.data.code === 200) {
 		          this.companyList = res.data.data;
+				  if(sort === 'area'){
+					 this.companyList.reverse(); 
+				  }
 		        }
 		      },
 		      fail: () => {

pages/metrics/projectPage/index.vue

@@ -13,15 +13,15 @@
 			:class="{ borderBottom: idx == projectData.length - 1 }" @click="enterProjectDeatil(item.id)">
 				<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>
+					<image v-show="item.importent === '1'" src="/static/important_icon.png" mode="aspectFit" style="width:80rpx;height: 80rpx;"></image>
 				</view>
 				<view class="display-flex-start pos-class">
 					<view class="left-title">业主名称</view>
 					<view>{{item.owner}}</view>
 				</view>
-				<view class="display-flex-start pos-class" style="margin-bottom: 20rpx;">
+				<view class="display-flex-start pos-class" style="margin-bottom: 20rpx;" v-show="active !== 2">
 					<view class="left-title">总投资</view>
-					<view>{{item.investment_count || '-'}}</view>
+					<view>{{item.investment_count || '-'}}(万元)</view>
 				</view>
 			</view>
 		</view>
@@ -93,6 +93,7 @@
 			  success: (res) => {
 			    if (res.data.code === 200) {
                        this.projectData = res.data.data
+					   this.$forceUpdate();
 			    }
 			  },
 			  fail: () => {

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

@@ -58,6 +58,7 @@ const cfu = {
     "yAxisDemo2":function(val){return val.toFixed(2)},
 	"fix1":function(val,index,opts,series){return series.otherData[index] + '%'},
     "xAxisDemo1":function(val){return val+'年'},
+	"fix0":function(val){return val.toFixed(0)},
     "xAxisDemo2":function(val){return formatDateTime(val,'h:m')},
     "seriesDemo1":function(val){return val+'元'},
     "tooltipDemo1":function(item, category, index, opts){
@@ -344,7 +345,7 @@ const cfu = {
       "boundaryGap":"justify",
       "disableGrid":false,
       "min":0,
-      "axisLine":false
+      "axisLine":false,
   	},
   	"yAxis": {
 		"data": [