瀏覽代碼

bug 修复

lilei 2 年之前
父節點
當前提交
132a4450fa

+ 1 - 0
src/utils/util.js

@@ -125,6 +125,7 @@ export function formatTime(time, fmt) {
 
 // 千分位分隔符
 export function formatThousands (number) {
+  if(!number){return 0}
   const numbers = number.toString().split('').reverse()
   const segs = []
 

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

@@ -8,10 +8,10 @@
             <div class="dibu"></div>
             <span class="orderNum">{{ i + 1 }}</span>
             <div class="info col-2">
-              <span class="zhuyao"> {{ item.productCode }}</span>
+              <span class="ciyao"> {{ item.productCode }}</span>
             </div>
             <div class="info col-3">
-              <span class="ciyao"> {{ item.productBrandName + item.productTypeName3 }}</span>
+              <span class="zhuyao"> {{ item.productBrandName + item.productTypeName3 }}</span>
             </div>
             <div class="info col-4">
               <span class="warning" v-if="curTab==1"> {{ item.resultQty||'--' }}</span>
@@ -26,10 +26,10 @@
             <div class="dibu"></div>
             <span class="orderNum">{{ i + 1 }}</span>
             <div class="info col-2">
-              <span class="zhuyao"> {{ item.productCode }}</span>
+              <span class="ciyao"> {{ item.productCode }}</span>
             </div>
             <div class="info col-3">
-              <span class="ciyao"> {{ item.productBrandName + item.productTypeName3 }}</span>
+              <span class="zhuyao"> {{ item.productBrandName + item.productTypeName3 }}</span>
             </div>
             <div class="info col-4">
               <span class="warning" v-if="curTab==1"> {{ item.resultQty||'--' }}</span>
@@ -146,7 +146,7 @@ export default {
       .orderNum {
         width: 10%;
         text-align: center;
-        color: #fff;
+        color: rgba(255, 255, 255, 0.8);
       }
       .dibu {
         position: absolute;
@@ -175,11 +175,12 @@ export default {
         font-size: 15px;
       }
       .ciyao {
-        color: rgba(255, 255, 255, 0.8);
+        color: rgba(255, 255, 255, 1);
       }
       .warning {
-        color: #E6A23C;
+        color: #ffb442;
         font-size: 15px;
+        font-weight: bold;
       }
     }
 

+ 7 - 6
src/views/bigScreen/fPanalysisReport/right-top.vue

@@ -8,10 +8,10 @@
             <div class="dibu"></div>
             <span class="orderNum">{{ i + 1 }}</span>
             <div class="info col-1">
-              <span class="zhuyao"> {{ item.dealerName }}</span>
+              <span class="ciyao"> {{ item.dealerName }}</span>
             </div>
             <div class="info col-2">
-              <span class="ciyao"> {{ item.dealerLevelDictValue }}</span>
+              <span class="zhuyao"> {{ item.dealerLevelDictValue }}</span>
             </div>
             <div class="info col-3">
               <span class="warning"> {{ item.resultAmount | montionFilter }}</span>
@@ -25,10 +25,10 @@
             <div class="dibu"></div>
             <span class="orderNum">{{ i + 1 }}</span>
             <div class="info col-1">
-              <span class="zhuyao"> {{ item.dealerName }}</span>
+              <span class="ciyao"> {{ item.dealerName }}</span>
             </div>
             <div class="info col-2">
-              <span class="ciyao"> {{ item.dealerLevelDictValue }}</span>
+              <span class="zhuyao"> {{ item.dealerLevelDictValue }}</span>
             </div>
             <div class="info col-3">
               <span class="warning"> {{ item.resultAmount | montionFilter }}</span>
@@ -155,11 +155,12 @@ export default {
         font-size: 15px;
       }
       .ciyao {
-        color: rgba(255, 255, 255, 0.8);
+        color: rgba(255, 255, 255, 1);
       }
       .warning {
-        color: #E6A23C;
+        color: #ffb442;
         font-size: 15px;
+        font-weight: bold;
       }
     }
 

+ 3 - 3
src/views/bigScreen/realTimeSalesReport/center-map.vue

@@ -136,8 +136,8 @@ export default {
             { gte: 5000000, lte: 9999999, label: '500万元-1000万元' },
             { gte: 1000000, lte: 4999999, label: '100万元-500万元' },
             { gte: 500000, lte: 999999, label: '50万元-100万元' },
-            { gte: 50000, lte: 499999, label: '5万元-50万元' },
-            { lte: 49999, label: '1-5万元' } // 不指定 min,表示 min 为无限大(-Infinity)。
+            { gte: 100000, lte: 499999, label: '10万元-50万元' },
+            { lte: 99999, label: '1-10万元' } // 不指定 min,表示 min 为无限大(-Infinity)。
           ],
           inRange: {
             // 渐变颜色,从小到大
@@ -146,7 +146,7 @@ export default {
               '#3483b4',
               '#43a9e8',
               '#0389ff',
-              '#ffaa00',
+              '#06aa42',
               '#ff5500'
             ]
           },

+ 5 - 3
src/views/bigScreen/realTimeSalesReport/center-top.vue

@@ -42,7 +42,8 @@ export default {
         content: '{nt}',
         style: {
           fill: '#00aaff',
-          fontSize: 40
+          fontSize: 40,
+          fontWeight: 'bold'
         },
         formatter: formatThousands
       }
@@ -55,7 +56,8 @@ export default {
         content: '{nt}',
         style: {
           fill: '#E6A23C',
-          fontSize: 40
+          fontSize: 40,
+          fontWeight: 'bold'
         },
         formatter: formatThousands
       }
@@ -77,7 +79,7 @@ export default {
 			justify-content: center;
 			align-items: center;
 			height: 110px;
-			color: rgba(255, 255, 255, 0.6);
+			color: rgba(255, 255, 255, 0.4);
       font-size:16px;
 		}
 	}

+ 7 - 5
src/views/bigScreen/realTimeSalesReport/right-bottom.vue

@@ -12,7 +12,7 @@
               <span class="labels">销售数量</span>
             </div>
             <div class="info">
-              <span class="nums warning"> {{ item.salesAmount | montionFilter }}</span>
+              <span class="nums warning"> {{ item.salesAmount }}</span>
               <span class="labels">销售金额</span>
             </div>
           </div>
@@ -71,8 +71,8 @@ export default {
         if (res.status == 200) {
           const data = res.data
           this.list = [
-            { 'salesAmount': data.monthAmount, 'saleNums': formatThousands(data.monthQty), 'name': '月' },
-            { 'salesAmount': data.weekAmount, 'saleNums': formatThousands(data.weekQty), 'name': '周' }
+            { 'salesAmount': formatThousands(data.monthAmount), 'saleNums': formatThousands(data.monthQty), 'name': '月' },
+            { 'salesAmount': formatThousands(data.weekAmount), 'saleNums': formatThousands(data.weekQty), 'name': '周' }
           ]
           this.switper()
         } else {
@@ -111,9 +111,10 @@ export default {
 
     .orderNum {
       font-size: 25px;
+      font-weight: bold;
       border: 3px solid rgba(0, 170, 255, 0.5);
       border-radius: 200px;
-      color: rgba(0, 170, 255, 0.5);
+      color: rgba(0, 170, 255, 0.6);
       display: inline-block;
       text-align: center;
       height: 70px;
@@ -144,11 +145,12 @@ export default {
       .labels {
         flex-shrink: 0;
         font-size: 16px;
-        color: rgba(255, 255, 255, 0.6);
+        color: rgba(255, 255, 255, 0.4);
       }
 
       .nums {
         font-size: 32px;
+        font-weight: bold;
       }
 
       .zhuyao {

+ 11 - 5
src/views/bigScreen/realTimeSalesReport/right-today.vue

@@ -7,13 +7,13 @@
           <div class="inner_right">
             <div class="dibu"></div>
             <div class="info col-1">
-              <span class="zhuyao"> {{ item.dealerName }}</span>
+              <span class="ciyao"> {{ item.dealerName }}</span>
             </div>
             <div class="info col-2">
               <span class="ciyao"> {{ item.dealerLevelDictValue }}</span>
             </div>
             <div class="info col-3">
-              <span class="warning"> {{ item.resultQty }}</span>
+              <span class="zhuyao"> {{ item.resultQty }}</span>
             </div>
             <div class="info col-4">
               <span class="warning"> {{ item.resultAmount | montionFilter }}</span>
@@ -26,13 +26,13 @@
           <div class="inner_right">
             <div class="dibu"></div>
             <div class="info col-1">
-              <span class="zhuyao"> {{ item.dealerName }}</span>
+              <span class="ciyao"> {{ item.dealerName }}</span>
             </div>
             <div class="info col-2">
               <span class="ciyao"> {{ item.dealerLevelDictValue }}</span>
             </div>
             <div class="info col-3">
-              <span class="warning"> {{ item.resultQty }}</span>
+              <span class="zhuyao"> {{ item.resultQty }}</span>
             </div>
             <div class="info col-4">
               <span class="warning"> {{ item.resultAmount | montionFilter }}</span>
@@ -159,13 +159,19 @@ export default {
       .zhuyao {
         color: #a6e0ff;
         font-size: 15px;
+        font-weight: bold;
       }
       .ciyao {
         color: rgba(255, 255, 255, 0.8);
       }
+      .blue {
+        color: #00aaff;;
+        font-size: 15px;
+      }
       .warning {
-        color: #E6A23C;
+        color: #ffb442;
         font-size: 15px;
+        font-weight: bold;
       }
     }