maxiaoxiao 9 kuukautta sitten
vanhempi
commit
54e8f62009

+ 3 - 17
src/views/LandConsolidation/components/sdgk.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="sdgk">
+    <div class="tdTitle">试点概况</div>
     <div class="content sdata">
       <div class="item" v-for="(sd, index) in sdlist" :key="index">
         <div class="text">
@@ -130,7 +131,7 @@ export default {
       this.$emit("updateParent", "loading", true);
       this.params = { districtCode: this.region };
       this.GetOverview();
-      if (this.region == "4602") this.GetDistrict();
+
       this.GetSumList();
     },
     GetOverview() {
@@ -139,21 +140,6 @@ export default {
         this.$emit("updateParent", "loading", false);
       });
     },
-    GetDistrict() {
-      this.jdData.x_data = [];
-      this.jdData.result = [[], [], [], []];
-      district(this.params).then((res) => {
-        res.data.forEach((jdData) => {
-          this.jdData.x_data.push(jdData.districtName);
-          this.jdData.result[0].push(jdData.confirmAre.toFixed(2));
-          this.jdData.result[1].push(jdData.disposalArea.toFixed(2));
-          this.jdData.result[2].push((jdData.idleRate * 100).toFixed(2));
-          this.jdData.result[3].push((jdData.disposalRate * 100).toFixed(2));
-        });
-        this.setEchart(this.jdData, 1);
-        this.$emit("updateParent", "loading", false);
-      });
-    },
     GetSumList() {
       reason(this.params).then((res) => {
         res.data.map((a) => {
@@ -188,7 +174,7 @@ export default {
   height: 100%;
   .content {
     width: 100%;
-    height: 200px;
+    height: 190px;
     .item {
       width: 32%;
       // height: 100px;

+ 49 - 21
src/views/LandConsolidation/index.vue

@@ -1,12 +1,6 @@
 <!--全域土地综合整治专题-->
 <template>
-  <div class="ghzc Idleland">
-    <el-radio-group v-model="tabPosition" style="margin-bottom: 30px">
-      <el-radio-button label="top">top</el-radio-button>
-      <el-radio-button label="right">right</el-radio-button>
-      <el-radio-button label="bottom">bottom</el-radio-button>
-      <el-radio-button label="left">left</el-radio-button>
-    </el-radio-group>
+  <div class="ghzc LandConsolidation">
     <div class="headerCheck">
       <ul>
         <li
@@ -44,8 +38,28 @@
         </span> -->
       </h2>
       <div class="xz_box">
-        <Sdgk v-loading="loading" @updateParent="changeData" ref="sdgk"></Sdgk>
-        <!-- <Xzgl v-loading="loading" @updateParent="changeData" ref="xzgl"></Xzgl> -->
+        <Sdgk
+          v-loading="loading"
+          @updateParent="changeData"
+          ref="sdgk"
+          v-show="activeIndex == 0"
+        ></Sdgk>
+        <List
+          v-loading="loading"
+          @updateParent="changeData"
+          ref="list"
+          v-show="activeIndex == 1"
+        ></List>
+      </div>
+    </div>
+    <div class="innerContainer bottomPane" v-drag>
+      <div class="xz_box">
+        <Qhdb
+          v-loading="loading"
+          @updateParent="changeData"
+          ref="qhdb"
+          v-show="activeIndex == 0"
+        ></Qhdb>
       </div>
     </div>
     <Details ref="detailModal"></Details>
@@ -54,7 +68,8 @@
 
 <script>
 import Sdgk from "./components/sdgk.vue";
-// import Xzgl from "./components/xzgl.vue";
+import Qhdb from "./components/qhdb.vue";
+import List from "./components/list.vue";
 // import Details from "./components/details.vue";
 
 import * as pick_cockpit_vector from "@/components/Query/clickQuery/pick_cockpit_vector.js";
@@ -62,13 +77,14 @@ export default {
   name: "LandConsolidation",
   components: {
     Sdgk,
-    // Xzgl,
+    Qhdb,
+    List,
     // Details,
   },
   data() {
     return {
       loading: false,
-      activeTabs: "sdgk",
+
       xzqh: "",
       checkList: [
         {
@@ -84,7 +100,7 @@ export default {
           title: "整治预检",
         },
       ],
-      activeIndex: 0,
+      activeIndex: 1,
     };
   },
   computed: {
@@ -109,7 +125,7 @@ export default {
     },
     regionChange() {
       this.$refs.sdgk.regionChange(this.xzqh);
-      this.$refs.xzgl.regionChange(this.xzqh);
+      this.$refs.qhdb.regionChange(this.xzqh);
     },
     cockpit() {
       //驾驶舱矢量数据点选查询
@@ -120,16 +136,16 @@ export default {
     },
   },
   watch: {
-    activeTabs(newValue) {
-      if (newValue != "xzgl") this.$refs.xzgl.reset();
-      if (newValue == "sdgk") this.$refs.sdgk.getData();
-      // if (newValue == "xzgl") this.$refs.xzgl.changeForm();
+    activeIndex(newValue) {
+      // if (newValue != "qhdb") this.$refs.qhdb.reset();
+      // if (newValue == "sdgk") this.$refs.sdgk.getData();
+      // if (newValue == "qhdb") this.$refs.qhdb.changeForm();
     },
     computed_vectorData(newVal) {
       console.log(newVal, "newVal");
       newVal.forEach((res) => {
         if (res.name == "id") {
-          this.handleView({ id: res.value }, this.$refs.xzgl.getType());
+          this.handleView({ id: res.value }, this.$refs.qhdb.getType());
         }
       });
     },
@@ -138,7 +154,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.Idleland {
+.LandConsolidation {
   .xz_box {
     padding-bottom: 0;
   }
@@ -191,14 +207,26 @@ export default {
       background-color: transparent !important;
     }
   }
+
+  .bottomPane {
+    width: 45%;
+    height: 330px;
+    top: calc(100% - 360px);
+    left: 480px;
+  }
 }
 </style>
 <style lang="scss">
-.Idleland {
+.LandConsolidation {
   .region {
     width: 100px !important;
     margin: 0 20px;
   }
+  .tdTitle {
+    color: #64daff;
+    font-size: 18px;
+    font-weight: bold;
+  }
   .el-cascader--mini {
     top: 0px;
     background: transparent;