修改

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

@@ -700,7 +700,7 @@ export default {
         .item{
           width: 19%;
           .item-title{
-            font-size: 13px;
+            font-size: 12px;
             color: rgba(35,35,35,0.8);
             i{
               width: 2px;
@@ -750,7 +750,7 @@ export default {
           border-right: 1px solid #E4E4E4;
           display: inline-block;
           color: rgba(35,35,35,0.8);
-          font-size: 13px;
+          font-size: 12px;
           padding-left: 16px;
           width: 20%;
           line-height: 26px;
@@ -773,7 +773,7 @@ export default {
             font-style: normal;
             margin-left: 4px;
             font-weight: 400;
-            font-size: 13px;
+            font-size: 12px;
           }
         }
         span:last-child{

dsk-operate-ui/src/views/macro/enterprises/index.vue

@@ -50,9 +50,9 @@
           <!--<el-table-column label="最大中标金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
           <!--<el-table-column label="中标总金额（万元）" prop="cgfs" sortable="custom" width="160" :formatter="formatStatus"/>-->
           <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
-          <!--<el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
-          <!--<el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>-->
-          <!--<el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>-->
+          <el-table-column label="公路业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="水利业绩" prop="cgfs" sortable="custom" width="100" :formatter="formatStatus"/>
+          <el-table-column label="常合作业主" prop="cgfs" width="130" :formatter="formatStatus"/>
           <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="130" :formatter="formatStatus"/>
           <!--<el-table-column label="常合作供应商" prop="gys" width="120" :formatter="formatStatus"/>-->
@@ -101,7 +101,7 @@ export default {
       tableData: [],
       tableLoading: false,
       pageIndex: 1,
-      pageSize: 10,
+      pageSize: 20,
       tableDataTotal: null,
       aptitudeCodeList:[],
       aptitudeType:'',

dsk-operate-ui/src/views/macro/financing/details.vue

@@ -11,28 +11,28 @@
         <div class="list">
           <div class="item color1">
             <div class="item-left">
-              <h4>{{details.projectTotalInvestment || '-'}}<span>{{details.projectTotalInvestment ? '亿' : ''}}</span></h4>
+              <h4>{{details.projectTotalInvestment || '-'}}<span>{{details.projectTotalInvestment ? '万' : ''}}</span></h4>
               <p>项目总投资额</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon1.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>{{details.projectCapital || '-'}}<span>{{details.projectCapital ? '亿' : ''}}</span></h4>
+              <h4>{{details.projectCapital || '-'}}<span>{{details.projectCapital ? '万' : ''}}</span></h4>
               <p>项目资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon2.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>{{details.specialBondFinancing || '-'}}<span>{{details.specialBondFinancing ? '亿' : ''}}</span></h4>
+              <h4>{{details.specialBondFinancing || '-'}}<span>{{details.specialBondFinancing ? '万' : ''}}</span></h4>
               <p>专项债融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon3.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '亿' : ''}}</span></h4>
+              <h4>{{details.specialBondCapital || '-'}}<span>{{details.specialBondCapital ? '万' : ''}}</span></h4>
               <p>专项债用作资本金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon4.png" />
@@ -41,28 +41,28 @@
         <div class="list">
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.otherFunds || '-'}}<span>{{details.otherFunds ? '亿' : ''}}</span></h4>
+              <h4>{{details.otherFunds || '-'}}<span>{{details.otherFunds ? '万' : ''}}</span></h4>
               <p>其他资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon5.png" />
           </div>
           <div class="item color3">
             <div class="item-left">
-              <h4>{{details.specialBondFinancingAmount || '-'}}<span>{{details.specialBondFinancingAmount ? '亿' : ''}} / {{details.specialBondIssueNumber || '-'}}{{details.specialBondIssueNumber ? '只' : ''}}</span></h4>
+              <h4>{{details.specialBondFinancingAmount || '-'}}<span>{{details.specialBondFinancingAmount ? '万' : ''}} / {{details.specialBondIssueNumber || '-'}}{{details.specialBondIssueNumber ? '只' : ''}}</span></h4>
               <p>专项债融资额/专项债只数</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon6.png" />
           </div>
           <div class="item color4">
             <div class="item-left">
-              <h4>{{details.otherFinancing || '-'}}<span>{{details.otherFinancing ? '亿' : ''}}</span></h4>
+              <h4>{{details.otherFinancing || '-'}}<span>{{details.otherFinancing ? '万' : ''}}</span></h4>
               <p>其他融资</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon7.png" />
           </div>
           <div class="item color2">
             <div class="item-left">
-              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '亿' : ''}}</span></h4>
+              <h4>{{details.govSupportFunds || '-'}}<span>{{details.govSupportFunds ? '万' : ''}}</span></h4>
               <p>政府安排资金</p>
             </div>
             <img class="img" src="@/assets/images/financing/icon8.png" />
@@ -95,7 +95,7 @@
         </p>
         <p>
           <label class="label">项目预测总收益</label>
-          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '亿' : ''}}</span>
+          <span>{{details.projectForecastTotalRevenue || '-'}}{{details.projectForecastTotalRevenue ? '万' : ''}}</span>
         </p>
       </div>
     </div>
@@ -130,8 +130,8 @@
               {{formatDate(scope.row.tenderDate)}}
             </template>
           </el-table-column>
-          <el-table-column prop="actualBondIssueScale" label="专项债规模（亿）"  width="260" />
-          <el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
+          <el-table-column prop="actualBondIssueScale" label="专项债规模（万）"  width="260" />
+          <el-table-column prop="isUsedProjectScale" label="用于项目规模(万)" width="260" />
           <el-table-column prop="isUsedCapital" label="是否资本金" width="200" />
         </el-table>
       </div>

dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue

@@ -39,7 +39,7 @@
           highlight-current-row
           v-if="tableDataTotal > 0"
         >
-          <el-table-column label="序号" width="50" align="left" fixed>
+          <el-table-column label="序号" width="60" align="left" fixed>
             <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
           </el-table-column>
           <el-table-column label="地区" min-width="150" align="left" fixed>
@@ -56,12 +56,12 @@
           <el-table-column label="GDP增速（%）" prop="gdpGrowth" :formatter="formatStatus" sortable="custom" min-width="120" align="right"></el-table-column>
           <el-table-column label="人均GDP（元）" prop="gdpPerCapita" :formatter="formatStatus" sortable="custom" width="125" align="right"></el-table-column>
           <el-table-column label="人口（万人）" prop="population" :formatter="formatStatus" sortable="custom" width="120" align="right"></el-table-column>
-          <el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" width="170" align="right"></el-table-column>
+          <el-table-column label="一般公共预算收入（亿元）" prop="gbr" sortable="custom" :formatter="formatStatus" width="170" align="right"></el-table-column>
           <el-table-column label="一般公共预算收入增速（%）" prop="gbrGrowth" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
           <el-table-column label="一般公共预算收入：税收收入（亿元）" prop="taxIncome" :formatter="formatStatus" sortable="custom" min-width="140" align="right"></el-table-column>
           <el-table-column label="一般公共预算支出（亿元）" prop="gbe" :formatter="formatStatus" sortable="custom" width="140" align="right"></el-table-column>
           <el-table-column label="政府性基金收入（亿元）" width="140" prop="govFundIncome" :formatter="formatStatus" sortable="custom" align="right"></el-table-column>
-          <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" width="150" align="right"></el-table-column>
+          <el-table-column label="政府性基金收入：土地出让收入（亿元）" prop="landTransferIncome" sortable="custom" :formatter="formatStatus" width="150" align="right"></el-table-column>
           <el-table-column label="政府性基金支出（亿元）" prop="govFundExpenditure" :formatter="formatStatus" width="170" sortable="custom" align="right"></el-table-column>
           <el-table-column label="国有资本经营收入（亿元）" prop="soecoi" width="160" :formatter="formatStatus" align="right"></el-table-column>
           <el-table-column label="国有资本经营支出（亿元）" prop="soecoe" width="160" :formatter="formatStatus" align="right"></el-table-column>
@@ -137,7 +137,7 @@
         tableData: [],
         tableLoading: false,
         pageIndex: 1,
-        pageSize: 10,
+        pageSize: 20,
         tableDataTotal: null,
       }
     },

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue

@@ -80,7 +80,7 @@
           <span class="common-title">全国招标项目概览</span>
         </div>
       </div>
-      <div class="text">通过对{{year}}年全国招标数据进行分析，发现该企业主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
+      <div class="text">通过对{{year}}年全国招标数据进行分析，发现主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
       <div class="main1">
         <div id="gl-echarts" style="height: 250px"></div>
         <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为{{year}}年全国公开的招标项目，未公开的不含在内</p>