From a6842851a844e63a8766d63c5410a8e2f27a7d45 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 20 八月 2024 11:56:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/screen/components/screen-face/index.vue |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/screen/components/screen-face/index.vue b/src/views/screen/components/screen-face/index.vue
index cf1a29a..e1d0982 100644
--- a/src/views/screen/components/screen-face/index.vue
+++ b/src/views/screen/components/screen-face/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="face-container">
-    <wrapper-title :title="'浜鸿劯璁惧鏁版嵁'"></wrapper-title>
+    <wrapper-title :title="'浜鸿劯璁惧鏁版嵁'" :path="'/monitorServe/face'"></wrapper-title>
 
     <div class="face-content">
       <div class="data-plane">
@@ -11,7 +11,7 @@
             </div>
             <div class="data-info">
               <div class="data-lable">璁惧鎬绘暟</div>
-              <div class="data-num">{{ formatNumber(1123) }}</div>
+              <div class="data-num type1" v-roll>{{ 1123 }}</div>
             </div>
           </div>
         </dv-border-box-13>
@@ -23,7 +23,7 @@
             </div>
             <div class="data-info">
               <div class="data-lable">璁惧姝e父鏁�</div>
-              <div class="data-num">{{ formatNumber(200000) }}</div>
+              <div class="data-num type2" v-roll>{{ 2000 }}</div>
             </div>
           </div>
         </dv-border-box-13>
@@ -35,7 +35,7 @@
             </div>
             <div class="data-info">
               <div class="data-lable">璁惧寮傚父鏁�</div>
-              <div class="data-num">{{ formatNumber(112313141111) }}</div>
+              <div class="data-num type3" v-roll>{{ 1000 }}</div>
             </div>
           </div>
         </dv-border-box-13>
@@ -62,10 +62,6 @@
   },
 
   methods: {
-
-    formatNumber(value) {
-      return new Intl.NumberFormat('en-US').format(value);
-    }
   },
 
   mounted() {
@@ -84,8 +80,10 @@
 
 .face-content {
   flex: 1;
-  background: rgba(67, 102, 155, 0.3);
-  border: 1px solid rgba(47, 91, 157, 0.8);
+  background: url("../../../../assets/images/screen/cardBg.png");
+  background-size: cover !important;
+  background-repeat: no-repeat !important;
+  background-position: center center !important;
 
   .plane {
     margin-bottom: 10px;
@@ -113,6 +111,16 @@
           font-size: 24px;
           color: #fff;
         }
+
+        .type1 {
+          color: #287cfa;
+        }
+        .type2 {
+          color: #0cd81d;
+        }
+        .type3 {
+          color: #e20c0c
+        }
       }
     }
   }

--
Gitblit v1.8.0