Merge branch 'V20230915' of http://192.168.60.201/root/dsk-operate-sys into V20230915

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

@@ -18,7 +18,7 @@
             </div>
           </div>
           <skeleton v-if="isSkeleton"></skeleton>
-          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="tableData.total > 10 ? 'hover' : '1'" max-height="640"
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table" v-horizontal-scroll="tableData.total > 10 ? 'hover' : 'false'" max-height="640"
             :data="tableData.rows"
             stripe border
             style="width: 100%">

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

@@ -981,7 +981,7 @@ export default {
     initChart1(list){
       let data=[]
       let arr=list.sort(function(a, b) {
-        return b.count - a.count;
+        return b.money - a.money;
       });
       if(arr.length > 10){
         for(var i=0;i<10;i++){

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

@@ -22,7 +22,7 @@
           v-loading="tableLoading"
           :data="tableData"
           border
-          v-horizontal-scroll="'hover'"
+          v-horizontal-scroll="tableData.total > 15 ? 'hover' : 'false'"
           highlight-current-row
           @sort-change="sortChange"
           :default-sort = "{prop: 'gdp', order: 'descending'}"

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

@@ -392,7 +392,8 @@ export default {
           },
           grid: {
             top:20,
-            // right:15,
+            left:5,
+            right:60,
             bottom:5,
           },
           series: [
@@ -408,7 +409,7 @@ export default {
                 show: this.valData[1] ? true : false,
                 position: 'top',
                 textStyle: {
-                  padding: [0, 0, 0, -12]
+                  padding: [0, 0, 0, 55]
                 }
               },
               //设置折线颜色和粗细
@@ -432,7 +433,7 @@ export default {
                   },
                 ]),
               },
-            }
+            },
           ]
         }
         myChart.setOption(option);
@@ -460,6 +461,8 @@ export default {
           },
           grid: {
             top:20,
+            left:5,
+            right:60,
             bottom:5,
           },
           series: [
@@ -475,7 +478,7 @@ export default {
                 show: this.valData1[1] ? true : false,
                 position: 'top',
                 textStyle: {
-                  padding: [0, 0, 0, -35]
+                  padding: [0, 0, 0, 15]
                 }
               },
               itemStyle:{
@@ -527,6 +530,8 @@ export default {
           },
           grid: {
             top:20,
+            left:5,
+            right:60,
             bottom:5,
           },
           series: [
@@ -542,7 +547,7 @@ export default {
                 show: this.valData2[1] ? true : false,
                 position: 'top',
                 textStyle: {
-                  padding: [0, 0, 0, -16]
+                  padding: [0, 0, 0, 35]
                 }
               },
               //设置折线颜色和粗细
@@ -594,6 +599,8 @@ export default {
           },
           grid: {
             top:20,
+            left:5,
+            right:60,
             bottom:5,
           },
           series: [
@@ -609,7 +616,7 @@ export default {
                 show: this.valData3[1] ? true : false,
                 position: 'top',
                 textStyle: {
-                  padding: [0, 0, 0, -16]
+                  padding: [0, 0, 0, 35]
                 }
               },
               //设置折线颜色和粗细
@@ -661,7 +668,8 @@ export default {
           },
           grid: {
             top:20,
-            // left:5,
+            left:5,
+            right:60,
             bottom:5,
           },
           series: [
@@ -677,7 +685,7 @@ export default {
                 show: this.valData4[1] ? true : false,
                 position: 'top',
                 textStyle: {
-                  padding: [0, 0, 0, -14]
+                  padding: [0, 0, 0, 40]
                 }
               },
               //设置折线颜色和粗细

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

@@ -312,17 +312,16 @@
       this.dataRegion()
       this.yearsData()
       this.getCountBidByType()
-      this.getCountBidGroupByProvince()
-      this.getRangeBidMoney()
-      this.getRangeBidFiveYears()
-      this.getLowerRateByYear()
-      this.getLowerRangeTenderType()
       setTimeout(() => {
 
       }, 1000);
     },
     mounted() {
-
+      this.getCountBidGroupByProvince()
+      this.getRangeBidMoney()
+      this.getRangeBidFiveYears()
+      this.getLowerRateByYear()
+      this.getLowerRangeTenderType()
     },
     beforeDestroy(){