修改

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

@@ -100,14 +100,15 @@
                 <div class="main">
                   <div class="amount">
                     <p>
-                      <span>产值目标(万元)</span>
                       <span>实际已完成(万元)</span>
+                      <span>产值目标(万元)</span>
                     </p>
                     <p>
                       <span class="money">359,800.00</span>
                       <span class="money">359,800.00</span>
                     </p>
-                    <el-progress :text-inside="true" :stroke-width="14" :percentage="70"></el-progress>
+                    <el-progress class="progress1" :text-inside="true" :stroke-width="14" :percentage="40"></el-progress>
+                    <el-progress class="progress2" :text-inside="true" :stroke-width="14" :percentage="70"></el-progress>
                   </div>
                   <div style="background: #ffffff;margin: 0 12px 12px 12px;">
                     <div id="pm-echarts" style="height: 288px;"></div>
@@ -911,8 +912,9 @@ export default {
         series: [
           {
             // realtimeSort: true,
-            name:'目标产值',
+            name:'已完成产值',
             data: this.pmData.map(item => item.value),
+            barGap: 0,
             type: 'bar',
             // stack: 'total',
             // emphasis: {
@@ -922,22 +924,23 @@ export default {
               color: '#14C9C9',
               barBorderRadius:[0, 20, 20, 0]
             },
-            barWidth: 16,
+            barWidth: 8,
           },
           {
             // realtimeSort: true,
-            name:'已完成产值',
+            name:'目标产值',
             data: this.pmData.map(item => item.value1),
+            barGap: 0,
             type: 'bar',
             // stack: 'total',
             // emphasis: {
             //   focus: 'series'
             // },
             itemStyle:{
-              color: '#C3F6F6',
+              color: '#92C9FF',
               barBorderRadius:[0, 20, 20, 0]
             },
-            barWidth: 16,
+            barWidth: 8,
           },
         ],
       }
@@ -1159,18 +1162,42 @@ export default {
               font-size: 14px;
             }
             .money{
-              font-weight: 700;
+              font-weight: bold;
               color: #184280;
               font-size: 18px;
-              margin-top: 8px;
+              margin-top: 2px;
+            }
+            .money:first-child{
+              color:#48C5A0;
+            }
+            .money:last-child{
+              color:#60B0FD;
+            }
+            .progress1{
+              height: 10px !important;
+              ::v-deep .el-progress-bar__outer{
+                .el-progress-bar__inner{
+                  background:#9AEAD3
+                }
+              }
+            }
+            .progress2{
+              height: 10px !important;
+              ::v-deep .el-progress-bar__outer{
+                .el-progress-bar__inner{
+                  background:#92C9FF
+                }
+              }
             }
             ::v-deep .el-progress-bar__outer{
-              border: 1px solid #A2E8E8;
-              background-color:#ffffff !important;
-              border-radius: 20px;
+              /*border: 1px solid #A2E8E8;*/
+              /*background-color:#ffffff !important;*/
+              height: 10px !important;
+              background-color: rgba(235, 238, 245, 0%) !important;
+              border-radius:0 20px 20px 0;
               .el-progress-bar__inner{
-                background: linear-gradient(-270deg, #C3F6F6 0%, #14C9C9 100%);
-                border-radius: 20px;
+                /*<!--background: linear-gradient(-270deg, #C3F6F6 0%, #14C9C9 100%);-->*/
+                border-radius:0 20px 20px 0;
                 .el-progress-bar__innerText{
                   color: #ffffff;
                   opacity: 0;

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

@@ -39,7 +39,7 @@
             <el-table-column prop="rate" label="占比（%）"> </el-table-column>
           </el-table-column>
           <el-table-column :label="twoYear">
-            <el-table-column prop="lastMoney" label="金额（亿元）"> </el-table-column>
+            <el-table-column prop="lastMoney" label="金额（亿元）" sortable> </el-table-column>
             <el-table-column prop="lastRate" label="占比（%）" > </el-table-column>
           </el-table-column>
         </el-table>

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

@@ -70,7 +70,7 @@ export default {
       tableData:[],
       tableLoading: false,
       pageIndex: 1,
-      pageSize: 10,
+      pageSize: 20,
       tableDataTotal: 0,
     }
   },

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

@@ -183,7 +183,7 @@
           <el-table-column prop="uipBusinessType" label="城投业务类型" :formatter="formatStatus" width="140" >
             <template slot="header" slot-scope="scope">
               <span>城投业务类型
-                <el-tooltip popper-class="tips" effect="light" content="   根据主营业务构成划分为土地开发整理、基础设施建设、交通建设运营、棚改保障房建设、公用事业等8大类型。" placement="top">
+                <el-tooltip popper-class="tips" effect="light" content="   根据主营业务构成划分为土地开发整理、基础设施建设、交通建设运营、棚改保障房建设、公用事业等7大类型。" placement="top">
                   <i class="el-icon-warning-outline"></i>
                 </el-tooltip>
               </span>