From a4a41a9b16b277a4c8863f8c249307d5d33b7ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C13713575202=E2=80=9D?= <“1345916905@qq.com”>
Date: Tue, 15 Apr 2025 14:02:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/home/components/inputs.vue      |  8 +--
 .../views/trace/components/codeNumCharts.vue  | 16 +++---
 .../views/trace/components/mainPartCharts.vue | 49 +++++++++++--------
 3 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/sub-government-screen-service/src/views/home/components/inputs.vue b/sub-government-screen-service/src/views/home/components/inputs.vue
index 64c862f..ff27ae6 100644
--- a/sub-government-screen-service/src/views/home/components/inputs.vue
+++ b/sub-government-screen-service/src/views/home/components/inputs.vue
@@ -50,12 +50,12 @@ let topTitle = ref('');
 let pos = ref('');
 
 const datalist = reactive([
-  { label: '农机使用(台)', value: 8000, icon: 'farmuse.png' },
+  { label: '种子使用(吨)', value: 4800, icon: 'provenance.png' },
   { label: '农药使用(吨)', value: 5000, icon: 'pesticide.png' },
-  { label: '肥料使用(吨)', value: 9000, icon: 'fertilizer.png' },
-  { label: '种源使用', value: 4800, icon: 'provenance.png' },
-  { label: '兽药(吨)', value: 10, icon: 'animalm.png' },
+  { label: '化肥使用(吨)', value: 9000, icon: 'fertilizer.png' },
   { label: '饲料(吨)', value: 88943, icon: 'feeduse.png' },
+  { label: '兽药(吨)', value: 10, icon: 'animalm.png' },
+  { label: '农机使用(台)', value: 8000, icon: 'farmuse.png' },
 ]);
 
 onMounted(() => {
diff --git a/sub-government-screen-service/src/views/trace/components/codeNumCharts.vue b/sub-government-screen-service/src/views/trace/components/codeNumCharts.vue
index 57cdf0b..f710c3f 100644
--- a/sub-government-screen-service/src/views/trace/components/codeNumCharts.vue
+++ b/sub-government-screen-service/src/views/trace/components/codeNumCharts.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="code-num-charts">
     <div class="code-num-txt" :style="{ 'background-image': 'url(' + getAssetsFile('images/trace/bg1.png') + ')' }">
-      <div class="num-txt-pos">
-        <template v-for="(n, index) in valData" :key="index">
+      <template v-for="(n, index) in valData" :key="index">
+        <div class="num-txt-warp">
           <div class="num-txt">
             <div class="val">{{ n.value }}</div>
             <div class="label">{{ n.name }}</div>
           </div>
-        </template>
-      </div>
+        </div>
+      </template>
     </div>
     <div class="code-pie">
       <custom-echart-pie-gauge :chart-data="chartsData.valData" height="100%" :option="chartsData.option" />
@@ -271,13 +271,13 @@ div {
     top: 50%;
     width: 80%;
     transform: translateY(-50%);
-    background-size: contain;
+    background-size: 100% 100%;
     background-repeat: no-repeat;
     background-position: left center;
-    height: 100%;
-    .num-txt-pos {
+    height: 90%;
+    .num-txt-warp {
       width: 100%;
-      height: 100%;
+      height: calc((100% - 4px) / 2);
       display: inline-flex;
       justify-content: center;
       flex-direction: column;
diff --git a/sub-government-screen-service/src/views/trace/components/mainPartCharts.vue b/sub-government-screen-service/src/views/trace/components/mainPartCharts.vue
index 9804243..6fe250b 100644
--- a/sub-government-screen-service/src/views/trace/components/mainPartCharts.vue
+++ b/sub-government-screen-service/src/views/trace/components/mainPartCharts.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="main-part-charts">
     <div class="code-num-txt" :style="{ 'background-image': 'url(' + getAssetsFile('images/trace/bg2.png') + ')' }">
-      <div class="num-txt-pos">
-        <template v-for="(n, index) in valData" :key="index">
+      <template v-for="(n, index) in valData" :key="index">
+        <div class="num-txt-warp">
           <div class="num-txt">
             <div class="label">
-              <span>{{ n.name }}</span>
+              <span class="label-val">{{ n.name }}</span>
             </div>
             <div class="val">
               <span class="val-val">{{ n.value }}</span>
               <span class="unit">{{ n.unit }}</span>
             </div>
           </div>
-        </template>
-      </div>
+        </div>
+      </template>
     </div>
     <div class="code-pie">
       <custom-echart-pie-gauge :chart-data="chartsData.valData" height="100%" :option="chartsData.option" />
@@ -265,26 +265,30 @@ div {
     position: absolute;
     right: 0;
     top: 50%;
-    width: 80%;
+    width: 60%;
     transform: translateY(-50%);
-    background-size: contain;
+    height: 90%;
+    background-size: 100% 100%;
     background-repeat: no-repeat;
     background-position: left center;
-    height: 100%;
-    padding: 10% 0 10% 18%;
-    .num-txt-pos {
+    display: inline-flex;
+    justify-content: space-around;
+    flex-direction: column;
+    gap: 4;
+    .num-txt-warp {
       width: 100%;
-      height: 100%;
+      padding-left: 18%;
       display: inline-flex;
       justify-content: center;
       flex-direction: column;
+      height: calc((100% - 8px) / 3);
     }
     .num-txt {
       width: 72%;
       display: inline-flex;
+
       justify-content: space-between;
       padding: 0 16px;
-      line-height: 30px;
       .val,
       .label {
         vertical-align: middle;
@@ -303,15 +307,20 @@ div {
         }
       }
       .label {
-        font-size: 12px;
-        font-weight: bold;
         display: inline-flex;
-        transform: skewX(-8deg);
-        background: linear-gradient(to bottom, '#ff7e5f', '#548fff');
-        -webkit-background-clip: text;
-        letter-spacing: 1px;
-        color: #fff;
-        text-shadow: -2px 0 0 1px #add8f1;
+        flex-direction: column;
+        justify-content: center;
+        .label-val {
+          font-size: 12px;
+          font-weight: bold;
+          display: inline-flex;
+          transform: skewX(-8deg);
+          background: linear-gradient(to bottom, '#ff7e5f', '#548fff');
+          -webkit-background-clip: text;
+          letter-spacing: 1px;
+          color: #fff;
+          text-shadow: -2px 0 0 1px #add8f1;
+        }
       }
 
       .unit {