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

dsk-common/src/main/java/com/dsk/common/dtos/OpRegionalEconomicRegionalCompareDto.java

 package com.dsk.common.dtos;
 
-import lombok.Data;
+import cn.hutool.core.util.ObjectUtil;
 
 import java.util.List;
 
@@ -11,7 +11,6 @@ import java.util.List;
  * @Date 2023/5/23 14:05
  * @Version
  */
-@Data
 public class OpRegionalEconomicRegionalCompareDto {
 
     /**
@@ -20,4 +19,34 @@ public class OpRegionalEconomicRegionalCompareDto {
     private Integer year;
 
     private List<OpRegionalEconomicDataStatisticsRegionalDto> compareList;
+
+
+    public Integer getYear() {
+        return year;
+    }
+
+    public void setYear(Integer year) {
+        this.year = year;
+    }
+
+    public List<OpRegionalEconomicDataStatisticsRegionalDto> getCompareList() {
+        if (ObjectUtil.isNotEmpty(compareList)) {
+            for (OpRegionalEconomicDataStatisticsRegionalDto dataStatisticsRegionalDto : compareList) {
+                dataStatisticsRegionalDto.setYear(year);
+            }
+        }
+        return compareList;
+    }
+
+    public void setCompareList(List<OpRegionalEconomicDataStatisticsRegionalDto> compareList) {
+        this.compareList = compareList;
+    }
+
+    @Override
+    public String toString() {
+        return "OpRegionalEconomicRegionalCompareDto{" +
+                "year=" + year +
+                ", compareList=" + compareList +
+                '}';
+    }
 }

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

@@ -127,6 +127,13 @@ export function regionalCompare(param) {
     data: param
   })
 }
+export function multipleCompare(param) {
+  return request({
+    url: '/economic/regional/multipleCompare',
+    method: 'POST',
+    data: param
+  })
+}
 
 
 

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -365,7 +365,7 @@ export default {
       let customerId = row.customerId
       let companyId = row.companyId
       let path = type
-      if(companyId == null){
+      if(type == "" && companyId == null){
         path = 'business'
       }
       this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -245,7 +245,7 @@ export default {
                 this.$nextTick(() => {
                   this.isCustomer = true
                   this.isCompany = false
-                  this.currentPath.pathName = 'business'
+                  this.currentPath.pathName = this.$route.query.path || 'business'
                   this.companyInfo = {
                     companyName: this.customerInfo.companyName
                   }

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

@@ -102,7 +102,7 @@
 
 <script>
   import dataRegion from '@/assets/json/dataRegion'
-  import { regionalCompare,getYears } from '@/api/macro/macro'
+  import { regionalCompare,getYears,multipleCompare } from '@/api/macro/macro'
 export default {
   name: 'comparison',
   props:['dataQuery','provinceId'],
@@ -287,7 +287,8 @@ export default {
       value3Flag:false,
       value4Flag:false,
       value5Flag:false,
-      regionData:[]
+      regionData:[],
+      compareList:[{},{},{},{},{}]
     }
   },
   watch: {
@@ -302,19 +303,32 @@ export default {
       this.yearOptions=res.data.reverse();
       this.queryParams.year = this.yearOptions[0].year;
       if(this.dataQuery.pId){
-        const params = { year: this.queryParams.year,type:3}
+        let item={}
         if(this.provinceId.length >= 0){
-          params.provinceId=this.provinceId[0]
+          item.provinceId=this.provinceId[0]
         }
         if(this.provinceId.length >= 1){
-          params.cityId=this.provinceId[1]
+          item.cityId=this.provinceId[1]
         }
         if(this.provinceId.length >= 2){
-          params.areaId=this.provinceId[2]
+          item.areaId=this.provinceId[2]
         }
+        if(this.dataQuery.id){
+          item.id=this.dataQuery.id
+        }
+        this.compareList.splice(0,1,item);
         this.value1Flag=true
         this.addressValue1=this.dataQuery.province.join('-')
-        this.getData(params,1)
+
+        let list=[];
+        for (let i=0; i<this.compareList.length; i++){
+          if(this.compareList[i].provinceId){
+            list.push(this.compareList[i])
+          }
+        }
+        let params={}
+        params.compareList=list;
+        this.getData(params)
       }
     })
   },
@@ -329,13 +343,19 @@ export default {
     }
   },
   methods: {
-    getData(params,index){
-      if(this.dataQuery.id){
-        params.id=this.dataQuery.id
-      }
-      regionalCompare(params).then(res => {
+    getData(params){
+      params.year=this.queryParams.year;
+      multipleCompare(params).then(res => {
         if(res.data){
-          this.tableData.splice(index-1,1,res.data)
+          let arr=[]
+          for (let i=0; i<this.compareList.length; i++){
+            if(this.compareList[i].provinceId){
+              arr.push(i)
+            }
+          }
+          for (let j=0; j<res.data.length; j++){
+            this.tableData.splice(arr[j],1,res.data[j])
+          }
           this.$forceUpdate();
         }
       })
@@ -413,21 +433,34 @@ export default {
               this.value5Flag=true
               break;
           }
-          const params = { year: this.queryParams.year,type:3 }
+          const params = {}
           let code=[];
           for (var i in this.regionData) {
             code=this.regionData[i].path
           }
+          let item={}
           if(code.length >= 1){
-            params.provinceId=code[0]
+            item.provinceId=code[0]
           }
           if(code.length >= 2){
-            params.cityId=code[1]
+            item.cityId=code[1]
           }
           if(code.length >= 3){
-            params.areaId=code[2]
+            item.areaId=code[2]
           }
-          this.getData(params,index)
+          if(this.dataQuery.id){
+            item.id=this.dataQuery.id
+          }
+          this.compareList.splice(index-1,1,item);
+
+          let list=[];
+          for (let i=0; i<this.compareList.length; i++){
+            if(this.compareList[i].provinceId){
+              list.push(this.compareList[i])
+            }
+          }
+          params.compareList=list;
+          this.getData(params)
         }
       }
     },
@@ -538,12 +571,20 @@ export default {
           break;
       }
       this.tableData.splice(index-1,1,{})
-
+      this.compareList.splice(index-1,1,{})
       this.$forceUpdate();
     },
     handleSelect(val){
-      const params = { year: this.queryParams.year,type:3 }
-
+      console.log(val)
+      let list=[];
+      for (let i=0; i<this.compareList.length; i++){
+        if(this.compareList[i].provinceId){
+          list.push(this.compareList[i])
+        }
+      }
+      const params = {}
+      params.compareList=list;
+      this.getData(params)
     },
     formatStatus: function(row, column, cellValue) {
       if(row.title === '经济'||row.title === '财政'||row.title === '债务'){

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

@@ -129,15 +129,19 @@ export default {
         endTime=this.queryParams.year+'-12-31';
       }
       bidGroupCountByProjectType({startDate:startTime,endDate:endTime}).then(res => {
-        let list=[]
-        for(let i=0; i<res.data.length; i++){
-          let item={};
-          item.name=res.data[i].type
-          item.value=res.data[i].count
-          list.push(item);
+        if(res.code === 200){
+          let list=[]
+          for(let i=0; i<res.data.length; i++){
+            let item={};
+            item.name=res.data[i].type
+            item.value=res.data[i].count
+            list.push(item);
+          }
+          this.data=list;
+          if(list.length > 0){
+            this.initChart()
+          }
         }
-        this.data=list;
-        this.initChart()
       })
     },
     initChart() {

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

@@ -165,10 +165,13 @@ export default {
       data.provinceId=item.provinceId;
       data.cityId=item.cityId;
       data.areaId=item.areaId;
-      if(item.area){
-        data.province=item.area;
+      if(item.cityId){
+        data.province=[item.province,item.city];
+        if(item.areaId){
+          data.province=[item.province,item.city,item.area];
+        }
       }else {
-        data.province=item.province;
+        data.province=[item.province];
       }
       this.$parent.handleClick('first',data);
     }

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

@@ -676,6 +676,7 @@ export default {
     },
     childMethod() {
       let data=this.dataQuery
+      console.log(this.dataQuery,"||||||||")
       data.pId=this.dataQuery.provinceId
       this.$parent.handleClick('four',data);
     }

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

@@ -66,14 +66,15 @@ export default {
     //   params.provinceId=this.dataQuery.provinceId
     // }
     if(this.dataQuery.provinceId){
-      this.province=this.dataQuery.province;
+      this.province=this.dataQuery.province[this.dataQuery.province.length-1];
       this.provinceId.push(this.dataQuery.provinceId)
     }else {
       location({}).then(res => {
         this.province=res.data.province;
         if(!this.dataQuery.provinceId){
           this.dataQuery.provinceId=res.data.provinceId
-          this.dataQuery.province=this.province;
+          let arr=[this.province]
+          this.dataQuery.province=arr;
           this.provinceId.push(res.data.provinceId)
         }else {
           this.provinceId.push(this.dataQuery.provinceId)
@@ -112,7 +113,8 @@ export default {
             this.provinceId.push(item.areaId)
           }
         }
-        this.province=item.province;
+        this.province=item.province[item.province.length-1];
+        this.dataQuery=item;
       }
       // sessionStorage.setItem('currentTab', this.activeName)
     },

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

@@ -311,6 +311,13 @@ export default {
     padding: 0;
   }
   .qyzx{
+    .query-ability{
+      span{
+        font-weight: 400;
+        color: #3D3D3D;
+        font-size: 12px;
+      }
+    }
     .content{
       background: #ffffff;
       padding: 16px;

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

@@ -325,6 +325,9 @@
   .qgjjdq{
     .query-box{
       margin: -8px 0 8px 0;
+      .a-link:hover{
+        text-decoration:none;
+      }
       .query-params{
         .el-form{
           margin-left: 24px;

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

@@ -174,8 +174,8 @@
           <el-table-column prop="biddingCount" label="招标数量" :formatter="formatStatus" sortable="custom"  width="110" align="right"/>
           <el-table-column prop="landInfoCount" label="城投拿地" :formatter="formatStatus" sortable="custom" width="100" align="right"/>
           <el-table-column prop="supplierCount" label="供应商" :formatter="formatStatus" sortable="custom" width="100" align="right"/>
-          <!--<el-table-column prop="bratingSubjectLevel" label="主体评级" :formatter="formatStatus" sortable="custom" width="110" />-->
           <el-table-column prop="bondBalance" label="债券余额（亿元）" :formatter="formatStatus" sortable="custom" width="140" align="right"/>
+          <el-table-column prop="bratingSubjectLevel" label="主体评级" :formatter="formatStatus" width="110" />
           <el-table-column prop="uipExecutiveLevel" label="行政级别" :formatter="formatStatus" width="110" />
           <el-table-column prop="shareholderBg" label="股东背景" :formatter="formatStatus" width="110" />
           <el-table-column prop="equityRelationship" label="股权关系" :formatter="formatStatus" width="110" />

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -99,9 +99,9 @@
       <div class="titles">项目明细
       <div class="dc">
         <div class="total">共{{total}}条</div>
-        <el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">
-          <div class="btn-export"><img src="@/assets/images/EXCEL.png">导出EXCEL</div>
-        </el-tooltip>
+        <!--<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">-->
+          <div class="btn-export" @click="dc"><img src="@/assets/images/EXCEL.png">导出EXCEL</div>
+        <!--</el-tooltip>-->
       </div>
       </div>
       <div class="tables" v-if="total == 0">
@@ -261,6 +261,9 @@ export default {
     })
   },
   methods: {
+    dc(){
+      this.$message.warning('功能正在开发中')
+    },
     deldetail(index){
       this.ondel = index
     },