lilei 2 år sedan
förälder
incheckning
2e43deaeef

+ 8 - 14
src/views/bigScreen/fPanalysisReport/center-bottom.vue

@@ -111,10 +111,10 @@ export default {
           top: '0'
         },
         grid: {
-          left: '50px',
-          right: '40px',
+          left: '70px',
+          right: '10px',
           bottom: '30px',
-          top: '20px'
+          top: '30px'
         },
         xAxis: {
           data: newData.category,
@@ -138,17 +138,6 @@ export default {
             axisLabel: {
               formatter: '{value}'
             }
-          },
-          {
-            splitLine: { show: false },
-            axisLine: {
-              lineStyle: {
-                color: '#B4B4B4'
-              }
-            },
-            axisLabel: {
-              formatter: '{value}% '
-            }
           }
         ],
         series: [
@@ -163,6 +152,11 @@ export default {
                 { offset: 1, color: '#3EACE5' }
               ])
             },
+            label: {
+              show: true,
+              position: 'outside',
+              color: '#fff'
+            },
             data: newData.barData
           }
         ]

+ 12 - 6
src/views/bigScreen/fPanalysisReport/index.vue

@@ -26,9 +26,9 @@
       >
         <div class="table-head">
           <div class="col-1">排名</div>
-          <div class="col-2">加盟商</div>
-          <div class="col-3">级别</div>
-          <div class="col-4">采购金额(元)</div>
+          <div class="col-5">加盟商</div>
+          <div class="col-6">级别</div>
+          <div class="col-6">采购金额(元)</div>
         </div>
         <RightTop />
       </ItemWrap>
@@ -188,13 +188,19 @@ export default {
         width: 10%;
       }
       .col-2{
-            width: 30%;
+            width: 25%;
       }
       .col-3{
-            width: 30%;
+            width: 40%;
       }
       .col-4{
-            width: 30%;
+            width: 25%;
+      }
+      .col-5{
+        width: 40%;
+      }
+      .col-6{
+        width: 25%;
       }
       > div{
         text-align: center;

+ 16 - 8
src/views/bigScreen/fPanalysisReport/right-bottom.vue

@@ -6,13 +6,13 @@
           <div class="inner_right">
             <div class="dibu"></div>
             <span class="orderNum">{{ i + 1 }}</span>
-            <div class="info">
+            <div class="info col-2">
               <span class="zhuyao"> {{ item.productCode }}</span>
             </div>
-            <div class="info">
+            <div class="info col-3">
               <span class="ciyao"> {{ item.productBrandName + item.productTypeName3 }}</span>
             </div>
-            <div class="info">
+            <div class="info col-4">
               <span class="warning" v-if="curTab==1"> {{ item.resultQty||'--' }}</span>
               <span class="warning" v-if="curTab==2"> {{ item.resultAmount | montionFilter }}</span>
             </div>
@@ -24,13 +24,13 @@
           <div class="inner_right">
             <div class="dibu"></div>
             <span class="orderNum">{{ i + 1 }}</span>
-            <div class="info">
+            <div class="info col-2">
               <span class="zhuyao"> {{ item.productCode }}</span>
             </div>
-            <div class="info">
+            <div class="info col-3">
               <span class="ciyao"> {{ item.productBrandName + item.productTypeName3 }}</span>
             </div>
-            <div class="info">
+            <div class="info col-4">
               <span class="warning" v-if="curTab==1"> {{ item.resultQty||'--' }}</span>
               <span class="warning" v-if="curTab==2"> {{ item.resultAmount | montionFilter }}</span>
             </div>
@@ -94,6 +94,7 @@ export default {
       this.timer = setInterval(looper, this.$store.state.setting.echartsAutoTime)
     },
     getData () {
+      this.list = []
       const date = new Date().getFullYear() + '-01-01'
       queryProductPurchase({ queryDate: date, queryType: this.queryType }).then(res => {
         if (res.status == 200) {
@@ -148,9 +149,16 @@ export default {
         background-size: cover;
       }
     }
-
+    .col-2{
+          width: 25%;
+    }
+    .col-3{
+          width: 40%;
+    }
+    .col-4{
+          width: 25%;
+    }
     .info {
-      width: 30%;
       text-align: center;
       .zhuyao {
         color: #a6e0ff;

+ 15 - 8
src/views/bigScreen/fPanalysisReport/right-top.vue

@@ -6,13 +6,13 @@
           <div class="inner_right">
             <div class="dibu"></div>
             <span class="orderNum">{{ i + 1 }}</span>
-            <div class="info">
+            <div class="info col-1">
               <span class="zhuyao"> {{ item.dealerName }}</span>
             </div>
-            <div class="info">
+            <div class="info col-2">
               <span class="ciyao"> {{ item.dealerLevelDictValue }}</span>
             </div>
-            <div class="info">
+            <div class="info col-3">
               <span class="warning"> {{ item.resultAmount | montionFilter }}</span>
             </div>
           </div>
@@ -23,13 +23,13 @@
           <div class="inner_right">
             <div class="dibu"></div>
             <span class="orderNum">{{ i + 1 }}</span>
-            <div class="info">
+            <div class="info col-1">
               <span class="zhuyao"> {{ item.dealerName }}</span>
             </div>
-            <div class="info">
+            <div class="info col-2">
               <span class="ciyao"> {{ item.dealerLevelDictValue }}</span>
             </div>
-            <div class="info">
+            <div class="info col-3">
               <span class="warning"> {{ item.resultAmount | montionFilter }}</span>
             </div>
           </div>
@@ -132,9 +132,16 @@ export default {
         background-size: cover;
       }
     }
-
+    .col-1{
+      width: 40%;
+    }
+    .col-2{
+      width: 25%;
+    }
+    .col-3{
+      width: 25%;
+    }
     .info {
-      width: 30%;
       text-align: center;
       .zhuyao {
         color: #a6e0ff;

+ 8 - 14
src/views/bigScreen/realTimeSalesReport/center-bottom.vue

@@ -103,10 +103,10 @@ export default {
           top: '0'
         },
         grid: {
-          left: '50px',
-          right: '40px',
+          left: '80px',
+          right: '10px',
           bottom: '30px',
-          top: '20px'
+          top: '30px'
         },
         xAxis: {
           data: newData.category,
@@ -130,17 +130,6 @@ export default {
             axisLabel: {
               formatter: '{value}'
             }
-          },
-          {
-            splitLine: { show: false },
-            axisLine: {
-              lineStyle: {
-                color: '#B4B4B4'
-              }
-            },
-            axisLabel: {
-              formatter: '{value}% '
-            }
           }
         ],
         series: [
@@ -155,6 +144,11 @@ export default {
                 { offset: 1, color: '#3EACE5' }
               ])
             },
+            label: {
+              show: true,
+              position: 'outside',
+              color: '#fff'
+            },
             data: newData.barData
           }
         ]