Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dsk-admin/src/main/resources/application-test.yml
#	dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

dsk-admin/src/main/resources/application-test.yml

@@ -202,3 +202,7 @@ dsk:
 #    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
 #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
 #    protocol: https
+#    endPoint: localhost:8767
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: http

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

 <template>
   <div class="zhaobiao">
-    <p class="text_p">注：数据来源大司空建筑大数据平台，统计范围为全国公开的招标项目，未公开的不含在内</p>
     <div class="zb-content content1">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
@@ -490,7 +489,7 @@ export default {
     border-radius: 4px;
     color: #0081FF;
   }
-  .shangji{
+  .zhaobiao{
     .zb-content{
       background: #ffffff;
       border-radius: 4px;

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

@@ -11,7 +11,7 @@
           </el-select>
         </div>
       </div>
-      <div class="content_box" v-if="gyflState">
+      <div class="content_box">
         <div class="box-left">
           <div id="echarts1" style="height: 280px"></div>
         </div>
@@ -38,12 +38,12 @@
           </el-table>
         </div>
       </div>
-      <div class="empty" v-if="!gyflState">
-        <img class="img" src="@/assets/images/project/empty.png">
-        <div class="p1">抱歉，暂无数据展示</div>
-      </div>
+      <!--<div class="empty">-->
+        <!--<img class="img" src="@/assets/images/project/empty.png">-->
+        <!--<div class="p1">抱歉，暂无数据展示</div>-->
+      <!--</div>-->
     </div>
-    <div v-if="!isSkeleton" class="td_content">
+    <div v-if="!zbtjState" class="td_content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
           <span class="common-title">全国各地区中标统计TOP10</span>
@@ -52,7 +52,7 @@
           </el-select>
         </div>
       </div>
-      <div class="content_box" v-if="tdytState">
+      <div class="content_box">
         <div class="box-left">
           <div id="echarts2" style="height: 280px"></div>
         </div>
@@ -79,12 +79,12 @@
           </el-table>
         </div>
       </div>
-      <div class="empty" v-if="!tdytState">
-        <img class="img" src="@/assets/images/project/empty.png">
-        <div class="p1">抱歉，暂无数据展示</div>
-      </div>
+      <!--<div class="empty" v-if="!zbtjState">-->
+        <!--<img class="img" src="@/assets/images/project/empty.png">-->
+        <!--<div class="p1">抱歉，暂无数据展示</div>-->
+      <!--</div>-->
     </div>
-    <div v-if="!isSkeleton" class="td_content">
+    <div v-if="!jefxState" class="td_content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
           <span class="common-title">全国中标金额分析</span>
@@ -93,7 +93,7 @@
           </el-select>
         </div>
       </div>
-      <div class="content_box" v-if="tdytState">
+      <div class="content_box">
         <div class="box-left">
           <div id="echarts3" style="height: 280px"></div>
         </div>
@@ -118,12 +118,12 @@
           </el-table>
         </div>
       </div>
-      <div class="empty" v-if="!tdytState">
-        <img class="img" src="@/assets/images/project/empty.png">
-        <div class="p1">抱歉，暂无数据展示</div>
-      </div>
+      <!--<div class="empty" v-if="!jefxState">-->
+        <!--<img class="img" src="@/assets/images/project/empty.png">-->
+        <!--<div class="p1">抱歉，暂无数据展示</div>-->
+      <!--</div>-->
     </div>
-    <div v-if="!isSkeleton" class="td_content">
+    <div v-if="!qsfxState" class="td_content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
           <span class="common-title">全国中标趋势分析</span>
@@ -155,7 +155,7 @@
         </div>
       </div>
     </div>
-    <div v-if="!isSkeleton" class="td_content">
+    <div v-if="!xflState" class="td_content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
           <span class="common-title">全国中标下浮率分析</span>
@@ -164,7 +164,7 @@
           </el-select>
         </div>
       </div>
-      <div class="content_box" v-if="tdytState">
+      <div class="content_box">
         <div class="box-left">
           <div id="echarts5" style="height: 280px"></div>
         </div>
@@ -189,13 +189,13 @@
           </el-table>
         </div>
       </div>
-      <div class="empty" v-if="!tdytState">
-        <img class="img" src="@/assets/images/project/empty.png">
-        <div class="p1">抱歉，暂无数据展示</div>
-      </div>
+      <!--<div class="empty" v-if="!xflState">-->
+        <!--<img class="img" src="@/assets/images/project/empty.png">-->
+        <!--<div class="p1">抱歉，暂无数据展示</div>-->
+      <!--</div>-->
     </div>
 
-    <div v-if="!isSkeleton" class="td_content">
+    <div v-if="!xmlxState" class="td_content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
           <span class="common-title">全国中标业绩项目类型下浮率</span>
@@ -207,7 +207,7 @@
           </el-select>
         </div>
       </div>
-      <div class="content_box" v-if="topList.length > 0 && !isSkeleton">
+      <div class="content_box">
         <div class="box-left">
           <div id="echarts6" style="height: 300px"></div>
         </div>
@@ -233,10 +233,10 @@
           </el-table>
         </div>
       </div>
-      <div class="empty" v-if="topList.length === 0 && !isSkeleton">
-        <img class="img" src="@/assets/images/project/empty.png">
-        <div class="p1">抱歉，暂无数据展示</div>
-      </div>
+      <!--<div class="empty">-->
+        <!--<img class="img" src="@/assets/images/project/empty.png">-->
+        <!--<div class="p1">抱歉，暂无数据展示</div>-->
+      <!--</div>-->
     </div>
 
   </div>
@@ -269,24 +269,24 @@
         xflList :[],
         xmxflList :[],
         isSkeleton:true,
-        gyflState:true,
-        tdytState:true,
-        topState:true,
+        zbtjState:true,
+        jefxState:true,
+        qsfxState:true,
+        xflState:true,
+        xmlxState:true,
       }
     },
     created() {
       this.dataRegion()
       this.yearsData()
       this.getCountBidByType()
-      this.$nextTick(() => {
-
-      })
+      this.getCountBidGroupByProvince()
+      this.getRangeBidMoney()
+      this.getRangeBidFiveYears()
+      this.getLowerRateByYear()
+      this.getLowerRangeTenderType()
       setTimeout(() => {
-        this.getCountBidGroupByProvince()
-        this.getRangeBidMoney()
-        this.getRangeBidFiveYears()
-        this.getLowerRateByYear()
-        this.getLowerRangeTenderType()
+
       }, 1000);
     },
     mounted() {
@@ -322,6 +322,7 @@
           yearStr:this.years1.join(",")
         }
         countBidGroupByProvince(params).then(res => {
+          this.zbtjState=false;
           this.topList=res.data;
           if(res.data){
             this.$nextTick(() => {
@@ -335,6 +336,7 @@
           yearStr:this.years2.join(",")
         }
         rangeBidMoney(params).then(res => {
+          this.jefxState=false;
           this.zbjeList=res.data;
           var list=[];
           for(var i=0;i<res.data.length;i++){
@@ -353,6 +355,7 @@
       },
       getRangeBidFiveYears(){
         rangeBidFiveYears().then(res => {
+          this.qsfxState=false;
           this.zbqsList=res.data;
           if(res.data){
             this.$nextTick(() => {
@@ -366,6 +369,7 @@
           yearStr:this.years3
         }
         lowerRateByYear(params).then(res => {
+          this.xflState=false;
           for (var i=0; i<res.data.length; i++){
             res.data[i].rate=res.data[i].rate.toFixed(2)
           }
@@ -385,7 +389,7 @@
           params.provinceId=this.address
         }
         lowerRangeTenderType(params).then(res => {
-
+          this.xmlxState=false;
           for (var i=0; i<res.data.length; i++){
             for (let j=0; j<res.data[i].typeList.length; j++){
               if(res.data[i].typeList[j].tenderType === '施工'){
@@ -526,7 +530,6 @@
       },
       initChart2(data) {
         this.$nextTick(() => {
-          // console.log(typeList)
           let myChart = echarts.init(document.getElementById("echarts2"))
           let seriesData=[]
           let color=['#FCD68A', '#67B3FD', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#FFE48A'];

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

@@ -54,7 +54,8 @@ public class EconomicServiceImpl implements EconomicService {
         if (ObjectUtil.isEmpty(dto.getYear())) {
             dto.setYear(DateUtils.getYear() - 1);
         }
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
+
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
         Integer code = MapUtils.getInteger(map, "code", 300);
         if (!code.equals(HttpStatus.OK.value())) {
             throw new RuntimeException();