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

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseProjectController.java

@@ -121,7 +121,7 @@ public class EnterpriseProjectController {
 
     @ApiOperation(value = "招标计划项目类型（openApi）")
     @RequestMapping(value = "/bidPlanProjectType",method = RequestMethod.POST)
-    public TableDataInfo bidPlanProjectType(@RequestBody @Valid EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
+    public R bidPlanProjectType(@RequestBody @Valid EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
         return enterpriseProjectService.bidPlanProjectType(body);
     }
 

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -91,7 +91,7 @@ export default {
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
   position: fixed;
   top:0;
-  z-index: 9999;
+  z-index: 999;
 
   .left-menu{
     float: left;

dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue

@@ -35,7 +35,7 @@
           </el-table-column>
           <el-table-column label="产业类型" prop="projectType"></el-table-column>
           <el-table-column :label="oneYear">
-            <el-table-column prop="money" label="金额（亿元）" sortable> </el-table-column>
+            <el-table-column prop="money" label="金额（亿元）" sortable></el-table-column>
             <el-table-column prop="rate" label="占比（%）"> </el-table-column>
           </el-table-column>
           <el-table-column :label="twoYear">
@@ -114,6 +114,12 @@ export default {
             }
           }
         }
+        for(let i=0; i<list.length; i++){
+          list[i].money=Number(list[i].money).toFixed(2)
+          list[i].rate=Number(list[i].rate).toFixed(2)
+          list[i].lastMoney=Number(list[i].lastMoney).toFixed(2)
+          list[i].lastRate=Number(list[i].lastRate).toFixed(2)
+        }
         this.tableData=list.reverse()
       })
     },
@@ -220,7 +226,7 @@ export default {
         sums[index] = values.reduce((prev, curr) => {
           const value = Number(curr);
           if (!isNaN(value)) {
-            return Number(Number(prev) + Number(curr)).toFixed(3)
+            return Number(Number(prev) + Number(curr)).toFixed(2)
           } else {
             return prev;
           }

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -22,8 +22,8 @@
             <img v-else src="@/assets/images/economies/icon_down.png">
           </div>
           <div id="echartsZS" style="height: 75px;"></div>
-          <div class="item-text up" v-if="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth).toFixed(2).toString()}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{(this.recentlyYear.gdpGrowth-this.nextYearMap.gdpGrowth).toFixed(2).toString().substring(1)}}%</span></div>
+          <div class="item-text up" v-if="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
         </div>
         <div class="item">
           <div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div>
@@ -56,8 +56,8 @@
           </div>
           <div id="echartsYE" style="height: 75px;"></div>
           <div class="item-text up" v-if="recentlyYear.govDebtBalance > nextYearMap.govDebtBalance">
-            较{{nextYearMap.year}}年上升<span>{{((recentlyYear.govDebtBalance - nextYearMap.govDebtBalance)/nextYearMap.govDebtBalance*100).toFixed(2)}}%</span></div>
-          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{((recentlyYear.govDebtBalance - nextYearMap.govDebtBalance)/nextYearMap.govDebtBalance*100).toFixed(2).toString().substring(1)}}%</span></div>
+            较{{nextYearMap.year}}年上升<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
+          <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
         </div>
       </div>
     </div>
@@ -268,7 +268,7 @@ export default {
       pageIndex: 1,
       pageSize: 10,
       tableDataTotal: 0,
-      labelData:[2021,2022],
+      labelData:[],
       valData:[],
       valData1:[],
       valData2:[],
@@ -280,6 +280,8 @@ export default {
   },
   created() {
     this.getData()
+    let mydate=new Date();
+    this.labelData=[mydate.getFullYear()-2,mydate.getFullYear()-1]
     this.$nextTick(()=>{
       // console.log(this.dataQuery)
     })
@@ -325,11 +327,11 @@ export default {
       regional(params).then(res => {
         this.recentlyYear=res.data[0].recentlyYear;
         this.nextYearMap=res.data[0].nextYearMap;
-        this.valData=[this.nextYearMap.gdp,this.recentlyYear.gdp]
-        this.valData1=[this.nextYearMap.gdpGrowth,this.recentlyYear.gdpGrowth]
-        this.valData2=[this.nextYearMap.population,this.recentlyYear.population]
-        this.valData3=[this.nextYearMap.gbr,this.recentlyYear.gbr]
-        this.valData4=[this.nextYearMap.govDebtBalance,this.recentlyYear.govDebtBalance]
+        this.valData=[this.getMoneyNum(this.nextYearMap.gdp),this.getMoneyNum(this.recentlyYear.gdp)]
+        this.valData1=[this.getMoneyNum(this.nextYearMap.gdpGrowth),this.getMoneyNum(this.recentlyYear.gdpGrowth)]
+        this.valData2=[this.getMoneyNum(this.nextYearMap.population),this.getMoneyNum(this.recentlyYear.population)]
+        this.valData3=[this.getMoneyNum(this.nextYearMap.gbr),this.getMoneyNum(this.recentlyYear.gbr)]
+        this.valData4=[this.getMoneyNum(this.nextYearMap.govDebtBalance),this.getMoneyNum(this.recentlyYear.govDebtBalance)]
         this.initChart()
         this.initChart1()
         this.initChart2()
@@ -676,7 +678,8 @@ export default {
     },
     childMethod(key) {
       let data=this.dataQuery
-      data.pId=this.dataQuery.provinceId
+      data.pId=this.provinceId;
+      this.dataQuery.provinceId=this.provinceId;
       switch (key) {
         case 1:
           this.$parent.handleClick('second', data);
@@ -685,7 +688,8 @@ export default {
           this.$router.push({
             path: '/macro/urban',
             query:{
-              provinceId:this.dataQuery.provinceId
+              provinceId:this.dataQuery.provinceId,
+              province:this.dataQuery.province,
             }
           })
           break;
@@ -695,6 +699,12 @@ export default {
       }
 
     },
+    getMoneyNum(num){
+      if (!num) return 0;
+      num = num + ''
+      if (num.indexOf(',') != -1) return num.replace(/\,/g, '');
+      else return num;
+    }
   }
 }
 </script>

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

@@ -129,7 +129,7 @@ export default {
   created() {
     location({}).then(res => {
       this.province=res.data.province;
-      this.provinceId=res.data.provinceId;
+      this.provinceId=res.data.provinceId
       this.querySubmit()
     })
     this.aptitudeCode()
@@ -215,7 +215,6 @@ export default {
       this.querySubmit()
     },
     handleClick(){
-      console.log(this.activeName)
       this.queryParams.codeStr=[]
       this.aptitudeType='';
       this.queryParams={
@@ -265,9 +264,8 @@ export default {
       });
     },
     addressListbtn(data) {
-      console.log(data)
       this.province=data.province;
-      this.provinceId=data.provinceId[0];
+      this.provinceId=data.provinceId[data.provinceId.length-1];
       this.dataQuery.province=data.provinces;
       let params={}
       if(data){

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

 <template>
   <div class="app-container qyzx">
+    <Region v-if="province" :province="province" :dataQuery="dataQuery" @addressListbtn="addressListbtn"></Region>
     <div class="content">
       <div class="common-title">专项债项目</div>
       <div class="content-box">
@@ -76,9 +77,13 @@
 
 <script>
   import * as echarts from 'echarts';
-  import { statistics,projectsPage } from '@/api/macro/macro'
+  import { statistics,projectsPage,location } from '@/api/macro/macro'
+  import Region from '../component/region'
 export default {
   name: 'Financing',
+  components: {
+    Region
+  },
   data() {
     return {
       queryParams:{},
@@ -90,13 +95,29 @@ export default {
       pageSize: 10,
       tableDataTotal: 0,
       show_page:true,
-      MaxPage:1000
+      MaxPage:1000,
+      dataQuery:{},
+      province:'',
+      provinceId:[]
     }
   },
   created() {
-    this.getStatistics()
-    this.getData()
-    this.$nextTick(()=>{
+    location({}).then(res => {
+      this.province=res.data.province;
+      if(!this.dataQuery.provinceId){
+        this.dataQuery.provinceId=res.data.provinceId
+        let arr=[res.data.province]
+        this.dataQuery.province=arr;
+        this.provinceId.push(res.data.provinceId)
+      }else {
+        this.provinceId.push(this.dataQuery.provinceId)
+      }
+      this.getData()
+      this.getStatistics()
+    })
+  },
+  mounted() {
+    this.$nextTick(() => {
 
     })
   },
@@ -110,6 +131,15 @@ export default {
       if(this.tableParams.order){
         params.order=this.tableParams.order
       }
+      if(this.provinceId.length > 0){
+        params.provinceId=this.provinceId[0]
+      }
+      if(this.provinceId.length > 1){
+        params.cityId=this.provinceId[1]
+      }
+      if(this.provinceId.length > 2){
+        params.areaId=this.provinceId[2]
+      }
       projectsPage(params).then(res => {
         this.tableLoading = false
         this.listData=res.data.list;
@@ -122,6 +152,15 @@ export default {
     },
     getStatistics(){
       let params={};
+      if(this.provinceId.length > 0){
+        params.provinceId=this.provinceId[0]
+      }
+      if(this.provinceId.length > 1){
+        params.cityId=this.provinceId[1]
+      }
+      if(this.provinceId.length > 2){
+        params.areaId=this.provinceId[2]
+      }
       if(this.queryParams.field){
         params.field=this.queryParams.field
       }
@@ -301,7 +340,30 @@ export default {
         message: '功能正在开发中',
         type: 'warning'
       });
-    }
+    },
+    addressListbtn(data) {
+      this.province=data.province;
+      this.provinceId=data.provinceId;
+      this.dataQuery.province=data.provinces;
+      let params={}
+      if(data){
+        if(this.provinceId.length > 0){
+          params.provinceId=this.provinceId[0]
+        }
+        if(this.provinceId.length > 1){
+          params.cityId=this.provinceId[1]
+        }
+        if(this.provinceId.length > 2){
+          params.areaId=this.provinceId[2]
+        }
+      }
+      location(params).then(res => {
+        console.log(res.data)
+      })
+      this.pageIndex = 1;
+      this.getData()
+      this.getStatistics()
+    },
   }
 }
 </script>

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

@@ -82,7 +82,7 @@
           <span class="common-title">全国招标项目概览</span>
         </div>
       </div>
-      <div class="text">通过对{{year}}年全国招标数据进行分析，发现主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
+      <div class="text">通过对{{year}}全国招标数据进行分析，发现主要集中在{{dataSort[0].label}}（{{dataSort[0].count}}个）、{{dataSort[1].label}}（{{dataSort[1].count}}个）进行招标。</div>
       <div class="main1">
         <div id="gl-echarts" style="height: 250px"></div>
         <p class="tips"><i class="el-icon-info"></i>数据来源大司空建筑大数据平台，统计范围为{{year}}年全国公开的招标项目，未公开的不含在内</p>
@@ -314,6 +314,11 @@ export default {
         xAxis: {
           type: 'category',
           data: this.tableData1.map(item => item.label),
+          axisLabel: {
+            show: true,
+            // "interval": 0,
+            "rotate": this.year === '近二年'|| this.year === '近三年'? 40: 0 //X轴倾斜度
+          },
         },
         yAxis: {
           type: 'value'

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

@@ -134,7 +134,7 @@
         </div>
       </div>
     </div>
-    <div class="content">
+    <div class="content" id="content">
       <div class="flex-box query-box">
         <div class="flex-box query-params">
           <span class="common-title">城投平台列表</span>
@@ -276,6 +276,7 @@
   import {encodeStr} from "@/assets/js/common.js"
   import dataRegion from '@/assets/json/dataRegion'
   import api from '@/api/enterpriseData/enterpriseData.js';
+  import elementResizeDetectorMaker from "element-resize-detector"
   import { uipGroupData,urbanInvestmentPage,urbanInvestmentStatistics,claim,location } from '@/api/macro/macro'
   import { infoHeader } from '@/api/detail/party-a/index'
   import Region from '../component/region'
@@ -324,7 +325,9 @@ export default {
       tableHeight: 0,
       dataQuery:{},
       province:'',
-      provinceId:[]
+      provinceId:[],
+      fixed: false,
+      StyWidth:null
     }
   },
   watch:{
@@ -340,10 +343,23 @@ export default {
       }
     }
   },
+  mounted(){
+    window.addEventListener('scroll', this.handleScroll);
+    const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("content")
+    erd.listenTo(partBox, element => {
+      _this.$nextTick(() => {
+        this.StyWidth = partBox.offsetWidth + 'px';
+      })
+    })
+  },
+  destroyed () {
+    window.removeEventListener('scroll', this.handleScroll)
+  },
   created() {
     this.dataRegion()
     this.getType()
     this.dataQuery=this.$route.query;
+    console.log(this.dataQuery)
     if(this.dataQuery.provinceId){
       if(Array.isArray(this.dataQuery.province)){
         this.province=this.dataQuery.province[0];
@@ -351,7 +367,13 @@ export default {
         this.province=this.dataQuery.province
         this.dataQuery.province = [this.dataQuery.province];
       }
-      this.provinceId.push(this.dataQuery.provinceId)
+      if(Array.isArray(this.dataQuery.provinceId)){
+        this.provinceId=this.dataQuery.provinceId
+      }else {
+        this.provinceId.push(this.dataQuery.provinceId)
+      }
+
+      this.querySubmit()
     }else {
       location({}).then(res => {
         this.province=res.data.province;
@@ -364,20 +386,21 @@ export default {
           this.provinceId.push(this.dataQuery.provinceId)
         }
       })
+      this.querySubmit()
     }
-    this.querySubmit()
-
-  },
-  mounted() {
     this.$nextTick(() => {
-      // window.innerHeight 浏览器窗口的可见高度，下面的 220 是除了table最大高度的剩余空间。
-      // let height = this.$refs.urban.offsetHeight - this.$refs.queryForm.offsetHeight;
-      // this.tableHeight = height;
-      // console.log(window.innerHeight,"|||||||||")
-      // console.log(this.$refs.urban.offsetHeight)
+
     })
   },
   methods: {
+    handleScroll () {
+      let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
+      if (scrollTop > 300) {
+        this.fixed = true
+      } else {
+        this.fixed = false
+      }
+    },
     getType(){
       uipGroupData({}).then(res => {
         this.typeList=res.data;
@@ -385,6 +408,7 @@ export default {
     },
     // 查询提交
     async querySubmit() {
+      console.log(this.provinceId,"||||")
       this.tableLoading = true
       const params = { pageNum: this.pageIndex, pageSize: this.pageSize,type:Number(this.queryParams.radio)}
       const param={}
@@ -1000,5 +1024,10 @@ export default {
         }
       }
     }
+    .fixed{
+      position: fixed;
+      z-index: 999;
+      top: 56px;
+    }
   }
 </style>

dsk-operate-ui/vue.config.js

@@ -35,6 +35,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://47.104.91.229:9099/prod-api`,
+        // target: `http://122.9.160.122:9011`,
         // target: `http://192.168.60.126:9011`,
         // target: `http://192.168.60.27:8766`,
         changeOrigin: true,

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java

@@ -121,10 +121,10 @@ public class EnterpriseProjectService {
         return dskOpenApiUtil.responsePage(map);
     }
 
-    public TableDataInfo bidPlanProjectType(EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
-        if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
+    public R bidPlanProjectType(EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
+        if (body.isVaildCid()) return R.ok(new ArrayList<>());
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterpriseProject/bidPlanProjectType", BeanUtil.beanToMap(body, false, false));
-        return dskOpenApiUtil.responsePage(map);
+        return BeanUtil.toBean(map, R.class);
     }