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

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

@@ -86,12 +86,12 @@ public class BusinessOpportunityRadarService {
     }
 
     public AjaxResult getCapitalSourceSelect() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/getCapitalSourceSelect", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     public AjaxResult keywordList() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/keywordList", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/keywordList", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -112,7 +112,7 @@ public class BusinessOpportunityRadarService {
     }
 
     public AjaxResult importantCondition() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/importantCondition", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/importantCondition", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/MarketAnalysisService.java

@@ -21,17 +21,17 @@ public class MarketAnalysisService {
     private DskOpenApiUtil dskOpenApiUtil;
 
     public AjaxResult areaGroupByProvince() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/areaGroupByProvince", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     public AjaxResult certGroupByMajorAndLevel() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorAndLevel", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     public AjaxResult certGroupByMajorProvinceLevel()  {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -66,12 +66,12 @@ public class MarketAnalysisService {
     }
 
     public AjaxResult countNewsBidByYear() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countNewsBidByYear", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countNewsBidByYear", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     public AjaxResult countLandMarketByYear() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByYear", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countLandMarketByYear", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -101,7 +101,7 @@ public class MarketAnalysisService {
     }
 
     public AjaxResult rangeBidFiveYears() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/rangeBidFiveYears", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/rangeBidFiveYears", new JSONObject());
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 

dsk-operate-ui/src/views/macro/component/CustomTimeSelect.vue

@@ -178,6 +178,21 @@ export default {
             startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 15)
             timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
             break;
+          case '近一月':
+            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 30)
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            break;
+          case '近半年':
+            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 180)
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            break;
+          case '近一年':
+            startTime = new Date().setFullYear(new Date().getFullYear() - 1)
+            if(this.dateTo){
+              startTime = new Date(this.dateTo).setFullYear(new Date(this.dateTo).getFullYear() - 1)
+            }
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            break;
           case '近1年':
             startTime = new Date().setFullYear(new Date().getFullYear() - 1)
             if(this.dateTo){

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

@@ -135,7 +135,7 @@ export default {
       show_page:true,
       MaxPage:500,
       isSkeleton:true,
-      timeList: ['近三天', '近七天', '近半月', '自定义'],
+      timeList: ['近半月', '近一月', '近半年', '近一年', '自定义'],
       timePlaceholder:'中标时间',
     }
   },

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

@@ -279,7 +279,6 @@ export default {
       countLandMarketByProvince(params).then(res => {
         this.topState = false
         this.topList=res.data.provinceDate;
-        console.log(res.data.provinceList,"||||||||")
         var list=[];
         if(res.data.provinceDate){
           for(var i=0;i<res.data.provinceDate.length;i++){

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

 <template>
-    <div v-loading="loading" class="app-container">
-      <iframe id="companyIframe" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" width="100%" :style="{height:iframeHight+'px'}" :src="src" />
-    </div>
-  </template>
-  
-  <script>
-    import { steerScroll } from '@/assets/js/jskplug'
-    import { dskAccessToken } from '@/api/common'
-  
-    export default {
+  <div v-loading="loading" class="app-container">
+    <iframe id="companyIframe" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" width="100%" :style="{height:iframeHight+'px'}" :src="src" />
+  </div>
+</template>
+
+<script>
+  import { steerScroll } from '@/assets/js/jskplug'
+  import { dskAccessToken } from '@/api/common'
+
+  export default {
     name: 'Enterprise',
     components: {
-  
+
     },
     data() {
       return {
@@ -83,11 +83,10 @@
       }
     }
   }
-  </script>
-  
-  <style lang="scss" scoped>
-    .app-container{
-      padding: 0;
-    }
-  </style>
-  
\ No newline at end of file
+</script>
+
+<style lang="scss" scoped>
+  .app-container{
+    padding: 0;
+  }
+</style>