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

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

@@ -206,6 +206,7 @@
           @change="dateChange4"
           type="daterange"
           value-format="yyyy-MM-dd"
+          unlink-panels
           size="small"
           range-separator="至"
           start-placeholder="开始日期"
@@ -254,6 +255,7 @@
           @change="dateChange5"
           type="daterange"
           value-format="yyyy-MM-dd"
+          unlink-panels
           size="small"
           range-separator="至"
           start-placeholder="开始日期"
@@ -296,6 +298,7 @@
               @change="dateChange6"
               type="daterange"
               value-format="yyyy-MM-dd"
+              unlink-panels
               size="small"
               range-separator="至"
               start-placeholder="开始日期"
@@ -313,17 +316,25 @@
               <div class="item_wrap" v-for="(item,index) in viewData6" :key="index">
                 <h2>{{ item.recordInfo }}</h2>
                 <div >
-                  <span class="label">关联项目：</span>
+                  <span class="label" v-if="item.businessId||item.projectName">关联项目：</span>
                   <router-link v-if="item.businessId" :to="'/project/projectList/detail?id='+item.businessId+'&tag=xmsl'" tag="a" class="a-link">{{ item.projectName }}</router-link>
                   <span v-else>{{ item.projectName }}</span>
-                  <span class="label">跟进人：</span>
-                  <span>{{ item.nickName }}</span>
-                  <span class="label">拜访对象：</span>
-                  <span>{{ item.visitPerson }}</span>
-                  <span class="label">本次拜访时间：</span>
-                  <span>{{ item.visitTime }}</span>
-                  <span class="label">下次拜访时间：</span>
-                  <span>{{ item.nextVisitTime }}</span>
+                  <template v-if="item.nickName">
+                    <span class="label">跟进人：</span>
+                    <span>{{ item.nickName }}</span>
+                  </template>
+                  <template v-if="item.visitPerson">
+                    <span class="label">拜访对象：</span>
+                    <span>{{ item.visitPerson }}</span>
+                  </template>
+                  <template v-if="item.visitTime">
+                    <span class="label">本次拜访时间：</span>
+                    <span>{{ item.visitTime }}</span>
+                  </template>
+                  <template v-if="item.nextVisitTime">
+                    <span class="label">下次拜访时间：</span>
+                    <span>{{ item.nextVisitTime }}</span>
+                  </template>
                 </div>
               </div>
             </div>
@@ -377,7 +388,7 @@ export default {
       date5:'',
       startDate5:'',
       endDate5:'',
-      radio6:'今日',
+      radio6:'',
       date6:'',
       startDate6:'',
       endDate6:'',
@@ -489,6 +500,9 @@ export default {
           
           if(this.viewData4.length>0){
             this.viewData4.map(item=>{
+              if(item.money>0){
+                item.money = Number(item.money)
+              }
               item.name = item.type
               item.value = {count:item.count}
               item.select = {
@@ -520,7 +534,7 @@ export default {
       }
       rangByMoney(data).then(res=>{
         if(res.code==200){
-          this.viewData5 = res.data;
+          this.viewData5 = res.data.reverse();
           this.$nextTick(()=>{
             let chartDom5 = document.getElementById("echarts5")
             this.myChart5 = echarts.init(chartDom5)
@@ -827,17 +841,12 @@ export default {
             type: 'pie',
             radius: ['50%','70%'],
             data:data,
-            emphasis: {
-              itemStyle: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0)'
-              },
-              label: {
+            label: {
                 show: true,
-                fontSize: 14,
-              }
-            }
+                formatter(param) {
+                  return param.value+'个';
+                }
+              },
           }
         ]
       }
@@ -1075,6 +1084,12 @@ export default {
         font-weight: 400;
         margin-left: 2px;
       }
+      &:hover{
+        color: #0081FF;
+        span{
+          color:#0081FF;
+        }
+      }
     }
     .compare{
       font-size: 12px;
@@ -1225,7 +1240,7 @@ export default {
     }
   .scroll_box{
     overflow-y:scroll ;
-    height: 512px;
+    max-height: 512px;
     
     .item_wrap{
         height: 102px;