修改

dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue

@@ -164,9 +164,9 @@ export default {
             list.push(item);
           }
           this.data=list;
-          if(list.length > 0){
+          // if(list.length > 0){
             this.initChart()
-          }
+          // }
         }
       })
     },

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -7,57 +7,57 @@
           <div class="item-title"><i style="background: #4E8EFF;"></i>{{recentlyYear.year}}年GDP</div>
           <div class="item-count">
             <span>{{recentlyYear.gdp}}</span>亿
-            <img v-if="Number(getMoneyNum(recentlyYear.gdpGrowth)) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.gdpCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsGDP" style="height: 75px;"></div>
-          <div class="item-text up" v-if="Number(recentlyYear.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowth}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowth).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.gdpCompare) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpCompare}}亿</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpCompare).toString().substring(1)}}亿</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #718AFF;"></i>{{recentlyYear.year}}年GDP增速</div>
           <div class="item-count">
             <span>{{recentlyYear.gdpGrowth}}</span>%
-            <img v-if="(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.gdpGrowthCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsZS" style="height: 75px;"></div>
-          <div class="item-text up" v-if="(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowthCompare).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.gdpGrowthCompare) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowthCompare).toString().substring(1)}}%</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div>
           <div class="item-count">
             <span>{{recentlyYear.population}}</span>万
-            <img v-if="Number(getMoneyNum(recentlyYear.populationGrowthRate)) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.populationCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsRK" style="height: 75px;"></div>
-          <div class="item-text up" v-if="Number(recentlyYear.populationGrowthRate) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationGrowthRate}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.populationGrowthRate).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.populationCompare) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationCompare}}万</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.populationCompare).toString().substring(1)}}万</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #FFBE5D;"></i>{{recentlyYear.year}}年一般公共预算收入</div>
           <div class="item-count">
             <span>{{recentlyYear.gbr}}</span>亿
-            <img v-if="Number(getMoneyNum(recentlyYear.gbrGrowth)) > 0" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.gbrCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsSR" style="height: 75px;"></div>
-          <div class="item-text up" v-if="Number(recentlyYear.gbrGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrGrowth}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrGrowth).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.gbrCompare) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrCompare}}亿</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrCompare).toString().substring(1)}}亿</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #FF8935;"></i>{{recentlyYear.year}}年地方政府债务余额</div>
           <div class="item-count">
             <span>{{recentlyYear.govDebtBalance}}</span>亿
-            <img v-if="Number(getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))" src="@/assets/images/economies/icon_up.png">
+            <img v-if="Number(recentlyYear.govDebtBalanceCompare) > 0" src="@/assets/images/economies/icon_up.png">
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsYE" style="height: 75px;"></div>
-          <div class="item-text up" v-if="Number(getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))">
-            较{{nextYearMap.year}}年上升<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
+          <div class="item-text up" v-if="Number(recentlyYear.govDebtBalanceCompare) > 0">
+            较{{nextYearMap.year}}年上升<span>{{recentlyYear.govDebtBalanceCompare}}亿</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.govDebtBalanceCompare).toString().substring(1)}}亿</span></div>
         </div>
       </div>
     </div>