修改

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

@@ -20,7 +20,7 @@
         <div id="echarts"  style="height: 400px"></div>
         <p class="tips">  注：数据均来源于统计公报、统计年鉴，实际披露中由于部分地区最新年度数据不全，导致年份间数据差距较大</p>
       </div>
-      <div class="content-right">
+      <div class="content-right table-item">
         <el-table
           v-loading="tableLoading"
           :data="tableData"
@@ -296,6 +296,24 @@ export default {
           .caret-wrapper{
             width: 10px;
           }
+          .has-gutter{
+            tr{
+              th:nth-child(4){
+                border-right:0;
+                .cell{
+                  padding-right: 24px !important;
+                }
+              }
+              td:nth-child(6){
+                border-right:0;
+              }
+            }
+          }
+          .el-table__cell.gutter{
+            background: #F5F7FA;
+            width: 16px !important;
+            border-top: 1px solid #dfe6ec;
+          }
         }
       }
     }

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

@@ -11,8 +11,8 @@
             <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="recentlyYear.gdpGrowth > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowth}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowth).toString().substring(1)}}%</span></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>
         <div class="item">
           <div class="item-title"><i style="background: #718AFF;"></i>{{recentlyYear.year}}年GDP增速</div>
@@ -22,8 +22,8 @@
             <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="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.gdpGrowthCompare}}%</span></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>
         <div class="item">
           <div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div>
@@ -33,8 +33,8 @@
             <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="recentlyYear.populationGrowthRate > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationGrowthRate}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.populationGrowthRate}}%</span></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>
         <div class="item">
           <div class="item-title"><i style="background: #FFBE5D;"></i>{{recentlyYear.year}}年一般公共预算收入</div>
@@ -44,8 +44,8 @@
             <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="recentlyYear.gbrGrowth > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrGrowth}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrGrowth).toString().substring(1)}}%</span></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>
         <div class="item">
           <div class="item-title"><i style="background: #FF8935;"></i>{{recentlyYear.year}}年地方政府债务余额</div>
@@ -55,7 +55,7 @@
             <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="recentlyYear.govDebtBalance > nextYearMap.govDebtBalance">
+          <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>

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

@@ -431,7 +431,7 @@ export default {
       display: flex;
       justify-content: space-between;
       .box-left{
-        width: 55%;
+        width: 50%;
       }
       .empty{
         margin: 0 auto;
@@ -509,6 +509,9 @@ export default {
             padding: 0;
             line-height: 40px;
           }
+          .el-table__body tr:hover > td.el-table__cell{
+            background: #DCEBFF;
+          }
           ::-webkit-scrollbar-track-piece {
             //滚动条凹槽的颜色，还可以设置边框属性
             background-color: #F3F4F5;
@@ -538,6 +541,9 @@ export default {
               th:nth-child(4){
                 border-right:0;
               }
+              td:nth-child(4){
+                border-right:0;
+              }
             }
           }
           .el-table__cell.gutter{

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

@@ -6,7 +6,7 @@
           <span class="common-title">全国经济大全</span>
           <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
             <el-form-item prop="year">
-              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="handleSearch">
+              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="handleSearch" :popper-append-to-body='false'>
                 <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
               </el-select>
             </el-form-item>
@@ -322,6 +322,7 @@
 </script>
 
 <style lang="scss" scoped>
+
   .qgjjdq{
     .query-box{
       margin: -8px 0 8px 0;
@@ -346,6 +347,11 @@
         }
       }
     }
+    ::v-deep .el-select-dropdown{
+      .el-select-dropdown__item.hover{
+        color: #0081FF;
+      }
+    }
     .content{
       background: #ffffff;
       padding: 16px;