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

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

@@ -7,7 +7,7 @@
     </el-tabs>
     <div class="flex-box clue-box">
       <div class="clue-echarts" v-if="viewData.length>0"><div id="echartsClue" style="width: 100%;height:300px; margin: 0 auto;"></div></div>
-      
+
       <div class="table-item" v-if="viewData.length>0">
         <el-table
           v-if="viewData.length>0"

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

@@ -283,6 +283,20 @@ export default {
   }
   ::v-deep .table-item{
     .el-table{
+      overflow:visible;
+      .el-table__body-wrapper{
+        overflow:visible;
+      }
+      .el-table__body{
+        tr:first-child{
+          position: sticky;
+          top:56px;
+          z-index: 9;
+        }
+      }
+      td.el-table__cell{
+        border-bottom: 0;
+      }
       .el-table__body-wrapper{
         tr{
           &:first-child{

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

@@ -114,14 +114,23 @@ export default {
       }
       bidMoneyGroupByProjectType(params).then(res => {
         if(res.data.length > 0){
-          let list=res.data[1].type
-          for (let i=0; i<res.data[0].type.length; i++){
-            for (let j=0; j<list.length; j++){
-              if(res.data[0].type[i].projectType === list[j].projectType){
-                list[j].lastMoney=res.data[0].type[i].money;
-                list[j].lastRate=res.data[0].type[i].rate;
+          let list=[]
+          if(res.data.length > 1){
+            list=res.data[1].type
+            for (let i=0; i<res.data[0].type.length; i++){
+              for (let j=0; j<list.length; j++){
+                if(res.data[0].type[i].projectType === list[j].projectType){
+                  list[j].lastMoney=res.data[0].type[i].money;
+                  list[j].lastRate=res.data[0].type[i].rate;
+                }
               }
             }
+          }else {
+            list=res.data[0].type
+            for (let i=0; i<list.length; i++){
+              list[i].lastMoney=0;
+              list[i].lastRate=0;
+            }
           }
           for(let i=0; i<list.length; i++){
             list[i].money=list[i].money ? Number(list[i].money).toFixed(2) : '-';
@@ -189,6 +198,8 @@ export default {
         //鼠标悬停时显示的样式
         tooltip: {
           extraCssText:'width:120px!important;',
+          backgroundColor:"rgba(255, 255, 255, 0.8)",
+          borderWidth:'0',
           formatter: function (params){
             var result = ''
             result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.name +'</p>'

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">
+    <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+    <div v-if="!isSkeleton" class="content">
       <div class="common-title">专项债项目</div>
       <div class="content-box" v-if="!state">
         <div class="box-left">
@@ -14,7 +15,7 @@
             border
             :summary-method="getSummaries"
             show-summary
-            height="400"
+            max-height="400"
             fit
             @sort-change="sortChange"
             highlight-current-row
@@ -34,7 +35,7 @@
         </div>
       </div>
     </div>
-    <div class="content">
+    <div v-if="!isSkeleton" class="content">
       <div class="common-title flex-box">
         <div class="flex-box">项目明细</div>
         <div class="flex-box query-ability">
@@ -44,7 +45,6 @@
       </div>
       <div class="table-item">
         <el-table
-          v-loading="tableLoading"
           :data="listData"
           element-loading-text="Loading"
           @sort-change="sortChange1"
@@ -85,10 +85,11 @@
   import * as echarts from 'echarts';
   import { statistics,projectsPage,location } from '@/api/macro/macro'
   import Region from '../component/region'
+  import skeleton from '../component/skeleton'
 export default {
   name: 'Financing',
   components: {
-    Region
+    Region,skeleton
   },
   data() {
     return {
@@ -96,7 +97,6 @@ export default {
       tableParams:{},
       tableData:[],
       listData:[],
-      tableLoading: false,
       pageIndex: 1,
       pageSize: 10,
       tableDataTotal: 0,
@@ -106,6 +106,7 @@ export default {
       province:'',
       provinceId:[],
       state:false,
+      isSkeleton:true
     }
   },
   created() {
@@ -157,7 +158,7 @@ export default {
   },
   methods: {
     getData(){
-      this.tableLoading = true
+      this.isSkeleton = true
       let params={ pageNum: this.pageIndex, pageSize: this.pageSize}
       if(this.tableParams.field){
         params.field=this.tableParams.field
@@ -175,14 +176,10 @@ export default {
         params.areaId=this.provinceId[2]
       }
       projectsPage(params).then(res => {
-        this.tableLoading = false
+        this.isSkeleton = false
         this.listData=res.data.list;
         this.tableDataTotal = res.data.totalCount
       })
-      // 延迟关闭加载效果
-      // setTimeout(() => {
-      //   this.tableLoading = false
-      // }, 200)
     },
     getStatistics(){
       let params={};

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

@@ -53,7 +53,7 @@ export default {
         },
         {
           prop: 'gdpGrowth',
-          label: 'GDP增速',
+          label: 'GDP增速（%）',
         },
         {
           prop: 'gdpPerCapita',

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

@@ -15,14 +15,14 @@
       <div class="main2">
         <div class="flex-box query-box head">
           <span>{{value}}全国招标总数<span class="number"> {{totalCount}} </span>万个</span>
-          <div class="select-popper" style="position: relative;">
+          <div class="select-popper" style="position: relative;margin-right:0;">
             <el-dropdown
               @command="handleDate"
               trigger="click"
               ref="punishDateShowPopper"
               :hide-on-click="false"
             >
-              <span class="el-dropdown-link" :class="punishDateValue ? 'color_text' : ''">{{punishDateValue}}<i class="el-icon-caret-bottom"></i></span>
+              <span class="el-dropdown-link" :class="punishDateValue ? 'color_text' : ''">{{punishDateValue}}<i class="el-icon-arrow-down" style="color:#313131;"></i></span>
               <div>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item
@@ -625,5 +625,10 @@ export default {
         }
       }
     }
+    ::v-deep .el-input--medium{
+      .el-input__icon{
+        line-height: 32px;
+      }
+    }
   }
 </style>

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

@@ -831,6 +831,9 @@ export default {
       border-radius: 4px;
       .search{
         margin-top: 22px;
+        ::v-deep .el-radio{
+          margin-right: 16px;
+        }
         .search-box{
           display: inline-block;
           margin-right: 32px;
@@ -918,7 +921,7 @@ export default {
               height: 32px;
               line-height: 32px;
               font-size: 12px;
-              padding-left: 6px;
+              padding-left: 8px;
               border-right: 0;
             }
             .el-input__suffix{
@@ -931,6 +934,8 @@ export default {
               background: #F5F5F5;
               color:#0081FF;
               border-left: 0;
+              border-radius: 0;
+              border-right: 0;
             }
           /*}*/
         }

dsk-operate-ui/src/views/project/projectList/component/gzdb.vue

@@ -23,7 +23,7 @@
                 </div>
                 <div class="sels">
                   <img src="@/assets/images/project/ico_2.png">
-                  <el-input v-model="queryParam.target" placeholder="拜访对象" style="width: 100px;">
+                  <el-input v-model="queryParam.target" placeholder="拜访对象" maxlength="500" style="width: 100px;">
                   </el-input>
                 </div>
                   <div class="btn btn_primary h32 wc" @click="add" :class="{'btn_disabled':queryParam.task == ''}">完成</div>
@@ -85,7 +85,7 @@
     },
     data(){
       return{
-        isEdit:false,
+        isEdit:true,
         value:'',
         status:0,
         queryParam:{

dsk-system/src/main/resources/mapper/business/BusinessBacklogMapper.xml

@@ -40,7 +40,7 @@
         ORDER BY create_time DESC
     </select>
 
-    <select id="selectBusinessBacklogById" parameterType="Long" resultMap="BusinessBacklogResult">
+    <select id="selectBusinessBacklogById" resultMap="BusinessBacklogResult">
         <include refid="selectBusinessBacklogVo"/>
         where id = #{id}
     </select>