修改

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

@@ -123,8 +123,8 @@ export default {
           label: 'GDP（亿元）',
         },
         {
-          prop: 'gdpAddValue',
-          label: 'GDP增速',
+          prop: 'gdpGrowth',
+          label: 'GDP增速（%）',
         },
         {
           prop: 'gdpPerCapita',

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

@@ -30,7 +30,7 @@
               <!--{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}-->
             <!--</template>-->
             <template slot-scope="scope">
-              <span @click="childMethod(scope.row)" class="a-link" style="cursor: pointer;">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</span>
+              <span @click="childMethod(scope.row)" class="a-link" style="cursor: pointer;">{{scope.row.area ? scope.row.area: scope.row.city ? scope.row.city : scope.row.province}}</span>
             </template>
 
           </el-table-column>

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

@@ -124,8 +124,8 @@ export default {
           label: 'GDP（亿元）',
         },
         {
-          prop: 'gdpAddValue',
-          label: 'GDP增速',
+          prop: 'gdpGrowth',
+          label: 'GDP增速（%）',
         },
         {
           prop: 'gdpPerCapita',

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

@@ -66,7 +66,8 @@ export default {
     //   params.provinceId=this.dataQuery.provinceId
     // }
     if(this.dataQuery.provinceId){
-      this.province=this.dataQuery.province[this.dataQuery.province.length-1];
+      this.province=this.dataQuery.province;
+      this.dataQuery.province=[this.dataQuery.province]
       this.provinceId.push(this.dataQuery.provinceId)
     }else {
       location({}).then(res => {

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

@@ -53,10 +53,20 @@
           <el-table-column label="四库业绩" prop="skyCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="公路业绩" prop="roadConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
           <el-table-column label="水利业绩" prop="waterConservancy" sortable="custom" width="100" :formatter="formatStatus"/>
-          <el-table-column label="常合作业主" prop="topCustomer" width="150" :formatter="formatStatus"/>
+          <el-table-column label="常合作业主" prop="topCustomer" width="150" :formatter="formatStatus">
+            <template slot-scope="scope">
+              <router-link v-if="scope.row.topCustomerId"  :to="`/company/${encodeStr(scope.row.topCustomerId)}`" tag="a" class="a-link" v-html="scope.row.topCustomer" ></router-link>
+              <span v-else v-html="scope.row.topCustomer" ></span>
+            </template>
+          </el-table-column>
           <el-table-column label="客户（个）" prop="customerCount" sortable="custom" width="120" :formatter="formatStatus"/>
           <el-table-column label="供应商（个）" prop="supplierCount" sortable="custom" width="150" :formatter="formatStatus"/>
-          <el-table-column label="常合作供应商" prop="topSupplier" width="200" :formatter="formatStatus"/>
+          <el-table-column label="常合作供应商" prop="topSupplier" width="200" :formatter="formatStatus">
+            <template slot-scope="scope">
+              <router-link v-if="scope.row.topSupplierId"  :to="`/company/${encodeStr(scope.row.topSupplierId)}`" tag="a" class="a-link" v-html="scope.row.topSupplier" ></router-link>
+              <span v-else v-html="scope.row.topSupplier" ></span>
+            </template>
+          </el-table-column>
         </el-table>
         <div class="empty" v-if="tableDataTotal === 0">
           <img class="img" src="@/assets/images/project/empty.png">

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

@@ -681,7 +681,7 @@ export default {
             position: absolute;
             top: 25px;
             left: 0;
-            z-index: 9999;
+            z-index: 999;
             .item{
               margin-bottom: 5px;
               /*display: flex;*/