From c5808bdbf2dca22f42ce62146352db664c94339e Mon Sep 17 00:00:00 2001
From: zzl <961867786@qq.com>
Date: Tue, 9 Sep 2025 09:10:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue                    | 13 +++++++
 src/views/resource/land/index.vue      | 50 +++++++++++++-------------
 src/views/resource/operation/index.vue | 39 ++++++++++----------
 3 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index a783946..a3a9579 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -59,6 +59,19 @@
           <p class="trend up">↑ 8% 环比</p>
         </div>
       </div>
+
+      <div class="info-cards">
+        <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>
   </div>
 </template>
diff --git a/src/views/resource/land/index.vue b/src/views/resource/land/index.vue
index 7760486..2ca6382 100644
--- a/src/views/resource/land/index.vue
+++ b/src/views/resource/land/index.vue
@@ -99,21 +99,21 @@
 
               <!-- 数据列表  列属性 min-width="60" show-overflow-tooltip  @selection-change="handleSelectionChange" -->
             <el-table v-loading="loading" :data="landList" border>
-                <!--<el-table-column type="selection" width="55" align="center" />-->
-              <el-table-column label="fid " align="center" prop="fid"  min-width="60"/>
-              <el-table-column label="地块代码" align="center" prop="dkbm" />
-              <el-table-column label="地块名称" align="center" prop="dkmc" />
-              <el-table-column label="所有权性质" align="center" prop="syqxz">
+                <!--<el-table-column type="selection" width="55" align="center" />
+              <el-table-column label="fid " align="center" prop="fid"  min-width="60"/>-->
+              <el-table-column label="地块代码" align="center" prop="dkbm" min-width="180" show-overflow-tooltip />
+              <el-table-column label="地块名称" align="left" prop="dkmc" min-width="120" show-overflow-tooltip />
+             <!-- <el-table-column label="所有权性质" align="center" prop="syqxz">
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.ownership_type" :value="scope.row.syqxz"/>
                 </template>
-              </el-table-column>
-              <el-table-column label="地块类别" align="center" prop="dklb">
+              </el-table-column>-->
+              <el-table-column label="地块类别" align="center" prop="dklb" min-width="80" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.land_type" :value="scope.row.dklb"/>
                 </template>
               </el-table-column>
-              <el-table-column label="土地利用类型" align="center" prop="tdlylx">
+              <!--<el-table-column label="土地利用类型" align="center" prop="tdlylx">
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.land_use" :value="scope.row.tdlylx"/>
                 </template>
@@ -132,23 +132,25 @@
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.is_common" :value="scope.row.sfjbnt"/>
                 </template>
+              </el-table-column>-->
+              <el-table-column label="地块四至" align="center">
+                <el-table-column label="地块东至" align="left" prop="dkdz" min-width="100" show-overflow-tooltip />
+                <el-table-column label="地块西至" align="left" prop="dkxz" min-width="100" show-overflow-tooltip />
+                <el-table-column label="地块南至" align="left" prop="dknz" min-width="100" show-overflow-tooltip />
+                <el-table-column label="地块北至" align="left" prop="dkbz" min-width="100" show-overflow-tooltip />
               </el-table-column>
-              <el-table-column label="地块东至" align="center" prop="dkdz" />
-              <el-table-column label="地块西至" align="center" prop="dkxz" />
-              <el-table-column label="地块南至" align="center" prop="dknz" />
-              <el-table-column label="地块北至" align="center" prop="dkbz" />
-              <el-table-column label="备注信息" align="center" prop="dkbzxx" />
+              <!--<el-table-column label="备注信息" align="center" prop="dkbzxx" />
               <el-table-column label="指界人姓名" align="center" prop="zjrxm" />
-              <el-table-column label="实测面积( ㎡)" align="center" prop="scmj" />
-              <el-table-column label="实测面积" align="center" prop="scmjm" />
-              <el-table-column label="调查状态" align="center" prop="surveyStatus">
+              <el-table-column label="图显面积 " align="center" prop="txmj" />-->
+              <el-table-column label="实测面积" align="center" prop="scmjm" min-width="80" show-overflow-tooltip/>
+              <el-table-column label="调查状态" align="center" prop="surveyStatus" min-width="80" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.survey_status" :value="scope.row.surveyStatus"/>
                 </template>
               </el-table-column>
-              <el-table-column label="部门级联代码" align="center" prop="importCode" />
-              <el-table-column label="区域位置名称" align="center" prop="deptName" />
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="250">
+              <!--<el-table-column label="部门级联代码" align="center" prop="importCode" />
+              <el-table-column label="区域位置名称" align="center" prop="deptName" />-->
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="170">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" icon="el-icon-view" @click="handleLook(scope.row)" v-hasPermi="['resource:land:query']">查看</el-button>
                   <el-button size="mini" type="text" icon="el-icon-s-promotion" @click="handleMap(scope.row)" v-hasPermi="['resource:land:map']">地图</el-button>
@@ -210,8 +212,8 @@
           <el-descriptions-item label="地块北至">{{ form.dkbz }}</el-descriptions-item>
           <el-descriptions-item label="备注信息">{{ form.dkbzxx }}</el-descriptions-item>
           <el-descriptions-item label="指界人姓名">{{ form.zjrxm }}</el-descriptions-item>
-          <el-descriptions-item label="实测面积(㎡)">{{ form.scmj }}</el-descriptions-item>
-          <el-descriptions-item label="实测面积(亩)">{{ form.scmjm }}</el-descriptions-item>
+          <el-descriptions-item label="图显面积">{{ form.txmj }}</el-descriptions-item>
+          <el-descriptions-item label="实测面积">{{ form.scmjm }}</el-descriptions-item>
           <el-descriptions-item label="是否账外地">{{ form.sfzwd }}</el-descriptions-item>
         </el-descriptions>
 
@@ -301,8 +303,8 @@
         <el-form-item label="指界人姓名" prop="zjrxm">
             <el-input v-model="form.zjrxm" placeholder="请输入指界人姓名"  show-word-limit :maxlength="100"/>
         </el-form-item>
-        <el-form-item label="实测面积( ㎡)" prop="scmj">
-            <el-input-number v-model="form.scmj" placeholder="请输入实测面积( ㎡)" controls-position="right"   :precision="2"/>
+        <el-form-item label="图显面积" prop="txmj">
+            <el-input-number v-model="form.txmj" placeholder="请输入图显面积" controls-position="right"   :precision="2"/>
         </el-form-item>
         <el-form-item label="实测面积" prop="scmjm">
             <el-input-number v-model="form.scmjm" placeholder="请输入实测面积" controls-position="right"   :precision="3"/>
@@ -480,7 +482,7 @@ export default {
         dkbz: null,
         dkbzxx: null,
         zjrxm: null,
-        scmj: null,
+        txmj: null,
         scmjm: null,
         theGeom: null,
         surveyStatus: '1',
diff --git a/src/views/resource/operation/index.vue b/src/views/resource/operation/index.vue
index 329dd86..92c612d 100644
--- a/src/views/resource/operation/index.vue
+++ b/src/views/resource/operation/index.vue
@@ -88,34 +88,36 @@
               <!-- 数据列表  列属性 min-width="60" show-overflow-tooltip  @selection-change="handleSelectionChange" -->
             <el-table v-loading="loading" :data="operationList" border>
                 <!--<el-table-column type="selection" width="55" align="center" />-->
-              <el-table-column label="地块编码" align="center" prop="dkbm" />
-              <el-table-column label="地块名称" align="center" prop="dkmc" />
-              <el-table-column label="地块东至" align="center" prop="dkdz" />
-              <el-table-column label="地块西至" align="center" prop="dkxz" />
-              <el-table-column label="地块南至" align="center" prop="dknz" />
-              <el-table-column label="地块北至" align="center" prop="dkbz" />
-              <el-table-column label="经营面积(亩)" align="center" prop="jymj" />
-              <el-table-column label="经营方式" align="center" prop="jyfs">
+              <el-table-column label="地块代码" align="center" prop="dkbm" min-width="180" show-overflow-tooltip />
+              <el-table-column label="地块名称" align="left" prop="dkmc" min-width="120" show-overflow-tooltip />
+              <el-table-column label="地块四至" align="center">
+                <el-table-column label="地块东至" align="left" prop="dkdz" min-width="100" show-overflow-tooltip />
+                <el-table-column label="地块西至" align="left" prop="dkxz" min-width="100" show-overflow-tooltip />
+                <el-table-column label="地块南至" align="left" prop="dknz" min-width="100" show-overflow-tooltip />
+                <el-table-column label="地块北至" align="left" prop="dkbz" min-width="100" show-overflow-tooltip />
+              </el-table-column>
+              <el-table-column label="经营面积" align="right" prop="jymj"  min-width="80" show-overflow-tooltip/>
+              <el-table-column label="经营方式" align="center" prop="jyfs"  min-width="80" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.jyfs" :value="scope.row.jyfs"/>
                 </template>
               </el-table-column>
-              <el-table-column label="经营对象名称" align="center" prop="jydxmc" />
-              <el-table-column label="经营对象证件号码" align="center" prop="jydxzjhm" />
+              <el-table-column label="经营对象名称" align="left" prop="jydxmc"  min-width="150" show-overflow-tooltip/>
+              <!--<el-table-column label="经营对象证件号码" align="center" prop="jydxzjhm" />
               <el-table-column label="是否签订合同" align="center" prop="sfqdht">
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.is_common" :value="scope.row.sfqdht"/>
                 </template>
-              </el-table-column>
-              <el-table-column label="承包金额(元)" align="center" prop="cbje" />
-              <el-table-column label="年收益" align="center" prop="nsy" />
-              <el-table-column label="调查状态" align="center" prop="surveyStatus">
+              </el-table-column>-->
+              <el-table-column label="承包金额" align="right" prop="cbje"  min-width="80" show-overflow-tooltip/>
+              <el-table-column label="年收益" align="right" prop="nsy"  min-width="80" show-overflow-tooltip/>
+              <el-table-column label="调查状态" align="center" prop="surveyStatus"  min-width="80" show-overflow-tooltip>
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.survey_status" :value="scope.row.surveyStatus"/>
                 </template>
               </el-table-column>
-              <el-table-column label="区域位置名称" align="center" prop="deptName" />
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="250">
+              <!--<el-table-column label="区域位置名称" align="center" prop="deptName" />-->
+              <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="150">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" icon="el-icon-view" @click="handleLook(scope.row)" v-hasPermi="['resource:operation:query']">查看</el-button>
                   <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['resource:operation:edit']">修改</el-button>
@@ -176,8 +178,9 @@
           <el-descriptions-item label="地块北至">{{ form.dkbz }}</el-descriptions-item>
           <el-descriptions-item label="备注信息">{{ form.dkbzxx }}</el-descriptions-item>
           <el-descriptions-item label="指界人姓名">{{ form.zjrxm }}</el-descriptions-item>
-          <el-descriptions-item label="实测面积(㎡)">{{ form.scmj }}</el-descriptions-item>
-          <el-descriptions-item label="实测面积(亩)">{{ form.scmjm }}</el-descriptions-item>
+          <el-descriptions-item label="图显面积">{{ form.txmj }}</el-descriptions-item>
+          <el-descriptions-item label="实测面积">{{ form.scmjm }}</el-descriptions-item>
+          <el-descriptions-item label="是否账外地">{{ form.sfzwd }}</el-descriptions-item>
         </el-descriptions>
 
          <el-descriptions title="经营数据" border :column="2" class="margin-top">