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

dsk-operate-ui/src/views/component/skeleton.vue

+<template>
+  <el-skeleton  animated>
+    <template slot="template">
+      <el-skeleton-item variant="text" style="width: 60%;"/>
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 60%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+    </template>
+  </el-skeleton>
+</template>
+
+<script>
+  export default {
+    name: 'skeleton'
+  }
+</script>
+
+<style lang="scss" scoped>
+.el-skeleton__item{
+  height: 20px;
+  border-radius: 0;
+  margin: 9px 0;
+  background: #f0f0f0;
+}
+</style>

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -48,7 +48,6 @@
       <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
       <tables
         v-if="!isSkeleton"
-        :indexFixed="true"
         :defaultSort="defaultSort"
         :tableLoading="tableLoading"
         :tableData="tableData"
@@ -106,10 +105,6 @@
           { type: 3, fieldName: 'searchValue', value: '', placeholder: '输入关键词查询'},
         ],
         cycj:[
-          {
-            name:'子集团',
-            value:'子集团'
-          },
           {
             name:'集团本身',
             value:'集团本身'
@@ -126,6 +121,10 @@
             name:'三级企业',
             value:'三级企业'
           },
+          {
+            name:'四级企业',
+            value:'四级企业'
+          },
           {
             name:'其他企业',
             value:'其他企业'
@@ -202,7 +201,17 @@
         memberCount({combineId: this.queryParams.combineId}).then(res=>{
           let data = res.data
           let list=[]
+          let qtArr=[]
           for(let key in data){
+            if(key === '其他'){
+              qtArr.push({
+                name:  key+ '（' + data[key] + '）',
+                value: key,
+                key:data[key],
+                disabled:data[key] !=0 ? false : true
+              })
+            }else {
+              if(data[key] !=0){
                 list.push({
                   name:  key+ '（' + data[key] + '）',
                   value: key,
@@ -210,9 +219,12 @@
                   disabled:data[key] !=0 ? false : true
                 })
               }
-          list.sort(function(a, b) {
-            return b.key - a.key;
-          });
+            }
+          }
+          list=list.concat(qtArr)
+          // list.sort(function(a, b) {
+          //   return b.key - a.key;
+          // });
           this.formData[1].options=list
         })
       },
@@ -339,8 +351,10 @@
         this.handleQuery();
       },
       getAreaList(params){
+        console.log(params)
         if(params.province&&params.province.length>0){
           let arr = this.$children[0].$refs.cascader[0].getCheckedNodes()
+          console.log(this.$children[0].$refs.cascader)
           let provinceIds = [], cityIds = [], districtIds = []
           for (var i in arr) {
             if (arr[i].parent) {

dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue

@@ -15,7 +15,6 @@
     <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
     <tables
       v-if="!isSkeleton"
-      :indexFixed="true"
       :defaultSort="defaultSort"
       :tableLoading="tableLoading"
       :tableData="tableData"
@@ -47,7 +46,7 @@
 <script>
   import mixin from '../../party-a/mixins/mixin'
   import {businessList} from '@/api/detail/groupAccount/groupAccount'
-  import dataRegion from '@/assets/json/dataRegion'
+  import dataRegion from '@/assets/json/dataRegion1'
   import { getDictType } from '@/api/main'
   export default {
     name: 'qualifications',
@@ -66,23 +65,23 @@
           pageSize: 20
         },
         forData: [
-          {label: '中标时间', prop: 'bidTime',slot: true,minWidth: '100'},
-          {label: '中标成员', prop: 'companyName', slot: true,minWidth: '150'},
-          {label: '持股比例（%）', prop: 'stockPercent',minWidth: '150'},
-          {label: '项目名称', prop: 'projectName', slot: true,minWidth: '200'},
-          {label: '中标金额（万元）', prop: 'bidAmount',minWidth: '150'},
-          {label: '中标地区', prop: 'address',minWidth: '100'},
+          {label: '中标时间', prop: 'bidTime',slot: true,minWidth: '80'},
+          {label: '中标成员', prop: 'companyName', slot: true,minWidth: '190'},
+          {label: '持股比例（%）', prop: 'stockPercent',minWidth: '95'},
+          {label: '项目名称', prop: 'projectName', slot: true,minWidth: '260'},
+          {label: '中标金额（万元）', prop: 'bidAmount',minWidth: '110'},
+          {label: '中标地区', prop: 'address',minWidth: '80'},
           {label: '业绩类型', prop: 'boundType',minWidth: '100'},
           {label: '项目类型', prop: 'projectType',minWidth: '100'},
-          {label: '业主单位', prop: 'projectUnit', slot: true,minWidth: '200'},
+          {label: '业主单位', prop: 'projectUnit', slot: true,minWidth: '190'},
         ],
         formData: [
           { type: 7, fieldName: 'province', value: '',props: {multiple: true,value: 'id',expandTrigger: 'hover'}, placeholder: '项目地区', options:[]},
           { type: 5, fieldName: 'time', value: '', placeholder: '中标时间', startTime: 'startBidTime', endTime: 'endBidTime',timeList:[] },
           { type: 6, fieldName: 'money', value: '', placeholder: '中标金额', startMoney: 'minAmount', endMoney: 'maxAmount',moneyList:[] },
-          { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: []},
-          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: []},
-          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: []},
+          { type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150},
+          { type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150},
+          { type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:100},
           { type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'},
         ],
         tableData:[],
@@ -211,6 +210,13 @@
             }
           }
         }
+        for (var i=0; i<str.length; i++) {
+          if (str[i].children.length) {
+
+          } else {
+            delete str[i].children
+          }
+        }
         this.addressList = str;
         this.formData[0].options=str;
       },

dsk-operate-ui/src/views/detail/groupAccount/component/qualifications.vue

@@ -11,7 +11,6 @@
     <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
     <tables
       v-if="!isSkeleton"
-      :indexFixed="true"
       :defaultSort="defaultSort"
       :tableLoading="tableLoading"
       :tableData="tableData"

dsk-operate-ui/src/views/detail/groupAccount/component/qualificationsDetail.vue

@@ -9,7 +9,6 @@
       <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
       <tables
         v-if="!isSkeleton"
-        :indexFixed="true"
         :tableLoading="tableLoading"
         :tableData="tableData"
         :forData="forData"

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

@@ -249,7 +249,7 @@ export default {
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
-            border-radius: 2px;
+            border-radius: 4px;
           }
         }
       }

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

@@ -48,7 +48,7 @@
                 multiple
                 collapse-tags
                 clearable
-                style="max-width: 170px"
+                :style="form.width?'width:'+form.width+'px':'max-width: 170px'"
                 :placeholder="form.placeholder"
                 @change="changeSelect">
                 <el-option v-for="(item, index) in form.options" :key="index" :label="item.name" :value="item.value"/>
@@ -153,6 +153,7 @@ export default {
   },
   methods: {
     changeSelect(){
+      console.log("111")
       this.$emit('handle-search')
     },
     clickEXCEL() {
@@ -182,6 +183,7 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
+    border-radius: 4px;
   }
   ::v-deep .el-form-item{
     margin-right: 8px !important;
@@ -192,6 +194,7 @@ export default {
   ::v-deep .el-cascader{
     height: 34px;
     line-height: 34px;
+    width: 190px;
     .el-input{
       input{
         height: 34px !important;
@@ -201,9 +204,12 @@ export default {
       flex-wrap: inherit;
       margin-top: 1px;
       .el-tag{
-        max-width: 120px;
+        max-width: 100px;
       }
     }
+    .el-input__suffix{
+      top: 1px;
+    }
   }
   .headForm-from {
     display: flex;
@@ -277,7 +283,7 @@ export default {
       .el-select__tags{
         .el-tag{
           &:first-child{
-            width: 90px;
+            width: 70px;
           }
         }
       }

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

@@ -144,7 +144,8 @@
       <div class="content_wap3">
         <el-tabs v-model="activeName" @tab-click="handleClickTab">
           <el-tab-pane label="大项目最新中标" name="first">
-            <div class="list">
+            <skeleton v-if="zxzbIsSkeleton" style="padding: 16px"></skeleton>
+            <div class="list" v-if="!zxzbIsSkeleton">
               <div class="item" v-for="(item,index) in projectList" :key="index">
                 <p class="list-title"><router-link :to="`/biddetail/${item.id}`" tag="a" class="a-link" v-if="item.id" v-html="item.projectName"></router-link></p>
                 <div class="list-content">
@@ -167,7 +168,7 @@
                 </div>
               </div>
             </div>
-            <div class="pagination-box" v-if="totalCount>queryParams2.pageSize">
+            <div class="pagination-box" v-if="totalCount>queryParams2.pageSize && !zxzbIsSkeleton">
               <el-pagination background :current-page="queryParams2.pageNum" :page-size="queryParams2.pageSize" :total="totalCount" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
             </div>
           </el-tab-pane>
@@ -428,11 +429,12 @@
   import "@/assets/styles/public.css";
   import CustomTimeSelect from './component/CustomTimeSelect'
   import CustomMoneySelect from './component/CustomMoneySelect'
+  import skeleton from './component/skeleton'
   import { bigWinningBidsPage,bigBidPage } from '@/api/index'
 export default {
   name: "Index",
   components: {
-    CustomTimeSelect,CustomMoneySelect,
+    CustomTimeSelect,CustomMoneySelect,skeleton
   },
   data() {
     return {
@@ -683,8 +685,7 @@ export default {
       zbList:[],
       totalCount:0,
       zbTableTotal:0,
-
-
+      zxzbIsSkeleton:true,
     };
   },
   created() {
@@ -700,8 +701,10 @@ export default {
   methods: {
     getBigWinningBidsPage(){
       let params={}
+      this.zxzbIsSkeleton=true
       bigWinningBidsPage(this.queryParams2).then(res=>{
         console.log(res)
+        this.zxzbIsSkeleton=false;
         if(res.code == 200){
           this.projectList=res.rows;
           this.totalCount=res.total;
@@ -710,7 +713,7 @@ export default {
     },
     getBigBidPage(){
       let params={}
-      bigBidPage(this.queryParams3).then(res=>{
+      bigBidPage(this.queryParams2).then(res=>{
         console.log(res)
         if(res.code == 200){
           this.zbList=res.rows;

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

 <template>
   <div class="regionalEconomy">
     <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
-    <div v-if="!isSkeleton">
+    <div v-if="state && !isSkeleton">
       <div class="content content1">
         <div class="common-title">经济数据</div>
         <div class="content-box">
@@ -101,7 +101,11 @@
         </div>
       </div>
     </div>
-
+    <div class="empty" v-if="!state && !isSkeleton">
+      <img class="img" src="@/assets/images/project/empty.png">
+      <div class="p1">抱歉，没找到相关数据</div>
+      <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
+    </div>
   </div>
 </template>
 
@@ -288,7 +292,8 @@ export default {
       valData4:[],
       recentlyYear:{},
       nextYearMap:{},
-      isSkeleton:true
+      isSkeleton:true,
+      state:true,
     }
   },
   created() {
@@ -342,6 +347,8 @@ export default {
       }
       regional(params).then(res => {
         this.isSkeleton = false
+        if(res.data[0].recentlyYear){
+          this.state=true;
           this.recentlyYear=res.data[0].recentlyYear;
           this.nextYearMap=res.data[0].nextYearMap;
           this.valData=[this.getMoneyNum(this.nextYearMap.gdp),this.getMoneyNum(this.recentlyYear.gdp)]
@@ -356,12 +363,18 @@ export default {
             this.initChart3()
             this.initChart4()
           })
+        }else {
+          this.recentlyYear={};
+          this.nextYearMap={};
+          this.state=false;
+        }
       })
       regionalList(params).then(res => {
         this.tableData=res.data;
       })
     },
     initChart() {
+      this.$nextTick(() => {
         let myChart = echarts.init(document.getElementById("echartsGDP"))
         let option ={
           tooltip: {
@@ -423,8 +436,10 @@ export default {
         window.addEventListener("resize", function () {
           myChart.resize();//图表跟随页面大小变化宽度
         });
+      })
     },
     initChart1(){
+      this.$nextTick(() => {
         let myChartZS = echarts.init(document.getElementById("echartsZS"))
         let option ={
           tooltip: {
@@ -485,8 +500,10 @@ export default {
         window.addEventListener("resize", function () {
           myChartZS.resize();//图表跟随页面大小变化宽度
         });
+      })
     },
     initChart2(){
+      this.$nextTick(() => {
         let myChartRK = echarts.init(document.getElementById("echartsRK"))
         let option ={
           tooltip: {
@@ -547,8 +564,10 @@ export default {
         window.addEventListener("resize", function () {
           myChartRK.resize();//图表跟随页面大小变化宽度
         });
+      })
     },
     initChart3(){
+      this.$nextTick(() => {
         let myChartSR = echarts.init(document.getElementById("echartsSR"))
         let option ={
           tooltip: {
@@ -609,8 +628,10 @@ export default {
         window.addEventListener("resize", function () {
           myChartSR.resize();//图表跟随页面大小变化宽度
         });
+      })
     },
     initChart4(){
+      this.$nextTick(() => {
         let myChartYE = echarts.init(document.getElementById("echartsYE"))
         let option ={
           tooltip: {
@@ -672,6 +693,7 @@ export default {
         window.addEventListener("resize", function () {
           myChartYE.resize();//图表跟随页面大小变化宽度
         });
+      })
     },
     formatStatus: function(row, column, cellValue) {
       if(row.title === '经济'||row.title === '财政'||row.title === '债务'){
@@ -885,5 +907,27 @@ export default {
         }
       }
     }
+
+    .empty{
+      margin: 0 auto;
+      height: 600px;
+      text-align: center;
+      border-top: 1px solid #EFEFEF;
+      .img{
+        width: 108px;
+        height: 108px;
+        margin-bottom: 24px;
+        margin-top: 150px;
+      }
+      .p1{
+        color: #333333;
+        font-size: 16px;
+      }
+      .p2{
+        color: #999999;
+        font-size: 14px;
+        margin-top: 8px;
+      }
+    }
   }
 </style>

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

@@ -368,10 +368,6 @@
       .table-item{
         /*position: relative;*/
         .empty{
-          /*position: absolute;*/
-          /*top: 50%;*/
-          /*left: 50%;*/
-          /*transform: translate(-50%,-50%);*/
           margin: 0 auto;
           height: 600px;
           text-align: center;

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

@@ -140,6 +140,12 @@ public class EnterpriseService {
         statisticMapData.put("performance", performance);
         statisticMapData.put("business", business);
 
+        Map<String, Object> combineMemberMap = dskOpenApiUtil.requestBody("/operate/enterprise/combineMember", paramMap);
+        Integer code = MapUtils.getInteger(combineMemberMap, "code", 300);
+        statisticMapData.put("combineMember", null);
+        if (code.equals(HttpStatus.OK.value())) {
+            statisticMapData.put("combineMember", MapUtils.getMap(combineMemberMap, "data", null));
+        }
         return R.ok(statisticMapData);
     }