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

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

@@ -81,7 +81,7 @@
     </div>
     <div class="content content_wap2">
       <div class="head_title">客户资信评级</div>
-      <el-row>
+      <el-row v-if="creditLevel.length > 0">
         <el-col :span="14">
           <div id="zxpj-echarts" style="height: 250px;"></div>
         </el-col>
@@ -100,6 +100,10 @@
           </div>
         </el-col>
       </el-row>
+      <div class="empty" v-if="creditLevel.length === 0">
+        <img class="img" src="@/assets/images/project/empty.png">
+        <div class="p1">抱歉，没找到相关数据</div>
+      </div>
     </div>
     <div class="content_wap3">
       <div class="flex-box query-box">
@@ -829,26 +833,24 @@
       }
     }
 
-    .content_wap1{
-      .empty{
-        margin: 0 auto;
-        height: 300px;
-        text-align: center;
-        .img{
-          width: 108px;
-          height: 108px;
-          margin-bottom: 24px;
-          margin-top: 50px;
-        }
-        .p1{
-          color: #333333;
-          font-size: 16px;
-        }
-        .p2{
-          color: #999999;
-          font-size: 14px;
-          margin-top: 8px;
-        }
+    .empty{
+      margin: 0 auto;
+      height: 300px;
+      text-align: center;
+      .img{
+        width: 108px;
+        height: 108px;
+        margin-bottom: 24px;
+        margin-top: 50px;
+      }
+      .p1{
+        color: #333333;
+        font-size: 16px;
+      }
+      .p2{
+        color: #999999;
+        font-size: 14px;
+        margin-top: 8px;
       }
     }
     .content_wap3{

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

@@ -50,11 +50,11 @@
           </div>
         </el-col>
       </el-row>
-      <div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工内土地交易项目，未公开的不含在内</div>
       <div class="content content_wap1">
         <div class="flex-box query-box">
           <div class="flex-box query-params">
             <span class="common-title">集团中标统计</span>
+            <div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工内土地交易项目，未公开的不含在内</div>
           </div>
           <div class="flex-box">
             <div class="search">
@@ -116,6 +116,7 @@
         <div class="flex-box query-box">
           <div class="flex-box query-params">
             <span class="common-title">大项目中标排行榜</span>
+            <div class="tips">注：数据来源大司空建筑大数据平台，统计范围为全国公开的施工内土地交易项目，未公开的不含在内</div>
           </div>
           <div class="flex-box">
             <div class="search">
@@ -923,7 +924,7 @@ export default {
             top:30,
             left:80,
             right:90,
-            bottom:30,
+            bottom:50,
           },
           series: [
             {
@@ -1216,7 +1217,7 @@ export default {
             top:30,
             left:60,
             right:90,
-            bottom:30,
+            bottom:50,
             // containLabel: true
           },
           // dataZoom:[
@@ -1514,17 +1515,19 @@ export default {
         color: #999999;
         font-size: 12px;
         margin: 12px 0;
+        padding-left: 16px;
       }
       .content{
         background: #ffffff;
         padding: 16px;
+        margin-top: 12px;
         .query-box{
           margin-bottom: 16px;
         }
       }
       .content_wap1{
         height: 430px;
-        margin-bottom: 12px;
+
       }
       .content_wap2{
         height: 430px;

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

@@ -36,7 +36,6 @@
           element-loading-text="Loading"
           @sort-change="sortChange"
           border
-          max-height="640"
           highlight-current-row
           v-if="tableDataTotal > 0 && !isSkeleton"
           :default-sort = "{prop: 'gdp', order: 'descending'}"