删除

public/cdn/js/circliful.js

@@ -16,6 +16,7 @@
         this.barColor = options.barColor || '#F9A825';
         this.fontColor = options.fontColor || '#606266';
         this.text = options.text || '%'
+        this.radius = options.radius || 50
         if(options.init){
             this.init();
         }
@@ -50,6 +51,7 @@
         var barColor = this.barColor;
         var fontColor = this.fontColor;
         var text = this.text;
+        var radius = this.radius
 
         function draw(){
             diffAngle = (percentage / 100) * Math.PI * 2;
@@ -63,7 +65,7 @@
             ctx.lineWidth = 15;
 
             //绘制圆
-            ctx.arc(cx, cy, 50, 0, 2 * Math.PI, false);
+            ctx.arc(cx, cy, radius, 0, 2 * Math.PI, false);
 
             //设置填充色
             ctx.fillStyle = '#FFF';
@@ -75,7 +77,7 @@
 
             //绘制百分比进度
             ctx.beginPath();
-            ctx.arc(cx, cy, 50, startAngle, diffAngle + startAngle, false);
+            ctx.arc(cx, cy, radius, startAngle, diffAngle + startAngle, false);
             ctx.strokeStyle = barColor;
             ctx.stroke();
 

src/views/Statistics/reportDetail.vue

@@ -1219,7 +1219,7 @@
                 </div>
                 <div class="item">
                     <image class="pic" src="http://images.2weisou.com/20221125173123zVTd8Ej6.png"/>
-                    <div class="name">标注完成，系统自动 标注客户画像</div>
+                    <div class="name">标注完成，系统自动标注客户画像</div>
                 </div>
             </div>
 
@@ -1530,6 +1530,9 @@ export default {
                   let bgColor = $(this).attr("data-color");
                   new Progressbar({
                     id: childs.echartsId + "Progress" + index,
+                    width: '300px',
+                    height: '300px',
+                    radius: 90,
                     text: unit,
                     value: value,
                     init: true,
@@ -1569,6 +1572,9 @@ export default {
                   let bgColor = $(this).attr("data-color");
                   new Progressbar({
                     id: childs.echartsId + "Progress" + index,
+                    width: '300px',
+                    height: '300px',
+                    radius: 90,
                     text: unit,
                     value: value,
                     init: true,
@@ -1987,7 +1993,7 @@ export default {
         console.log(option);
         myChart.setOption(option);
       } catch (e) {
-        cconsole.log(e);
+        console.log(e);
       }
     },
 
@@ -2464,7 +2470,7 @@ export default {
 .box-card .percents .percent-box .percent-line {
   /*width: 80%;*/
   height: 100%;
-  background: rgba(62, 80, 232, 0.6);
+  background: rgba(62, 80, 232, .2);
 }
 
 .box-card .title .logo {
@@ -2498,6 +2504,36 @@ export default {
   padding-bottom: 2px;
   padding-top: 4px;
 }
+.alllist:nth-of-type(5n - 1) {
+  border-left: none;
+  border-top: none;
+}
+.alllist:nth-of-type(5n - 2) {
+  border-left: none;
+  border-top: none;
+}
+
+.alllist:nth-of-type(5n - 3) {
+  border-left: none;
+  border-top: none;
+}
+.alllist:nth-of-type(5n - 4) {
+  // border-left: none;
+  border-top: none;
+}
+.alllist:nth-of-type(5n) {
+  border-left: none;
+  border-top: none;
+}
+.alllist:nth-of-type(5n) {
+  border-left: none;
+  // border-bottom: none;
+}
+
+
+.alllist:nth-of-type(-n + 5) {
+  border-top: 1px solid #e0e0e0;
+}
 
 .alllist-text1 {
   width: 100%;
@@ -2793,10 +2829,11 @@ export default {
   display: flex;
 }
 
-.header-style {
+/deep/.header-style {
   background: #3e50e8 !important;
   padding: 10px 0 !important;
   color: #fff !important;
+  font-size: 16px !important;
 }
 
 .pieRemark {
@@ -2805,7 +2842,7 @@ export default {
 }
 
 .pieRemark .item {
-  height: 240px;
+  min-height: 240px;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -2902,7 +2939,7 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  font-size: 18px;
+  font-size: 16px;
   font-family: PingFangSC-Medium, PingFang SC;
   font-weight: 500;
   color: #333333;

src/views/statisticalManagement/consumptionManagement.vue

@@ -406,6 +406,7 @@ export default {
 
     // 切换筛选日期类型
     tabtimetap(index) {
+      this.params.current = 1
       this.emptyTimePickerChoose()
       this.params.dateType = index;
       this.consumptionTrend();
@@ -413,16 +414,19 @@ export default {
 
     // 筛选
     screen() {
+      this.params.current = 1
       this.consumptionTrend();
     },
 
     // 楼盘筛选
     houseChange() {
+      this.params.current = 1
       this.consumptionTrend();
     },
 
     // 清空筛选
     empty() {
+      this.params.current = 1
       this.params.dateType = 3; //  1近七天 2 近十五天 3近三十天
       this.params.operateType = ""; // 0:购买，1: 赠送，2:扣除购买，3:扣除赠送，4:长录音转写扣除，5:短录音转写扣除
       if (this.params.orgType != 3) {
@@ -440,6 +444,7 @@ export default {
 
     // 自定义时间筛选
     confirmtime() {
+      this.params.current = 1
       this.params.startDate = this.customtime[0];
       this.params.endDate = this.customtime[1];
       this.params.dateType = null;

src/views/statisticalManagement/index.vue

@@ -277,6 +277,7 @@ export default {
     },
     // 时间筛选
     tabtimetap(index) {
+      this.params.current = 1
       this.emptyTimePickerChoose();
       this.params.dateType = index;
       this.rechargeDetails();
@@ -284,6 +285,7 @@ export default {
 
     // 自定义时间筛选
     confirmtime() {
+      this.params.current = 1
       this.params.startDate = this.customtime[0];
       this.params.endDate = this.customtime[1];
       this.params.dateType = null;
@@ -300,15 +302,18 @@ export default {
 
     // 筛选
     screen() {
+      this.params.current = 1
       this.rechargeDetails();
     },
 
     // 楼盘筛选
     houseChange() {
+      this.params.current = 1
       this.rechargeDetails();
     },
     // 操作类型筛选
     operateTypeChange() {
+      this.params.current = 1
       this.rechargeDetails();
     },
     // 明细列表