From 3ccac5b39aa754de0ee5cbdd422f235a942078f4 Mon Sep 17 00:00:00 2001
From: YOU <15501379989@163.com>
Date: Fri, 11 Apr 2025 19:01:01 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=9C=8B=E6=9D=BF=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/comp/bar.vue   |  6 +++---
 src/views/dashboard/comp/block.vue | 18 +++++++++++++-----
 src/views/dashboard/comp/pop.vue   |  4 ++--
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/views/dashboard/comp/bar.vue b/src/views/dashboard/comp/bar.vue
index 58617ae..07dfba3 100644
--- a/src/views/dashboard/comp/bar.vue
+++ b/src/views/dashboard/comp/bar.vue
@@ -52,7 +52,7 @@ export default defineComponent({
     justify-content: space-between;
     align-items: center;
     height: 100%;
-    color: #00caff;
+    color: #fff;
     &.around {
       justify-content: space-around;
       .item {
@@ -93,12 +93,12 @@ export default defineComponent({
         font-size: 24px;
         text-align: left;
         padding-right: 10px;
-        color: #00faa8;
+        color: #1ef580;
         font-weight: bold;
       }
       > .unit {
         width: 6em;
-        color: #00e5ff;
+        color: #fff;
         font-family: 'Alibaba PuHuiTi Heavy'; //阿里巴巴 普惠体
         font-size: 16px;
         text-align: right;
diff --git a/src/views/dashboard/comp/block.vue b/src/views/dashboard/comp/block.vue
index adae195..65c908c 100644
--- a/src/views/dashboard/comp/block.vue
+++ b/src/views/dashboard/comp/block.vue
@@ -15,19 +15,27 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, nextTick, onMounted, reactive, toRefs } from 'vue';
+import { computed, defineComponent, h, nextTick, onMounted, reactive, toRefs } from 'vue';
 import { IObject } from '@/types/interface';
 import utilService from '@/service/utilService';
 export default defineComponent({
   name: 'block',
-  props: { item: { type: Object, default: () => ({}) }, dataForm: { type: Object, default: () => ({}) } },
+  props: { item: { type: Object, default: () => ({}) }, dataForm: { type: Object, default: () => ({}) }, width: { type: String, default: () => '484px' }, height: { type: String, default: () => '318px' } },
   setup(props) {
     const state = reactive({
       blockRef: null,
     });
 
+    const block = computed(() => {
+      return {
+        w: props.width,
+        h: props.height,
+      };
+    });
+
     return {
       ...toRefs(state),
+      block,
     };
   },
   emits: ['change-code'],
@@ -36,8 +44,8 @@ export default defineComponent({
 
 <style scoped lang="less">
 .block {
-  width: 484px;
-  height: 318px;
+  width: v-bind('block.w');
+  height: v-bind('block.h');
   background: url('@/assets/images/njhl/block.png') no-repeat center;
   background-size: 100% 100%;
   display: flex;
@@ -50,7 +58,7 @@ export default defineComponent({
     align-items: center;
     justify-content: space-between;
     padding: 10px 38px;
-    color: #00e5ff;
+    color: #fff;
 
     > span {
       font-size: 20px;
diff --git a/src/views/dashboard/comp/pop.vue b/src/views/dashboard/comp/pop.vue
index 914c410..501871c 100644
--- a/src/views/dashboard/comp/pop.vue
+++ b/src/views/dashboard/comp/pop.vue
@@ -67,7 +67,7 @@ export default defineComponent({
       display: flex;
       flex-direction: column;
       > .top {
-        color: #00caff;
+        color: #fff;
         font-size: 18px;
         margin: 6px 0;
         font-weight: bold;
@@ -77,7 +77,7 @@ export default defineComponent({
         position: relative;
         display: flex;
         align-items: center;
-        color: #00faa8;
+        color: #1ef580;
         > .wrap {
           position: absolute;
           width: 100%;