Merge branch 'master' into mock

src/views/gis/business/enterprise/index.vue

@@ -5,27 +5,27 @@
       <FocusContentCom class="one" v-loading="loading.statistic">
         <div class="one-top">
           <img src="@/assets/images/gis-business/enterprise_icon1.png" alt=""/>
-<!--          <StatisticTitleCom title="企业总数" :num="statistic.qy.total" unit="家"/>-->
+          <!--          <StatisticTitleCom title="企业总数" :num="statistic.qy.total" unit="家"/>-->
           <StatisticTitleCom title="企业总数" :num="$store.state.gis.tempStatistic.total" unit="家"/>
         </div>
         <div class="one-bottom">
           <div class="one-bottom-item">
             <div class="chart">
-<!--              <PieSimpleChartCom :num="statistic.qy.lgszyjkscsb" :total="statistic.qy.total" color="#00FFFF"/>-->
+              <!--              <PieSimpleChartCom :num="statistic.qy.lgszyjkscsb" :total="statistic.qy.total" color="#00FFFF"/>-->
               <PieSimpleChartCom :num="$store.state.gis.tempStatistic.lgszyjkscsb" :total="$store.state.gis.tempStatistic.total" color="#00FFFF"/>
             </div>
             <div class="text">零关税自用<br/>进口生产设备</div>
           </div>
           <div class="one-bottom-item">
             <div class="chart">
-<!--              <PieSimpleChartCom :num="statistic.qy.jgzzmgs" :total="statistic.qy.total" color="#FFCC8F"/>-->
+              <!--              <PieSimpleChartCom :num="statistic.qy.jgzzmgs" :total="statistic.qy.total" color="#FFCC8F"/>-->
               <PieSimpleChartCom :num="$store.state.gis.tempStatistic.jgzzmgs" :total="$store.state.gis.tempStatistic.total" color="#FFCC8F"/>
             </div>
             <div class="text">加工增值免关税</div>
           </div>
           <div class="one-bottom-item">
             <div class="chart">
-<!--              <PieSimpleChartCom :num="statistic.qy.lgsjkyfl" :total="statistic.qy.total" color="#EB90FF"/>-->
+              <!--              <PieSimpleChartCom :num="statistic.qy.lgsjkyfl" :total="statistic.qy.total" color="#EB90FF"/>-->
               <PieSimpleChartCom :num="$store.state.gis.tempStatistic.lgsjkyfl" :total="$store.state.gis.tempStatistic.total" color="#EB90FF"/>
             </div>
             <div class="text">零关税进口<br/>原辅料</div>