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

dsk-operate-ui/src/api/macro/macro.js

@@ -68,6 +68,14 @@ export function countLandMarketByProvince(param) {
   })
 }
 
+//全国商机项目分析-全国土地交易项目年份统计
+export function countLandMarketByYear() {
+  return request({
+    url: '/marketAnalysis/countLandMarketByYear',
+    method: 'POST',
+  })
+}
+
 //全国商机项目分析-全国各地区招标统计TOP10
 export function countNewsBidByProvince(param) {
   return request({
@@ -76,10 +84,13 @@ export function countNewsBidByProvince(param) {
     data: param
   })
 }
-//全国商机项目分析-全国土地交易项目年份统计
-export function countLandMarketByYear() {
+
+
+
+//全国商机项目分析-全国公招项目统计
+export function countNewsBidByYear() {
   return request({
-    url: '/marketAnalysis/countLandMarketByYear',
+    url: '/marketAnalysis/countNewsBidByYear',
     method: 'POST',
   })
 }
@@ -91,6 +102,14 @@ export function countBidGroupByProvince(param) {
     data: param
   })
 }
+//全国商机项目分析-全国各年度招标月份统计
+export function countNewsBidByMonth(param) {
+  return request({
+    url: '/marketAnalysis/countNewsBidByMonth',
+    method: 'POST',
+    data: param
+  })
+}
 
 
 

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

@@ -13,7 +13,7 @@
   import * as echarts from 'echarts';
   import { countGroupByMonth,countGroupByProvince,getYear } from '@/api/macro/macro'
   import Tdjy from './tdjy'
-  import Zhaobiao from './zhaobiao'
+  import Zhaobiao from './zhaobiao1'
 export default {
   name: 'NationalEconomies',
   components: {

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

@@ -28,7 +28,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'second'
+      activeName: 'first'
     }
   },
   created() {

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

@@ -52,8 +52,8 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
         for (Object dataMap : list) {
             String name = MapUtils.getString(CommonUtils.assertAsMap(dataMap), "companyName");
             if (ObjectUtil.isNotEmpty(name) && ObjectUtil.isNotEmpty(pageDto.getKeyword())) {
-                name = name.replace("<font color='red'>","");
-                name = name.replace("</font>","");
+                name = name.replaceAll("<font color='red'>","");
+                name = name.replaceAll("</font>","");
                 companyNames.add(name);
             } else {
                 companyNames.add(name);
@@ -82,8 +82,8 @@ public class UrbanInvestmentPlatformServiceImpl implements UrbanInvestmentPlatfo
             String uipId = MapUtils.getString(companyMap, "uipId");
             String companyName = MapUtils.getString(companyMap, "companyName", "");
             if (ObjectUtil.isNotEmpty(companyName) && ObjectUtil.isNotEmpty(pageDto.getKeyword())) {
-                companyName = companyName.replace("<font color='red'>","");
-                companyName = companyName.replace("</font>","");
+                companyName = companyName.replaceAll("<font color='red'>","");
+                companyName = companyName.replaceAll("</font>","");
             }
             companyMap.put("claimStatus", null);
             companyMap.put("bratingSubjectLevel", null);