Browse Source

切换,新增耕地列表

maxiaoxiao 8 months ago
parent
commit
35f3d4a8bc

+ 1 - 1
src/components/echartsTemplate/sankey.vue

@@ -59,7 +59,7 @@ export default {
       }
       option.series.data = data;
       option.series.links = links;
-      option = this.myChart.setOption(option);
+      this.myChart.setOption(option);
     },
   },
   mounted() {

+ 4 - 4
src/views/LandConsolidation/components/config.js

@@ -58,10 +58,10 @@ export const xzForm = [
   ]
 ]
 export const xzTableHeader = [
-  { label: "新增耕地地块编号", prop: "xmmc" },
-  { label: "新增耕地面积(亩)", prop: "crmj", width: '80px', slot: "mj" },
-  { label: "新增耕地等别", prop: "ydkgsj", },
-  { label: "操作", slot: "action" },
+  { label: "地块编号", prop: "xmmc" },
+  { label: "面积(亩)", prop: "crmj", slot: "mj" },
+  { label: "等别", prop: "ydkgsj", },
+  { label: "操作", slot: "action", width: '80px', },
 ]
 
 

+ 2 - 2
src/views/LandConsolidation/components/list.vue

@@ -184,10 +184,10 @@ export default {
     },
     detail(row) {
       this.flyTo(row);
-      this.bus.$emit("handleView", row);
+      this.bus.$emit("handleView", row, "整治项目");
     },
     handle(row) {
-      this.$emit('contrast', row);
+      this.$emit("contrast", row);
     },
     changerdxz() {
       this.pageObj.isConfirm = !this.pageObj.isConfirm;

+ 2 - 2
src/views/LandscapeProject/index.vue

@@ -3,9 +3,9 @@
   <div class="ghzc LandscapeProject">
     <Boxcommon :islist="islist" ref="Boxcommon">
       <template v-slot:title>
-        <!-- <span class="clearBtn" @click="changeType">
+        <span class="clearBtn" @click="changeType">
           切换到工程{{ islist ? "总览" : "列表" }}
-        </span> -->
+        </span>
       </template>
       <template v-slot:all>
         <div class="xz_box" v-show="!islist">