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

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseBussinessSupplierProjectPageBody.java

@@ -30,7 +30,7 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
      * 供应商企业
      */
     @NotNull(message = "企业不能为空")
-    private Integer companyName;
+    private String companyName;
 
     /**
      * 查询关键字

dsk-operate-ui/src/layout/components/TagsView/index.vue

@@ -30,7 +30,7 @@
     </ul>
     <div class="alltags" v-if="visitedViews.length > 0">
       <div class="" @click="closeall"><i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i></div>
-      <div class="tagslist" v-if="showall">
+      <div class="tagslist" v-show="showall">
         <!--<div v-for="(tag, index) in visitedViews"-->
              <!--:key="tag.path"-->
              <!--:class="isActive(tag)?'active':''"-->
@@ -50,7 +50,7 @@
         >
           <div @click="changetags">
           <i class="el-icon-check"></i>
-          <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+          <span :id="isActive(tag)?'tagTitles':''">{{ tag.title }}</span>
           </div>
         </router-link>
         <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
@@ -120,7 +120,6 @@ export default {
   },
   methods: {
     changetags(){
-      console.log(88)
       this.showall = false
     },
     closeall(){

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

@@ -14,7 +14,9 @@
         :amountTotal="amountTotal"
         @handle-search="handleSearch"
       />
+      <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
       <tables
+        v-else
         :indexFixed="true"
         :tableLoading="tableLoading"
         :tableData="tableData"
@@ -39,6 +41,7 @@
 import mixin from '../../mixins/mixin'
 import {clientProjectPage,getSelect,bidWinMergeDetail} from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
+import skeleton from '@/views/project/projectList/component/skeleton'
 
 export default {
   props: [
@@ -47,12 +50,13 @@ export default {
     'title'
   ],
   components: {
-    HeadDetailForm
+    HeadDetailForm,skeleton
   },
   mixins: [mixin],
   data() {
     return {
       drawer: false,
+      isSkeleton:true,
       queryParams: {
         cid: this.companyId,
         companyId: this.data.companyId,
@@ -113,6 +117,7 @@ export default {
       if(res.code==200){
         this.tableData = res.rows
       }
+      this.isSkeleton = false;
       this.tableDataTotal = res.total
       this.amountTotal = res.totalAmount
     },

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

@@ -14,7 +14,9 @@
         :amountTotal="amountTotal"
         @handle-search="handleSearch"
       />
+      <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
       <tables
+        v-else
         :indexFixed="true"
         :tableLoading="tableLoading"
         :tableData="tableData"
@@ -39,6 +41,7 @@
 import mixin from '../../mixins/mixin'
 import { supplierProjectPage,getSelect,bidWinMergeDetail } from '@/api/detail/party-a/dealings'
 import HeadDetailForm from "../../component/HeadDetailForm"
+import skeleton from '@/views/project/projectList/component/skeleton'
 
 export default {
   props: [
@@ -47,11 +50,12 @@ export default {
     'title'
   ],
   components: {
-    HeadDetailForm
+    HeadDetailForm,skeleton
   },
   mixins: [mixin],
   data() {
     return {
+      isSkeleton:true,
       drawer: false,
       queryParams: {
         companyId: this.data.companyId,
@@ -113,6 +117,7 @@ export default {
       if(res.code==200){
         this.tableData = res.rows
       }
+      this.isSkeleton = false;
       this.tableDataTotal = res.total
       this.amountTotal = res.totalAmount
     },

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

@@ -130,7 +130,7 @@ export default {
     handleClick(e, data) {
       this.rowData = data
       this.isDetails = true;
-      this.title = '与客户'+data.companyName+'合作记录'
+      this.title = '与客户'+data.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,'')+'合作记录'
     },
     handleDetail(row){
       if(row.sourceUrl){

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

@@ -124,7 +124,7 @@ export default {
     handleClick(e, data) {
       this.rowData = data
       this.isDetails = true
-      this.title = '与供应商'+data.companyName+'合作记录'
+      this.title = '与供应商'+data.companyName.replace(/<font color='red'>/g,'').replace(/<\/font>/g,'')+'合作记录'
     },
     handleDetail(row){
       if(row.sourceUrl){

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

@@ -188,6 +188,15 @@ export default {
                       companyName: this.customerInfo.companyName
                     }
                     document.getElementById('tagTitle').innerText = this.customerInfo.companyName
+                    // let lists = this.$store.state.tagsView.visitedViews
+                    // lists.forEach(item=>{
+                    //   if(item.fullPath == this.$route.fullPath){
+                        let titlename = document.getElementById('tagTitles')
+                        if(titlename){
+                          titlename.innerText = this.customerInfo.companyName
+                        }
+                      // }
+                    // })
                   })
                 }
               }
@@ -273,6 +282,15 @@ export default {
         if(this.companyInfo && this.companyInfo.companyName){
           this.$nextTick(()=>{
             document.getElementById('tagTitle').innerText = this.companyInfo.companyName
+            // let lists = this.$store.state.tagsView.visitedViews
+            // lists.forEach(item=>{
+            //   if(item.fullPath == this.$route.fullPath){
+               let titlename = document.getElementById('tagTitles')
+                if(titlename){
+                  titlename.innerText = this.companyInfo.companyName
+                }
+            //   }
+            // })
           })
         }
       }
@@ -313,6 +331,15 @@ export default {
                     companyName: this.customerInfo.companyName
                   }
                   document.getElementById('tagTitle').innerText = this.customerInfo.companyName
+                  // let lists = this.$store.state.tagsView.visitedViews
+                  // lists.forEach(item=>{
+                  //   if(item.fullPath == this.$route.fullPath){
+                      let titlename = document.getElementById('tagTitles')
+                      if(titlename){
+                        titlename.innerText = this.customerInfo.companyName
+                      }
+                  //   }
+                  // })
                 })
               }
             } else {

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

@@ -342,6 +342,7 @@
   import * as echarts from 'echarts'
   import addproject from '../projectList/component/addProject'
   import NoData from '../../component/noData'
+  import '@/assets/lib/china.js'
 
 export default {
   name: 'Overview',
@@ -473,9 +474,11 @@ export default {
       countGroupByProvince(data).then(res=>{
         if(res.code==200){
           this.viewData4 = res.data;
-          console.log(this.viewData4)
+          
           if(this.viewData4.length>0){
-            res.data.map(item=>{
+            this.viewData4.map(item=>{
+              item.name = item.type
+              item.value = {count:item.count}
               item.select = {
                 itemStyle:{
                   areaColor: '#0081FF',
@@ -486,9 +489,11 @@ export default {
                   }
                 }
             })
-            let chartDom1 = document.getElementById("drawChinese")
-              this.myChart4 = echarts.init(chartDom1)
+            this.$nextTick(()=>{
+          console.log(this.viewData4)
+
               this.initChart4()
+            })
           }
         }
       })
@@ -722,15 +727,18 @@ export default {
     },
     //中国地图
     initChart4(){
+      let chartDom1 = document.getElementById("drawChinese")
+      this.myChart4 = echarts.init(chartDom1)
       let _this = this
       // 指定图表的配置项和数据
       // 绘制图表
       let options = {
         tooltip: {
           trigger: 'item',
-          show: false,
+          show: true,
           formatter: function(params) {
-            return params.type + '：' + params.count
+            console.dir(params )
+            return `${params.value}`
           }
         },
         // 左侧小导航图标
@@ -749,6 +757,7 @@ export default {
           mapType: 'china',
           roam: false,
           zoom: 1.2,
+          
           label: {
             normal: {
               show: false, // 省份名称
@@ -1183,6 +1192,7 @@ export default {
         height: 360px;
         margin-top: -30px;
         position: relative;
+        margin: 0 auto;
         .nhzd{
           width: 50px;
           height: auto;

dsk-operate-ui/src/views/radar/components/Land/index.vue

@@ -282,15 +282,7 @@
 							<img src="@/assets/images/addree.png" alt="">
 							<p class="list-content-text"  v-if="item.province||item.city||item.area">
 								<span>行政区划：</span>
-								<span >
-									 {{item.province}}
-								   <template v-if="item.city">
-									  -{{item.city}}
-								   </template>
-								   <template v-if="item.area">
-								   	  -{{item.area}}
-								   </template>
-								</span>
+								<span >{{item.province}}<template v-if="item.city">-{{item.city}}</template><template v-if="item.area">-{{item.area}}</template></span>
 							</p>
 							<p class="list-content-text"  v-if="item.landAddr">
 								<span>土地坐落：</span>

dsk-system/src/main/java/com/dsk/system/domain/business/dto/BusinessSearchDto.java

 package com.dsk.system.domain.business.dto;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -14,7 +15,7 @@ import java.util.Map;
  */
 @Data
 @NoArgsConstructor
-public class BusinessSearchDto implements Serializable {
+public class BusinessSearchDto extends BaseEntity implements Serializable {
     /**
      * 用户id
      */
@@ -24,18 +25,6 @@ public class BusinessSearchDto implements Serializable {
      */
     private Integer status;
 
-    /**
-     * 数据权限
-     */
-    private Map<String, Object> params;
-
-    public Map<String, Object> getParams() {
-        if (params == null) {
-            params = new HashMap<>();
-        }
-        return params;
-    }
-
     public BusinessSearchDto(Long userId) {
         this.userId = userId;
     }

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

 package com.dsk.system.domain.customer.dto;
 
+import com.dsk.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -14,7 +15,7 @@ import java.util.Map;
  */
 @Data
 @NoArgsConstructor
-public class CustomerSearchDto implements Serializable {
+public class CustomerSearchDto extends BaseEntity implements Serializable {
     /**
      * 企业id
      */
@@ -67,17 +68,4 @@ public class CustomerSearchDto implements Serializable {
      * 信资等级
      */
     private List<String> creditLevels;
-
-
-    /**
-     * 数据权限
-     */
-    private Map<String, Object> params;
-
-    public Map<String, Object> getParams() {
-        if (params == null) {
-            params = new HashMap<>();
-        }
-        return params;
-    }
 }

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

@@ -71,11 +71,11 @@
         left join sys_dept d on u.dept_id = d.dept_id
         <where>
             <if test="userId != null"> and (f.user_id = #{userId} or i.is_private = 1)</if>
-            <if test="startTime != null and startTime != '' "> and f.creat_time &gt;= #{startTime} </if>
-            <if test="endTime != null and endTime != '' "> and f.creat_time &lt;= #{endTime} </if>
+            <if test="startTime != null and startTime != '' "> and f.visit_time &gt;= #{startTime} </if>
+            <if test="endTime != null and endTime != '' "> and f.visit_time &lt;= #{endTime} </if>
             ${params.dataScope}
         </where>
-        ORDER BY f.creat_time DESC
+        ORDER BY f.visit_time DESC
     </select>
     <select id="selectRelateProject" resultType="com.dsk.system.domain.business.vo.BusinessListVo">
         select i.id,i.project_name as projectName

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

@@ -314,10 +314,9 @@
     </delete>
 
     <delete id="deleteBusinessInfoByIds" parameterType="Long">
-        delete i,b,co,f,l,r,u
+        delete i,b,f,l,r,u
         from business_info i
         left join business_backlog b on b.business_id = i.id
-        left join business_contacts co on co.business_id = i.id
         left join business_follow_record f on f.business_id = i.id
         left join business_label l on l.business_id = i.id
         left join business_relate_company r on r.business_id = i.id

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

@@ -23,7 +23,7 @@
             <!-- 数据范围过滤 -->
             <if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope} </if>
         </where>
-        order by cfr.create_time desc
+        order by cfr.visit_time desc
     </select>
 
 </mapper>