Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/resource/land/index.vue

src/views/business/export/index.vue

@@ -51,8 +51,6 @@
               <el-col :span="1.5">
                 <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:export:remove']">删除</el-button>
               </el-col>
-              -->
-
               <el-col :span="1.5">
                   <el-button type="success" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['business:export:import']">导入</el-button>
               </el-col>
@@ -62,6 +60,7 @@
               <el-col :span="1.5">
                   <el-button type="info" plain icon="el-icon-printer" size="mini" @click="handlePrint()" v-hasPermi="['business:export:print']">打印</el-button>
               </el-col>
+              -->
               <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
             </el-row>
 
@@ -315,8 +314,8 @@ export default {
         deptId: null,
         deptName: null,
         orgCode: null,
-        fileType: null,
-        coordinateSystem: null,
+        fileType: '1',
+        coordinateSystem: '2',
         fileUrl: null,
         taskStatus: '1',
       }
@@ -340,6 +339,10 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      if(this.selectDeptName == null || this.selectDeptName == ''){
+        this.$modal.msgWarning("请先选择县级及以下行政区划！")
+        return
+      }
       this.reset()
       this.form.deptId = this.queryParams.deptId;
       this.form.deptName = this.selectDeptName;

src/views/business/import/index.vue

@@ -56,8 +56,6 @@
               <el-col :span="1.5">
                 <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['business:import:remove']">删除</el-button>
               </el-col>
-              -->
-
               <el-col :span="1.5">
                   <el-button type="success" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['business:import:import']">导入</el-button>
               </el-col>
@@ -67,6 +65,7 @@
               <el-col :span="1.5">
                   <el-button type="info" plain icon="el-icon-printer" size="mini" @click="handlePrint()" v-hasPermi="['business:import:print']">打印</el-button>
               </el-col>
+              -->
               <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
             </el-row>
 
@@ -136,6 +135,8 @@
                       <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的导入任务
                   </div>
                   <p style="color: red">1、仅允许导入xls、xlsx格式文件；</p>
+                  <p style="color: red">2、覆盖导入：指先将所选区划当前在库数据删除，然后按新数据包解析导入；</p>
+                  <p style="color: red">3、增量导入：指按新数据包解析并追加导入；</p>
                   <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
               </div>
           </el-upload>
@@ -174,7 +175,13 @@
             <el-option v-for="dict in dict.type.file_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="导入方式" prop="importType">
+        <el-form-item prop="importType">
+          <span slot="label">
+            导入方式
+              <el-tooltip content="覆盖导入：指先将所选区划当前在库数据删除，然后按新数据包解析导入；增量导入：指按新数据包解析并追加导入。" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
           <el-select v-model="form.importType" placeholder="请选择导入方式">
             <el-option v-for="dict in dict.type.import_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
@@ -346,9 +353,9 @@ export default {
         deptId: null,
         deptName: null,
         orgCode: null,
-        fileType: null,
-        importType: null,
-        coordinateSystem: null,
+        fileType: '1',
+        importType: '1',
+        coordinateSystem: '1',
         fileUrl: null,
         taskStatus: '1',
       }
@@ -372,6 +379,10 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      if(this.selectDeptName == null || this.selectDeptName == ''){
+        this.$modal.msgWarning("请先选择县级及以下行政区划！")
+        return
+      }
       this.reset()
       this.open = true
       this.form.deptId = this.queryParams.deptId;

src/views/index.vue

@@ -2,38 +2,75 @@
   <div class="dashboard-container">
     <div class="chart-row">
       <div class="chart-container">
-        <h2>用户增长趋势</h2>
+        <h2>资源调查进度</h2>
         <div ref="lineChart" class="chart"></div>
       </div>
-
-      <div class="chart-container">
-        <h2>产品销售统计</h2>
-        <div ref="barChart" class="chart"></div>
-      </div>
     </div>
 
     <div class="chart-row">
-      <div class="chart-container">
-        <h2>用户分布比例</h2>
-        <div ref="pieChart" class="chart"></div>
-      </div>
-
       <div class="info-cards">
         <div class="info-card">
-          <h3>总用户数</h3>
+          <h3>总地块数</h3>
           <p class="number">12,345</p>
           <p class="trend up">↑ 12% 同比</p>
         </div>
         <div class="info-card">
-          <h3>本月销售额</h3>
+          <h3>已调查数</h3>
+          <p class="number">¥ 456,789</p>
+          <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 class="info-cards">
         <div class="info-card">
-          <h3>活跃用户</h3>
+          <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 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 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>
@@ -46,8 +83,7 @@
     name: 'Dashboard',
     mounted() {
       this.initLineChart();
-      this.initBarChart();
-      this.initPieChart();
+
     },
     methods: {
       initLineChart() {
@@ -57,7 +93,7 @@
             trigger: 'axis'
           },
           legend: {
-            data: ['新增用户', '活跃用户', '付费用户']
+            data: ['已调查', '待调查']
           },
           grid: {
             left: '3%',
@@ -68,27 +104,14 @@
           xAxis: {
             type: 'category',
             boundaryGap: false,
-            data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月']
+            data: ['A市', 'B市', 'C市', 'D市', 'E市', 'F市', 'G市']
           },
           yAxis: {
             type: 'value'
           },
           series: [
             {
-              name: '新增用户',
-              type: 'line',
-              data: [120, 132, 101, 134, 90, 230, 210],
-              smooth: true,
-              lineStyle: {
-                width: 3,
-                color: '#5470C6'
-              },
-              itemStyle: {
-                color: '#5470C6'
-              }
-            },
-            {
-              name: '活跃用户',
+              name: '已调查',
               type: 'line',
               data: [220, 182, 191, 234, 290, 330, 310],
               smooth: true,
@@ -101,7 +124,7 @@
               }
             },
             {
-              name: '付费用户',
+              name: '待调查',
               type: 'line',
               data: [150, 232, 201, 154, 190, 330, 410],
               smooth: true,
@@ -120,107 +143,6 @@
           chart.resize();
         });
       },
-      initBarChart() {
-        const chart = echarts.init(this.$refs.barChart);
-        const option = {
-          tooltip: {
-            trigger: 'axis',
-            axisPointer: {
-              type: 'shadow'
-            }
-          },
-          legend: {
-            data: ['2022', '2023']
-          },
-          grid: {
-            left: '3%',
-            right: '4%',
-            bottom: '3%',
-            containLabel: true
-          },
-          xAxis: {
-            type: 'value'
-          },
-          yAxis: {
-            type: 'category',
-            data: ['产品A', '产品B', '产品C', '产品D', '产品E']
-          },
-          series: [
-            {
-              name: '2022',
-              type: 'bar',
-              data: [320, 302, 341, 374, 390],
-              itemStyle: {
-                color: '#91CC75'
-              }
-            },
-            {
-              name: '2023',
-              type: 'bar',
-              data: [420, 432, 401, 454, 590],
-              itemStyle: {
-                color: '#5470C6'
-              }
-            }
-          ]
-        };
-        chart.setOption(option);
-        window.addEventListener('resize', function() {
-          chart.resize();
-        });
-      },
-      initPieChart() {
-        const chart = echarts.init(this.$refs.pieChart);
-        const option = {
-          tooltip: {
-            trigger: 'item'
-          },
-          legend: {
-            orient: 'vertical',
-            right: 10,
-            top: 'center'
-          },
-          series: [
-            {
-              name: '用户分布',
-              type: 'pie',
-              radius: ['40%', '70%'],
-              avoidLabelOverlap: false,
-              itemStyle: {
-                borderRadius: 10,
-                borderColor: '#fff',
-                borderWidth: 2
-              },
-              label: {
-                show: false,
-                position: 'center'
-              },
-              emphasis: {
-                label: {
-                  show: true,
-                  fontSize: '18',
-                  fontWeight: 'bold'
-                }
-              },
-              labelLine: {
-                show: false
-              },
-              data: [
-                { value: 1048, name: '华北地区' },
-                { value: 735, name: '华东地区' },
-                { value: 580, name: '华南地区' },
-                { value: 484, name: '西部地区' },
-                { value: 300, name: '东北地区' }
-              ],
-              color: ['#5470C6', '#91CC75', '#EE6666', '#FAC858', '#73C0DE']
-            }
-          ]
-        };
-        chart.setOption(option);
-        window.addEventListener('resize', function() {
-          chart.resize();
-        });
-      }
     }
   };
 </script>

src/views/index_v2.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="dashboard-container">
+    <div class="chart-row">
+      <div class="chart-container">
+        <h2>用户增长趋势</h2>
+        <div ref="lineChart" class="chart"></div>
+      </div>
+
+      <div class="chart-container">
+        <h2>产品销售统计</h2>
+        <div ref="barChart" class="chart"></div>
+      </div>
+    </div>
+
+    <div class="chart-row">
+      <div class="chart-container">
+        <h2>用户分布比例</h2>
+        <div ref="pieChart" class="chart"></div>
+      </div>
+
+      <div class="info-cards">
+        <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 class="info-card">
+          <h3>活跃用户</h3>
+          <p class="number">8,642</p>
+          <p class="trend down">↓ 3% 环比</p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import * as echarts from 'echarts';
+
+  export default {
+    name: 'Dashboard',
+    mounted() {
+      this.initLineChart();
+      this.initBarChart();
+      this.initPieChart();
+    },
+    methods: {
+      initLineChart() {
+        const chart = echarts.init(this.$refs.lineChart);
+        const option = {
+          tooltip: {
+            trigger: 'axis'
+          },
+          legend: {
+            data: ['新增用户', '活跃用户', '付费用户']
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月']
+          },
+          yAxis: {
+            type: 'value'
+          },
+          series: [
+            {
+              name: '新增用户',
+              type: 'line',
+              data: [120, 132, 101, 134, 90, 230, 210],
+              smooth: true,
+              lineStyle: {
+                width: 3,
+                color: '#5470C6'
+              },
+              itemStyle: {
+                color: '#5470C6'
+              }
+            },
+            {
+              name: '活跃用户',
+              type: 'line',
+              data: [220, 182, 191, 234, 290, 330, 310],
+              smooth: true,
+              lineStyle: {
+                width: 3,
+                color: '#91CC75'
+              },
+              itemStyle: {
+                color: '#91CC75'
+              }
+            },
+            {
+              name: '付费用户',
+              type: 'line',
+              data: [150, 232, 201, 154, 190, 330, 410],
+              smooth: true,
+              lineStyle: {
+                width: 3,
+                color: '#EE6666'
+              },
+              itemStyle: {
+                color: '#EE6666'
+              }
+            }
+          ]
+        };
+        chart.setOption(option);
+        window.addEventListener('resize', function() {
+          chart.resize();
+        });
+      },
+      initBarChart() {
+        const chart = echarts.init(this.$refs.barChart);
+        const option = {
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow'
+            }
+          },
+          legend: {
+            data: ['2022', '2023']
+          },
+          grid: {
+            left: '3%',
+            right: '4%',
+            bottom: '3%',
+            containLabel: true
+          },
+          xAxis: {
+            type: 'value'
+          },
+          yAxis: {
+            type: 'category',
+            data: ['产品A', '产品B', '产品C', '产品D', '产品E']
+          },
+          series: [
+            {
+              name: '2022',
+              type: 'bar',
+              data: [320, 302, 341, 374, 390],
+              itemStyle: {
+                color: '#91CC75'
+              }
+            },
+            {
+              name: '2023',
+              type: 'bar',
+              data: [420, 432, 401, 454, 590],
+              itemStyle: {
+                color: '#5470C6'
+              }
+            }
+          ]
+        };
+        chart.setOption(option);
+        window.addEventListener('resize', function() {
+          chart.resize();
+        });
+      },
+      initPieChart() {
+        const chart = echarts.init(this.$refs.pieChart);
+        const option = {
+          tooltip: {
+            trigger: 'item'
+          },
+          legend: {
+            orient: 'vertical',
+            right: 10,
+            top: 'center'
+          },
+          series: [
+            {
+              name: '用户分布',
+              type: 'pie',
+              radius: ['40%', '70%'],
+              avoidLabelOverlap: false,
+              itemStyle: {
+                borderRadius: 10,
+                borderColor: '#fff',
+                borderWidth: 2
+              },
+              label: {
+                show: false,
+                position: 'center'
+              },
+              emphasis: {
+                label: {
+                  show: true,
+                  fontSize: '18',
+                  fontWeight: 'bold'
+                }
+              },
+              labelLine: {
+                show: false
+              },
+              data: [
+                { value: 1048, name: '华北地区' },
+                { value: 735, name: '华东地区' },
+                { value: 580, name: '华南地区' },
+                { value: 484, name: '西部地区' },
+                { value: 300, name: '东北地区' }
+              ],
+              color: ['#5470C6', '#91CC75', '#EE6666', '#FAC858', '#73C0DE']
+            }
+          ]
+        };
+        chart.setOption(option);
+        window.addEventListener('resize', function() {
+          chart.resize();
+        });
+      }
+    }
+  };
+</script>
+
+<style scoped>
+  .dashboard-container {
+    padding: 20px;
+    background-color: #f5f7fa;
+    min-height: 100vh;
+  }
+
+  h1 {
+    color: #333;
+    margin-bottom: 30px;
+  }
+
+  .chart-row {
+    display: flex;
+    margin-bottom: 20px;
+    gap: 20px;
+  }
+
+  .chart-container {
+    flex: 1;
+    background-color: white;
+    border-radius: 8px;
+    padding: 15px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  }
+
+  .chart {
+    height: 350px;
+  }
+
+  .info-cards {
+    flex: 0 0 300px;
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+  }
+
+  .info-card {
+    background-color: white;
+    border-radius: 8px;
+    padding: 20px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  }
+
+  .info-card h3 {
+    color: #666;
+    margin-bottom: 10px;
+    font-size: 16px;
+  }
+
+  .info-card .number {
+    font-size: 24px;
+    font-weight: bold;
+    margin-bottom: 5px;
+    color: #333;
+  }
+
+  .info-card .trend {
+    font-size: 14px;
+  }
+
+  .trend.up {
+    color: #67C23A;
+  }
+
+  .trend.down {
+    color: #F56C6C;
+  }
+
+  @media (max-width: 1200px) {
+    .chart-row {
+      flex-direction: column;
+    }
+
+    .info-cards {
+      flex-direction: row;
+      flex-wrap: wrap;
+    }
+
+    .info-card {
+      flex: 1;
+      min-width: 200px;
+    }
+  }
+</style>

src/views/resource/land/index.vue

@@ -24,7 +24,7 @@
               <el-form-item label="地块名称" prop="dkmc">
                 <el-input v-model="queryParams.dkmc" placeholder="请输入地块名称" clearable @keyup.enter.native="handleQuery"/>
               </el-form-item>
-              <!--<el-form-item label="所有权性质" prop="syqxz">
+              <el-form-item label="权属性质" prop="syqxz">
                 <el-select v-model="queryParams.syqxz" placeholder="请选择所有权性质" clearable>
                   <el-option v-for="dict in dict.type.ownership_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
                 </el-select>
@@ -34,7 +34,7 @@
                   <el-option v-for="dict in dict.type.land_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="土地利用类型" prop="tdlylx">
+              <el-form-item label="利用类型" prop="tdlylx">
                 <el-select v-model="queryParams.tdlylx" placeholder="请选择土地利用类型" clearable>
                   <el-option v-for="dict in dict.type.land_use" :key="dict.value" :label="dict.label" :value="dict.value"/>
                 </el-select>
@@ -53,15 +53,17 @@
                 <el-select v-model="queryParams.sfjbnt" placeholder="请选择是否基本农田" clearable>
                   <el-option v-for="dict in dict.type.is_common" :key="dict.value" :label="dict.label" :value="dict.value"/>
                 </el-select>
+              </el-form-item>
+              <!--<el-form-item label="是账外地" prop="sfzwd">
+                <el-select v-model="queryParams.sfzwd" placeholder="请选择是否账外地" clearable>
+                  <el-option v-for="dict in dict.type.is_common" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
               </el-form-item>-->
               <el-form-item label="调查状态" prop="surveyStatus">
                 <el-select v-model="queryParams.surveyStatus" placeholder="请选择调查状态" clearable>
                   <el-option v-for="dict in dict.type.survey_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="级联代码" prop="importCode">
-                <el-input v-model="queryParams.importCode" placeholder="请输入部门级联代码" clearable @keyup.enter.native="handleQuery"/>
-              </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -94,21 +96,25 @@
 
               <!-- 数据列表  列属性 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="区域位置名称" align="center" prop="deptName" />
-              <!-- <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">
+                <template slot-scope="scope">
+                  <dict-tag :options="dict.type.land_use" :value="scope.row.tdlylx"/>
+                </template>
+              </el-table-column>
               <el-table-column label="地力等级" align="center" prop="dldj">
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.land_grade_type" :value="scope.row.dldj"/>
@@ -123,29 +129,25 @@
                 <template slot-scope="scope">
                   <dict-tag :options="dict.type.is_common" :value="scope.row.sfjbnt"/>
                 </template>
-              </el-table-column> -->
+              </el-table-column>-->
               <el-table-column label="地块四至" align="center">
-                <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="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="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="tdlylx">
-                <template slot-scope="scope">
-                  <dict-tag :options="dict.type.land_use" :value="scope.row.tdlylx"/>
-                </template>
-              </el-table-column>
-              <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" class-name="small-padding fixed-width" min-width="150">
+              <!--<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>
@@ -200,15 +202,16 @@
           <el-descriptions-item label="土地利用类型">{{ form.tdlylx }}</el-descriptions-item>
           <el-descriptions-item label="地力等级">{{ form.dldj }}</el-descriptions-item>
           <el-descriptions-item label="土地用途">{{ form.tdyt }}</el-descriptions-item>
+          <el-descriptions-item label="是否基本农田">{{ form.sfjbnt }}</el-descriptions-item>
           <el-descriptions-item label="地块东至">{{ form.dkdz }}</el-descriptions-item>
           <el-descriptions-item label="地块西至">{{ form.dkxz }}</el-descriptions-item>
           <el-descriptions-item label="地块南至">{{ form.dknz }}</el-descriptions-item>
           <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.sfjbnt }}</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">
@@ -273,6 +276,11 @@
             <el-option v-for="dict in dict.type.land_use_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否基本农田" prop="sfjbnt">
+          <el-radio-group v-model="form.sfjbnt">
+            <el-radio v-for="dict in dict.type.is_common" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="地块东至" prop="dkdz">
             <el-input v-model="form.dkdz" placeholder="请输入地块东至"  show-word-limit :maxlength="50"/>
         </el-form-item>
@@ -291,14 +299,14 @@
         <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"/>
         </el-form-item>
-        <el-form-item label="是否基本农田" prop="sfjbnt">
-          <el-radio-group v-model="form.sfjbnt">
+        <el-form-item label="是否账外地" prop="sfzwd">
+          <el-radio-group v-model="form.sfzwd">
             <el-radio v-for="dict in dict.type.is_common" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -426,6 +434,7 @@ export default {
         sfjbnt: null,
         surveyStatus: null,
         importCode: null,
+        sfzwd: null,
       },
       // 表单参数
       form: {},
@@ -517,12 +526,13 @@ export default {
         dkbz: null,
         dkbzxx: null,
         zjrxm: null,
-        scmj: null,
+        txmj: null,
         scmjm: null,
         theGeom: null,
         surveyStatus: '1',
         importCode: null,
         deptName: null,
+        sfzwd: '2'
       }
       this.diglogStatus = true;
       this.resetForm("form")

src/views/resource/operation/index.vue

@@ -18,20 +18,43 @@
           <el-col>
 
             <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="地块代码" prop="dkbm">
-                <el-input v-model="queryParams.dkbm" placeholder="请输入地块代码" clearable @keyup.enter.native="handleQuery"/>
+              <el-form-item label="地块编码" prop="dkbm">
+                <el-input v-model="queryParams.dkbm" placeholder="请输入地块编码" clearable @keyup.enter.native="handleQuery"/>
               </el-form-item>
               <el-form-item label="地块名称" prop="dkmc">
                 <el-input v-model="queryParams.dkmc" placeholder="请输入地块名称" clearable @keyup.enter.native="handleQuery"/>
               </el-form-item>
+              <el-form-item label="经营方式" prop="jyfs">
+                <el-select v-model="queryParams.jyfs" placeholder="请选择经营方式" clearable>
+                  <el-option v-for="dict in dict.type.jyfs" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="经营对象" prop="jydxmc">
+                <el-input v-model="queryParams.jydxmc" placeholder="请输入经营对象名称" clearable @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="对象类型" prop="jydxlx">
+                <el-select v-model="queryParams.jydxlx" placeholder="请选择经营对象类型" clearable>
+                  <el-option v-for="dict in dict.type.jydxlx" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="证件类型" prop="jydxzjlx">
+                <el-select v-model="queryParams.jydxzjlx" placeholder="请选择经营对象证件类型" clearable>
+                  <el-option v-for="dict in dict.type.zjlx" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="证件号码" prop="jydxzjhm">
+                <el-input v-model="queryParams.jydxzjhm" placeholder="请输入经营对象证件号码" clearable @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="签订合同" prop="sfqdht">
+                <el-select v-model="queryParams.sfqdht" placeholder="请选择是否签订合同" clearable>
+                  <el-option v-for="dict in dict.type.is_common" :key="dict.value" :label="dict.label" :value="dict.value"/>
+                </el-select>
+              </el-form-item>
               <el-form-item label="调查状态" prop="surveyStatus">
                 <el-select v-model="queryParams.surveyStatus" placeholder="请选择调查状态" clearable>
                   <el-option v-for="dict in dict.type.survey_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
                 </el-select>
               </el-form-item>
-              <el-form-item label="级联代码" prop="importCode">
-                <el-input v-model="queryParams.importCode" placeholder="请输入部门级联代码" clearable @keyup.enter.native="handleQuery"/>
-              </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -65,27 +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="id" align="center" prop="id"  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="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="jydxmc" />
-            <el-table-column label="经营开始时间" align="center" prop="jykssj" />
-            <el-table-column label="经营结束时间" align="center" prop="jyjssj" />
-              <el-table-column label="承包金额(元)" align="center" prop="cbje" />
-              <el-table-column label="调查状态" align="center" prop="surveyStatus">
+              <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="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="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="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="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>
@@ -146,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">
@@ -180,34 +213,54 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="区域位置名称" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入区域位置名称"  show-word-limit :maxlength="100" readOnly/>
+          <el-input v-model="form.deptName" placeholder="请输入区域位置名称"  show-word-limit :maxlength="100"/>
         </el-form-item>
-        <el-form-item label="地块代码" prop="dkbm">
-            <el-input v-model="form.dkbm" placeholder="请输入地块代码，跟地块属性中的地块编码一致"  show-word-limit :maxlength="19" readOnly/>
+        <el-form-item label="地块编码" prop="dkbm">
+          <el-input v-model="form.dkbm" placeholder="请输入地块代码，跟地块属性中的地块编码一致"  show-word-limit :maxlength="19"/>
         </el-form-item>
         <el-form-item label="地块名称" prop="dkmc">
-            <el-input v-model="form.dkmc" placeholder="请输入地块名称"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dkmc" placeholder="请输入地块名称"  show-word-limit :maxlength="50"/>
         </el-form-item>
         <el-form-item label="地块东至" prop="dkdz">
-            <el-input v-model="form.dkdz" placeholder="请输入地块东至"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dkdz" placeholder="请输入地块东至"  show-word-limit :maxlength="50"/>
         </el-form-item>
         <el-form-item label="地块西至" prop="dkxz">
-            <el-input v-model="form.dkxz" placeholder="请输入地块西至"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dkxz" placeholder="请输入地块西至"  show-word-limit :maxlength="50"/>
         </el-form-item>
         <el-form-item label="地块南至" prop="dknz">
-            <el-input v-model="form.dknz" placeholder="请输入地块南至"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dknz" placeholder="请输入地块南至"  show-word-limit :maxlength="50"/>
         </el-form-item>
         <el-form-item label="地块北至" prop="dkbz">
-            <el-input v-model="form.dkbz" placeholder="请输入地块北至"  show-word-limit :maxlength="50" readOnly/>
+          <el-input v-model="form.dkbz" placeholder="请输入地块北至"  show-word-limit :maxlength="50"/>
         </el-form-item>
         <el-form-item label="经营面积(亩)" prop="jymj">
-            <el-input-number v-model="form.jymj" placeholder="请输入经营面积(亩)" controls-position="right"   :precision="3"/>
+          <el-input-number v-model="form.jymj" placeholder="请输入经营面积(亩)" controls-position="right"   :precision="3"/>
         </el-form-item>
         <el-form-item label="经营方式" prop="jyfs">
-            <el-input v-model="form.jyfs" placeholder="请输入经营方式"  show-word-limit :maxlength="1"/>
+          <el-select v-model="form.jyfs" placeholder="请选择经营方式">
+            <el-option v-for="dict in dict.type.jyfs" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="经营对象类型" prop="jydxlx">
+          <el-select v-model="form.jydxlx" placeholder="请选择经营对象类型">
+            <el-option v-for="dict in dict.type.jydxlx" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="经营对象名称" prop="jydxmc">
-            <el-input v-model="form.jydxmc" placeholder="请输入经营对象名称"  show-word-limit :maxlength="200"/>
+          <el-input v-model="form.jydxmc" placeholder="请输入经营对象名称"  show-word-limit :maxlength="100"/>
+        </el-form-item>
+        <el-form-item label="对象证件类型" prop="jydxzjlx">
+          <el-select v-model="form.jydxzjlx" placeholder="请选择经营对象证件类型">
+            <el-option v-for="dict in dict.type.zjlx" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="对象证件号码" prop="jydxzjhm">
+          <el-input v-model="form.jydxzjhm" placeholder="请输入经营对象证件号码"  show-word-limit :maxlength="30"/>
+        </el-form-item>
+        <el-form-item label="是否签订合同" prop="sfqdht">
+          <el-radio-group v-model="form.sfqdht">
+            <el-radio v-for="dict in dict.type.is_common" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="经营开始时间" prop="jykssj">
           <el-date-picker clearable v-model="form.jykssj" type="date" value-format="yyyy-MM-dd" placeholder="请选择经营开始时间"></el-date-picker>
@@ -216,10 +269,19 @@
           <el-date-picker clearable v-model="form.jyjssj" type="date" value-format="yyyy-MM-dd" placeholder="请选择经营结束时间"></el-date-picker>
         </el-form-item>
         <el-form-item label="承包金额(元)" prop="cbje">
-            <el-input-number v-model="form.cbje" placeholder="请输入承包金额(元)" controls-position="right"   :precision="2"/>
+          <el-input-number v-model="form.cbje" placeholder="请输入承包金额(元)" controls-position="right"   :precision="2"/>
         </el-form-item>
-        <el-form-item label="备注" prop="bz">
-            <el-input v-model="form.bz" placeholder="请输入备注"  show-word-limit :maxlength="255"/>
+        <el-form-item label="兑现金额" prop="dxje">
+          <el-input-number v-model="form.dxje" placeholder="请输入兑现金额" controls-position="right"   :precision="2"/>
+        </el-form-item>
+        <el-form-item label="尚欠金额" prop="sqje">
+          <el-input-number v-model="form.sqje" placeholder="请输入尚欠金额" controls-position="right"   :precision="2"/>
+        </el-form-item>
+        <el-form-item label="年收益" prop="nsy">
+          <el-input-number v-model="form.nsy" placeholder="请输入年收益" controls-position="right"   :precision="2"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="bzxx">
+          <el-input v-model="form.bzxx" placeholder="请输入备注"  show-word-limit :maxlength="255"/>
         </el-form-item>
         <el-form-item label="实物图" prop="dkImg">
           <image-upload v-model="form.dkImg"/>
@@ -229,6 +291,7 @@
             <el-radio v-for="dict in dict.type.survey_status" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -249,7 +312,7 @@ import { deptTreeSelect } from "@/api/system/user"
 
 export default {
   name: "Operation",
-  dicts: ['survey_status'],
+  dicts: ['zjlx', 'survey_status', 'is_common', 'jydxlx', 'jyfs'],
   components: { Treeselect, Splitpanes, Pane },
   data() {
     return {
@@ -304,6 +367,12 @@ export default {
        //toTranslateDict: "1",
         dkbm: null,
         dkmc: null,
+        jyfs: null,
+        jydxlx: null,
+        jydxmc: null,
+        jydxzjlx: null,
+        jydxzjhm: null,
+        sfqdht: null,
         surveyStatus: null,
         importCode: null,
       },
@@ -394,12 +463,19 @@ export default {
         dknz: null,
         dkbz: null,
         jymj: null,
-        jyfs: null,
+        jyfs: '200',
+        jydxlx: '1',
         jydxmc: null,
+        jydxzjlx: '1',
+        jydxzjhm: null,
+        sfqdht: '1',
         jykssj: null,
         jyjssj: null,
         cbje: null,
-        bz: null,
+        dxje: null,
+        sqje: null,
+        nsy: null,
+        bzxx: null,
         dkImg: null,
         surveyStatus: '2',
         importCode: null,