From e5e704dc89547e70bc533de5a61b05470a9cadb7 Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Tue, 9 Sep 2025 17:52:12 +0800
Subject: [PATCH 1/3] =?UTF-8?q?TASK=2045751=20=E5=9C=B0=E5=9D=97=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=92=8C=E5=9C=B0=E5=9D=97=E7=BB=8F=E8=90=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/resource/land/index.vue      | 6 +++---
 src/views/resource/operation/index.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/resource/land/index.vue b/src/views/resource/land/index.vue
index a818e69..1406e9a 100644
--- a/src/views/resource/land/index.vue
+++ b/src/views/resource/land/index.vue
@@ -326,7 +326,7 @@
 
     <!-- 地图对话框 -->
     <el-dialog :title="title" :visible.sync="openMap" width="1200px" append-to-body>
-      <el-divider><h3 class="header-anchor">地图信息：绿色地块表示该地块，青色表示本组织已标记的其他地块</h3></el-divider>
+      <el-divider><h3 class="header-anchor">地图信息：红色地块表示该地块，青色表示本组织已标记的其他地块</h3></el-divider>
       <div id="full-screen-acceptance" style="width: 100%;height:65vh;">
         <!--<div id="landMapDiv"></div>-->
         <div id="mapWrap"></div>
@@ -941,11 +941,11 @@ export default {
           style: new ol.style.Style({
             fill: new ol.style.Fill({
               //矢量图层填充颜色，以及透明度
-              color: "rgba(204, 255, 204,0.3)",
+              color: "yellow",
             }),
             stroke: new ol.style.Stroke({
               //边界样式
-              color: "#47c68f",
+              color: "yellow",
               width: 3,
             }),
           }),
diff --git a/src/views/resource/operation/index.vue b/src/views/resource/operation/index.vue
index 47f249e..b3f9919 100644
--- a/src/views/resource/operation/index.vue
+++ b/src/views/resource/operation/index.vue
@@ -210,7 +210,7 @@
 
     <!-- 添加或修改地块经营对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="820px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="120px">
 
         <el-form-item label="区域位置名称" prop="deptName">
           <el-input v-model="form.deptName" placeholder="请输入区域位置名称"  show-word-limit :maxlength="100"/>

From 23d1d3d522b68867d25bb7690688b9e15efd1d38 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Tue, 9 Sep 2025 18:08:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E5=B0=8F=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index a3a9579..d2399b1 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -12,12 +12,10 @@
         <div class="info-card">
           <h3>总地块数</h3>
           <p class="number">12,345</p>
-          <p class="trend up">↑ 12% 同比</p>
         </div>
         <div class="info-card">
           <h3>已调查数</h3>
           <p class="number">¥ 456,789</p>
-          <p class="trend up">↑ 8% 环比</p>
         </div>
       </div>
 
@@ -25,12 +23,10 @@
         <div class="info-card">
           <h3>待调查数</h3>
           <p class="number">8,642</p>
-          <p class="trend down">↓ 3% 环比</p>
         </div>
         <div class="info-card">
           <h3>承包总金额</h3>
           <p class="number">¥ 456,789</p>
-          <p class="trend up">↑ 8% 环比</p>
         </div>
       </div>
 
@@ -38,12 +34,10 @@
         <div class="info-card">
           <h3>兑现总额</h3>
           <p class="number">8,642</p>
-          <p class="trend down">↓ 3% 环比</p>
         </div>
         <div class="info-card">
           <h3>尚欠总额</h3>
           <p class="number">¥ 456,789</p>
-          <p class="trend up">↑ 8% 环比</p>
         </div>
       </div>
 
@@ -51,12 +45,10 @@
         <div class="info-card">
           <h3>年总收益</h3>
           <p class="number">8,642</p>
-          <p class="trend down">↓ 3% 环比</p>
         </div>
         <div class="info-card">
           <h3>经营总面积</h3>
           <p class="number">¥ 456,789</p>
-          <p class="trend up">↑ 8% 环比</p>
         </div>
       </div>
 
@@ -64,12 +56,10 @@
         <div class="info-card">
           <h3>年总收益</h3>
           <p class="number">8,642</p>
-          <p class="trend down">↓ 3% 环比</p>
         </div>
         <div class="info-card">
           <h3>经营总面积</h3>
           <p class="number">¥ 456,789</p>
-          <p class="trend up">↑ 8% 环比</p>
         </div>
       </div>
     </div>

From 790b48538b6c5122744abd2c12091bc1384c8353 Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Wed, 10 Sep 2025 10:50:50 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index d2399b1..d7d8be7 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -10,56 +10,57 @@
     <div class="chart-row">
       <div class="info-cards">
         <div class="info-card">
-          <h3>总地块数</h3>
+          <h3>地块总数</h3>
           <p class="number">12,345</p>
         </div>
         <div class="info-card">
-          <h3>已调查数</h3>
+          <h3>承包总金额</h3>
           <p class="number">¥ 456,789</p>
         </div>
       </div>
 
       <div class="info-cards">
         <div class="info-card">
-          <h3>待调查数</h3>
+          <h3>待调查总数</h3>
           <p class="number">8,642</p>
         </div>
         <div class="info-card">
-          <h3>承包总金额</h3>
-          <p class="number">¥ 456,789</p>
+          <h3>兑现总金额</h3>
+          <p class="number">8,642</p>
         </div>
       </div>
 
       <div class="info-cards">
         <div class="info-card">
-          <h3>兑现总额</h3>
-          <p class="number">8,642</p>
+          <h3>已调查总数</h3>
+          <p class="number">¥ 456,789</p>
         </div>
         <div class="info-card">
-          <h3>尚欠总额</h3>
+          <h3>尚欠总金额</h3>
           <p class="number">¥ 456,789</p>
         </div>
       </div>
 
       <div class="info-cards">
         <div class="info-card">
-          <h3>年总收益</h3>
+          <h3>地块总面积</h3>
           <p class="number">8,642</p>
         </div>
         <div class="info-card">
           <h3>经营总面积</h3>
           <p class="number">¥ 456,789</p>
         </div>
+
       </div>
 
       <div class="info-cards">
         <div class="info-card">
-          <h3>年总收益</h3>
-          <p class="number">8,642</p>
+          <h3>机动地总面积</h3>
+          <p class="number">¥ 456,789</p>
         </div>
         <div class="info-card">
-          <h3>经营总面积</h3>
-          <p class="number">¥ 456,789</p>
+          <h3>年总收益</h3>
+          <p class="number">8,642</p>
         </div>
       </div>
     </div>