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/component/tdjy.vue

 <template>
-  <div class="tdjy">
+  <div>
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+    <div v-if="!isSkeleton" class="tdjy">
       <p class="text_p">注：数据来源大司空建筑大数据平台，统计范围为全国公开的土地交易项目，未公开的不含在内</p>
       <div class="td_content">
         <div class="flex-box query-box">
@@ -31,7 +33,7 @@
               </el-table-column>
               <el-table-column prop="type" label="供应方式" width="200" :formatter="formatStatus"/>
               <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable width="160" />
-            <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="160" />
+              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" />
             </el-table>
           </div>
         </div>
@@ -66,7 +68,7 @@
               </el-table-column>
               <el-table-column prop="type" label="供应方式" width="200" :formatter="formatStatus"/>
               <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable width="160" />
-            <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="160" />
+              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" />
             </el-table>
           </div>
         </div>
@@ -104,7 +106,7 @@
               </el-table-column>
               <el-table-column prop="province" label="地区" width="200" :formatter="formatStatus"/>
               <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable width="160" />
-            <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="160" />
+              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" />
             </el-table>
           </div>
         </div>
@@ -136,20 +138,25 @@
               </el-table-column>
               <el-table-column prop="type" label="年份" width="200" :formatter="formatStatus"/>
               <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable width="160" />
-            <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="160" />
+              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" />
             </el-table>
           </div>
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script>
   import * as echarts from 'echarts';
   import dataRegion from '@/assets/json/dataRegion'
   import { countLandMarketByType,countLandMarketByProvince,countLandMarketByYear } from '@/api/macro/macro'
+  import skeleton from '../../component/skeleton'
 export default {
   name: 'NationalEconomies',
+  components: {
+    skeleton
+  },
   data() {
     return {
       myChart1:'',
@@ -166,24 +173,32 @@ export default {
       tdytList:[],
       topList:[],
       nftjList:[],
-      typeName:['住宅用地','工业用地','城镇住宅用地','其他商服用地','公共设施用地','公路用地','城镇村道路用地','公园与绿地',
-        '工矿仓储用地','零售商业用地','科研用地','街巷用地','机关团体用地','商服用地','商务金融用地']
+      isSkeleton:true,
+      // typeName:['住宅用地','工业用地','城镇住宅用地','其他商服用地','公共设施用地','公路用地','城镇村道路用地','公园与绿地',
+      //   '工矿仓储用地','零售商业用地','科研用地','街巷用地','机关团体用地','商服用地','商务金融用地']
     }
   },
   created() {
     this.dataRegion()
     this.yearsData()
+    setTimeout(() => {
+      this.isSkeleton=false;
       this.getCountLandMarketByType()
       this.getCountLandMarketByTypeTd()
       this.getCountLandMarketByProvince()
       this.getCountLandMarketByYear()
+    }, 1500);
+  },
+  mounted() {
   },
   beforeDestroy(){
 
   },
   methods: {
     getCountLandMarketByType(){
+      // this.isSkeleton = true
       countLandMarketByType({type:'供应方式',yearStr:this.years.join(",")}).then(res => {
+        // this.isSkeleton = false
         this.gyfsList=res.data.provinceDate;
         var list=[];
         for(var i=0;i<res.data.provinceDate.length;i++){
@@ -193,11 +208,15 @@ export default {
           obj.rate=res.data.provinceDate[i].rate;
           list.push(obj)
         }
+        this.$nextTick(() => {
           this.initChart1(list)
         })
+      })
     },
     getCountLandMarketByTypeTd(){
+      // this.isSkeleton = true
       countLandMarketByType({type:'土地用途',yearStr:this.years1.join(",")}).then(res => {
+        // this.isSkeleton = false
         this.tdytList=res.data.provinceDate;
         var list=[];
         for(var i=0;i<10;i++){
@@ -207,8 +226,10 @@ export default {
           obj.rate=res.data.provinceDate[i].rate;
           list.push(obj)
         }
+        this.$nextTick(() => {
           this.initChart2(list)
         })
+      })
     },
     getCountLandMarketByProvince(){
       let params={
@@ -217,7 +238,9 @@ export default {
       if(this.address.length > 0){
         params.provinceId=this.address.join(",")
       }
+      // this.isSkeleton = true
       countLandMarketByProvince(params).then(res => {
+        // this.isSkeleton = false
         this.topList=res.data.provinceDate;
         var list=[];
         if(res.data.provinceDate){
@@ -238,7 +261,6 @@ export default {
     getCountLandMarketByYear(){
       countLandMarketByYear().then(res => {
         this.nftjList=res.data.yearDate;
-        console.log(this.nftjList)
         var list=[];
         if(res.data.yearDate){
           for(var i=0;i<res.data.yearDate.length;i++){
@@ -356,7 +378,7 @@ export default {
         // console.log(typeList)
         let myChart = echarts.init(document.getElementById("echarts3"))
         let seriesData=[]
-        let color=['#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#81D5BC', '#67B3FD', '#BEECFF', '#E9C8FF'];
+        let color=['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'];
         let typeNameList=data[0].typeList.map(item => item.type);
         let item={}
         for(var i=0; i<data.length; i++){
@@ -458,7 +480,7 @@ export default {
             right:20,
             bottom:60,
           },
-          color:['#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#81D5BC', '#67B3FD', '#BEECFF', '#E9C8FF'],
+          color:['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'],
           series: seriesData
         }
         myChart.setOption(option);
@@ -471,7 +493,7 @@ export default {
       this.$nextTick(() => {
         let myChart = echarts.init(document.getElementById("echarts4"))
         let seriesData=[]
-        let color=['#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#81D5BC', '#67B3FD', '#BEECFF', '#E9C8FF'];
+        let color=['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'];
         let typeNameList=data[0].typeList.map(item => item.type);
         let item={}
         for(var i=0; i<data.length; i++){
@@ -573,7 +595,7 @@ export default {
             right:20,
             bottom:60,
           },
-          color:['#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#81D5BC', '#67B3FD', '#BEECFF', '#E9C8FF'],
+          color:['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'],
           series: seriesData
         }
         myChart.setOption(option);

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);