耕地地块列表

src/views/LandConsolidation/components/config.js

@@ -1,5 +1,5 @@
 
-export const xzForm = [
+export const zzForm = [
   [
     {
       label: '',
@@ -23,9 +23,9 @@ export const xzForm = [
   ]
 ]
 export const legends = [
-    { label: "试点区域", color: '#caf982' },
-    { label: "整治区域", color: '#80ffff' },
-    { label: "整治项目", color: '#facd91' }
+  { label: "试点区域", color: '#caf982' },
+  { label: "整治区域", color: '#80ffff' },
+  { label: "整治项目", color: '#facd91' }
 ]
 export const reasonList = [
   { name: "政府原因", code: 0 },
@@ -40,5 +40,29 @@ export const TableHeader = [
   { label: "操作", slot: "action" },
 ]
 
+export const xzForm = [
+  [
+    {
+      label: '',
+      prop: 'key',
+      span: 20,
+      component: 'ElInput',
+      componentProps: {
+        placeholder: '请输入地块编号'
+      }
+    },
+    {
+      prop: 'action',
+      span: 4
+    }
+  ]
+]
+export const xzTableHeader = [
+  { label: "新增耕地地块编号", prop: "xmmc" },
+  { label: "新增耕地面积（亩）", prop: "crmj", width: '80px', slot: "mj" },
+  { label: "新增耕地等别", prop: "ydkgsj", },
+  { label: "操作", slot: "action" },
+]
+
 
 

src/views/LandConsolidation/components/list.vue

@@ -52,7 +52,7 @@ import tablePage from "@/components/mapView/tablePage.vue";
 import customForm from "@/components/mapView/custom-form.vue";
 
 import { GetList } from "@/api/Idleland.js";
-import { xzForm, TableHeader, reasonList } from "./config";
+import { zzForm, TableHeader, reasonList } from "./config";
 import { loadGeoJSON } from "@/utils/MapHelper/help.js";
 let geoSources = {};
 export default {
@@ -82,7 +82,7 @@ export default {
         endTime: "",
       },
       datalist: [{}],
-      formConfig: xzForm,
+      formConfig: zzForm,
       cloumn: TableHeader,
       reasonList: reasonList,
       table: {

src/views/LandConsolidation/components/xzgd.vue

@@ -5,46 +5,55 @@
       <i class="el-icon-thumb"></i>
       图斑详情查询
     </span>
-    <div class="content sdata">
-      <div class="item" v-for="(sd, index) in sdlist" :key="index">
-        <div class="text">
-          <p>{{ sd.name }}</p>
-          <span class="cvalue">{{ (sdata.area || 0).toFixed(2) }} </span>
-          <span class="unit">{{ sd.unit }}</span>
+    <el-tabs type="border-card" class="xz_box" v-model="activeTabs" stretch>
+      <el-tab-pane label="新增耕地总览情况" name="gdzl">
+        <div class="content sdata">
+          <div class="item" v-for="(sd, index) in sdlist" :key="index">
+            <div class="text">
+              <p>{{ sd.name }}</p>
+              <span class="cvalue">{{ (sdata.area || 0).toFixed(2) }} </span>
+              <span class="unit">{{ sd.unit }}</span>
+            </div>
+          </div>
         </div>
-      </div>
-    </div>
-    <div class="echartlist">
-      <div class="echars">
-        <div class="echartTitle">
-          <div class="block-title">新增耕地</div>
+        <div class="echartlist">
+          <div class="echars">
+            <div class="echartTitle">
+              <div class="block-title">新增耕地</div>
+            </div>
+            <pie unit="亩" class="pie_echart" ref="echartRef0"></pie>
+          </div>
+          <div class="echars">
+            <div class="echartTitle">
+              <div class="block-title">新增耕地来源</div>
+            </div>
+            <pie unit="亩" class="pie_echart" ref="echartRef1"></pie>
+          </div>
+          <div class="echars">
+            <div class="echartTitle">
+              <div class="block-title">新增耕地来源流向</div>
+            </div>
+            <sankey class="echart" ref="echartRef2"></sankey>
+          </div>
         </div>
-        <pie unit="亩" class="pie_echart" ref="echartRef0"></pie>
-      </div>
-      <div class="echars">
-        <div class="echartTitle">
-          <div class="block-title">新增耕地来源</div>
-        </div>
-        <pie unit="亩" class="pie_echart" ref="echartRef1"></pie>
-      </div>
-      <div class="echars">
-        <div class="echartTitle">
-          <div class="block-title">新增耕地来源流向</div>
-        </div>
-        <sankey class="echart" ref="echartRef2"></sankey>
-      </div>
-    </div>
+      </el-tab-pane>
+      <el-tab-pane label="新增耕地地块信息" name="gdlist">
+        <xzlist ref="xzlist"></xzlist>
+      </el-tab-pane>
+    </el-tabs>
   </div>
 </template>
 
 <script>
 import pie from "@/components/echartsTemplate/pie.vue";
 import sankey from "@/components/echartsTemplate/sankey.vue";
+import xzlist from "./xzlist.vue";
 import { overview, district, reason } from "@/api/Idleland.js";
 export default {
   props: {},
   data() {
     return {
+      activeTabs: "gdzl",
       sdata: { suspected: {}, confirm: {}, disposal: {} },
       sdlist: [
         { name: "新增耕地面积", prop: "suspected", unit: "公顷" },
@@ -57,6 +66,7 @@ export default {
   components: {
     pie,
     sankey,
+    xzlist,
   },
   mounted() {
     this.getData();

src/views/LandConsolidation/index.vue

@@ -44,6 +44,7 @@
           <List
             v-loading="loading"
             @updateParent="changeData"
+            @cockpit="cockpit"
             @contrast="iscontrast = true"
             ref="list"
             v-show="activeIndex == 1"
@@ -51,6 +52,7 @@
           <Xzgd
             v-loading="loading"
             @updateParent="changeData"
+            @cockpit="cockpit"
             ref="xzgd"
             v-show="activeIndex == 2"
           ></Xzgd>
@@ -186,7 +188,7 @@ export default {
       console.log(newVal, "newVal");
       newVal.forEach((res) => {
         if (res.name == "id") {
-          this.handleView({ id: res.value }, this.$refs.qhdb.getType());
+          this.handleView({ id: res.value }, ""); //this.$refs.list.getType()
         }
       });
     },