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

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

@@ -11,7 +11,7 @@
             </el-select>
           </div>
         </div>
-        <div class="content_box" v-if="gyfsList.length > 0">
+        <div class="content_box" v-if="gyflState">
           <div class="box-left">
             <div id="echarts1" style="height: 280px"></div>
           </div>
@@ -36,7 +36,7 @@
             </el-table>
           </div>
         </div>
-        <div class="empty" v-if="gyfsList.length === 0">
+        <div class="empty" v-if="!gyflState">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，暂无数据展示</div>
         </div>
@@ -50,7 +50,7 @@
             </el-select>
           </div>
         </div>
-        <div class="content_box" v-if="tdytList.length > 0 && !isSkeleton">
+        <div class="content_box" v-if="tdytState">
           <div class="box-left">
             <div id="echarts2" style="height: 280px"></div>
           </div>
@@ -75,7 +75,7 @@
             </el-table>
           </div>
         </div>
-        <div class="empty" v-if="tdytList.length === 0 && !isSkeleton">
+        <div class="empty" v-if="!tdytState">
           <img class="img" src="@/assets/images/project/empty.png">
           <div class="p1">抱歉，暂无数据展示</div>
         </div>
@@ -184,6 +184,9 @@ export default {
       topList:[],
       nftjList:[],
       isSkeleton:true,
+      gyflState:true,
+      tdytState:true,
+      topState:true,
       // typeName:['住宅用地','工业用地','城镇住宅用地','其他商服用地','公共设施用地','公路用地','城镇村道路用地','公园与绿地',
       //   '工矿仓储用地','零售商业用地','科研用地','街巷用地','机关团体用地','商服用地','商务金融用地']
     }
@@ -219,9 +222,12 @@ export default {
           list.push(obj)
         }
         if(list.length > 0){
+          this.gyflState=true
           this.$nextTick(() => {
             this.initChart1(list)
           })
+        }else {
+          this.gyflState=false;
         }
       })
     },
@@ -231,6 +237,7 @@ export default {
         // this.isSkeleton = false
         this.tdytList=res.data.provinceDate;
         if(res.data.provinceDate.length > 0){
+          this.tdytState=true
           var list=[];
           for(var i=0;i<10;i++){
             var obj={};
@@ -244,6 +251,8 @@ export default {
               this.initChart2(list)
             })
           }
+        }else {
+          this.tdytState=false;
         }
 
       })
@@ -282,6 +291,7 @@ export default {
         this.nftjList=res.data.yearDate;
         var list=[];
         if(res.data.yearDate){
+          this.topState=true
           for(var i=0;i<res.data.yearDate.length;i++){
             var obj={};
             obj.type=res.data.yearDate[i].type;
@@ -293,6 +303,8 @@ export default {
           this.$nextTick(() => {
             this.initChart4(list)
           })
+        }else {
+          this.topState=false;
         }
       })
     },
@@ -749,7 +761,7 @@ export default {
         margin-right: 24px;
       }
       ::v-deep .form-content-width{
-        width: 135px;
+        width: 150px;
         .el-select__input{
           width: 10px !important;
           max-width: 10px !important;

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

@@ -66,7 +66,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="countRate" label="占比（%）" align="right" :formatter="formatStatus" width="160" />
+              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="160" />
             </el-table>
           </div>
         </div>
@@ -79,7 +79,7 @@
         <div class="flex-box query-box">
           <div class="flex-box query-params">
             <span class="common-title">全国各年度招标月份统计</span>
-            <el-select v-model="years2" @change="handleYears(2)" multiple collapse-tags filterable class="form-content-width" placeholder="请选择" :popper-append-to-body='false' size="small">
+            <el-select v-model="years2" @change="handleYears(2)" collapse-tags filterable class="form-content-width" placeholder="请选择" :popper-append-to-body='false' size="small">
               <el-option v-for="(item, index) in yearOptions" :key="index" :label="item" :value="item" />
             </el-select>
           </div>
@@ -137,23 +137,22 @@
         addressList:[],
         address:[],
         years1:[2023],
-        years2:[2023],
+        years2:2023,
         yearOptions:[],
         xmtjList:[],
         topList:[],
         zbyfList:[],
         isSkeleton:true,
+        gyflState:true,
+        tdytState:true,
       }
     },
     created() {
       this.dataRegion()
       this.yearsData()
-      setTimeout(() => {
-        this.isSkeleton=false;
       this.getcountNewsBidByYear()
       this.getCountNewsBidByProvince()
       this.getCountNewsBidByMonth()
-      }, 1000);
     },
     mounted() {
     },
@@ -162,7 +161,9 @@
     },
     methods: {
       getcountNewsBidByYear(){
+        this.isSkeleton=true;
         countNewsBidByYear().then(res => {
+          this.isSkeleton=false;
           this.xmtjList=res.data.provinceDate;
           this.$nextTick(() => {
             this.initChart1(res.data.provinceDate)
@@ -188,7 +189,7 @@
         })
       },
       getCountNewsBidByMonth(){
-        countNewsBidByMonth({yearStr:this.years2.join(",")}).then(res => {
+        countNewsBidByMonth({yearStr:this.years2}).then(res => {
           this.zbyfList=res.data.monthDate;
           if(res.data.monthDate.length > 0){
             this.$nextTick(() => {
@@ -301,7 +302,7 @@
               top:30,
               left:100,
               right:20,
-              bottom:60,
+              bottom:30,
             },
             color:['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'],
             series: seriesData
@@ -417,7 +418,7 @@
               top:30,
               left:100,
               right:20,
-              bottom:60,
+              bottom:30,
             },
             color:['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'],
             series: seriesData
@@ -532,7 +533,7 @@
               top:30,
               left:80,
               right:40,
-              bottom:60,
+              bottom:30,
             },
             color:['#FCD68A', '#FFE48A', '#FFB8AD', '#FFD7AD', '#A9F1E5', '#D0FAB7', '#ADC0FF', '#BEECFF', '#81D5BC', '#67B3FD', '#E9C8FF', '#56BFA1', '#6799FD'],
             series: seriesData
@@ -666,7 +667,7 @@
         margin-right: 24px;
       }
       ::v-deep .form-content-width{
-        width: 135px;
+        width: 150px;
         .el-select__input{
           width: 10px !important;
           max-width: 10px !important;

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

@@ -28,7 +28,7 @@ export default {
   },
   data() {
     return {
-      activeName: 'first'
+      activeName: 'second'
     }
   },
   created() {

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

@@ -121,10 +121,13 @@
     },
     created(){
       this.getList()
+      this.getCount()
+    },
+    methods:{
+      getCount(){
         let params={
           ...this.searchPram,
           state:2,
-        // cancelHttp: true
         }
         getGZDB(params).then(result=>{
           this.datalist = result.code == 200?result:[]
@@ -133,7 +136,6 @@
           }
         })
       },
-    methods:{
       getEdit(){
         this.isEdit = true;
         this.value = ""
@@ -192,6 +194,7 @@
             this.$message.error(result.msg)
           }
         })
+        this.getCount()
       },
       getYQ(){
         let state = this.searchPram.state

dsk-system/src/main/java/com/dsk/system/domain/customer/ContactInfo.java

@@ -32,7 +32,7 @@ public class ContactInfo implements Serializable {
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Integer businessId;
     /**
      * 姓名
      */

dsk-system/src/main/java/com/dsk/system/domain/customer/dto/ContactInfoSearchDto.java

@@ -13,7 +13,7 @@ public class ContactInfoSearchDto implements Serializable {
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Integer businessId;
     /**
      * 企业名称
      */

dsk-system/src/main/java/com/dsk/system/domain/customer/vo/ContactInfoListVo.java

@@ -29,7 +29,7 @@ public class ContactInfoListVo implements Serializable {
     /**
      * 项目id
      */
-    private Integer projectId;
+    private Integer businessId;
     /**
      * 项目名称
      */
@@ -66,6 +66,10 @@ public class ContactInfoListVo implements Serializable {
      * 企业名称
      */
     private String companyName;
+    /**
+     * 备注
+     */
+    private String remark;
     /**
      * 更新人
      */

dsk-system/src/main/resources/mapper/system/customer/ContactInfoMapper.xml

@@ -4,14 +4,14 @@
 
     <select id="selectPageList" resultType="com.dsk.system.domain.customer.vo.ContactInfoListVo">
         select
-            cc.id, cc.customer_id, cc.project_id, bi.project_name, cc.name, cc.sex, cc.role,
-            cc.position, cc.contact_information, cc.company_id, cc.uip_id, cc.company_name,
+            cc.id, cc.customer_id, cc.business_id, bi.project_name, cc.name, cc.sex, cc.role,
+            cc.position, cc.contact_information, cc.company_id, cc.uip_id, cc.company_name, cc.remark,
             cc.update_by
         from contact_info cc
-        left join business_info bi on cc.project_id = bi.id
+        left join business_info bi on cc.business_id = bi.id
         <where>
             <if test="customerId != null and customerId !='' "> and (cc.customer_id = #{customerId} or bi.customer_id = #{customerId})</if>
-            <if test="projectId != null "> and cc.project_id = #{projectId} </if>
+            <if test="businessId != null "> and cc.business_id = #{businessId} </if>
         </where>
         order by cc.create_time desc
     </select>