Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/LandConsolidation/components/AsideBottom.vue

@@ -21,12 +21,6 @@
   </div>
 </template>
 <script >
-// import { ref } from "vue";
-// import { useTimerInterval } from '@/hooks/timerInterval'
-// const { config } = window;
-
-// const global = inject<any>("global");
-
 export default {
   props: {
     interObj: {

src/views/LandConsolidation/components/config.js

@@ -27,11 +27,12 @@ export const legends = [
   { label: "整治区域", color: '#80ffff' },
   { label: "整治项目", color: '#facd91' }
 ]
+
 export const reasonList = [
-  { name: "政府原因", code: 0 },
-  { name: "企业原因", code: 1 },
-  { name: "非政府原因和不可抗力", code: 2 },
-  { name: "其他", code: 3 },
+  { name: "农用地整理项目", code: 0 },
+  { name: "建设用地整治项目", code: 1 },
+  { name: "乡村生态保护修复项目", code: 2 },
+  { name: "乡村历史文化保护项目", code: 3 },
 ]
 export const TableHeader = [
   { label: "项目名称", prop: "xmmc" },

src/views/LandConsolidation/components/organize.vue

@@ -8,7 +8,7 @@
       <div class="item" v-for="(sd, index) in orgnList" :key="index">
         <div class="text">
           <p>{{ sd.name }}</p>
-          <span class="cvalue">{{ (sdata.area || 0).toFixed(2) }} </span>
+          <span class="cvalue">{{ (sdata[sd.prop] || 0).toFixed(2) }} </span>
           <span class="unit">{{ sd.unit }}</span>
         </div>
       </div>
@@ -19,19 +19,22 @@
       </div>
       <div class="JSContent">
         <div class="jsitem">
-          <p class="tvalue">+0.72</p>
+          <p class="tvalue">
+            {{ (jxyddata.zzqjsydmj - jxyddata.zzhjsydmj).toFixed(2) }}
+          </p>
           <p>建设用地变化</p>
         </div>
         <div class="itemCon" style="width: 55%">
-          <span
-            ><span class="font_color">整治前建设用地</span
-            ><span style="padding: 0 3px">{{ 20.88 }}</span> 公顷</span
-          >
-          <span
-            ><span class="font_color">整治后建设用地</span
-            ><span style="padding: 0 3px">{{ 20.88 }}</span
-            >公顷</span
-          >
+          <span>
+            <span class="font_color">整治前建设用地</span>
+            <span style="padding: 0 3px">{{ jxyddata.zzqjsydmj }}</span>
+            公顷
+          </span>
+          <span>
+            <span class="font_color">整治后建设用地</span>
+            <span style="padding: 0 3px">{{ jxyddata.zzhjsydmj }} </span>
+            公顷
+          </span>
         </div>
       </div>
     </div>
@@ -43,7 +46,7 @@
         <span v-for="(item, i) in cjfkList" :key="i"
           ><span class="font_color">{{ item.name }}</span
           ><span style="padding: 0 3px; color: #ec808d; font-size: 14px">{{
-            item.area
+            jxyddata[item.prop]
           }}</span>
           {{ item.unit }}</span
         >
@@ -61,7 +64,9 @@
           </div>
           <div class="text">
             <p>{{ "拟建新面积" }}</p>
-            <span class="cvalue">{{ (4.38 || 0).toFixed(2) }} </span>
+            <span class="cvalue"
+              >{{ (jxyddata.jxyd_njxyd || 0).toFixed(2) }}
+            </span>
             <span class="unit">{{ "公顷" }}</span>
           </div>
         </div>
@@ -87,7 +92,7 @@
             <span
               ><span
                 style="color: #ec808d; font-size: 18px; margin-right: 3px"
-                >{{ 0 }}</span
+                >{{ (jxyddata.clydph_cljsyd || 0).toFixed(2) }}</span
               >
               公顷
             </span>
@@ -105,7 +110,7 @@
             <span
               ><span
                 style="color: #ec808d; font-size: 18px; margin-right: 3px"
-                >{{ 0 }}</span
+                >{{ (jxyddata.clydph_cljsyd_xcy || 0).toFixed(2) }}</span
               >
               公顷</span
             >
@@ -118,7 +123,8 @@
   
   <script>
 import pie from "@/components/echartsTemplate/pie.vue";
-import { overview, district, reason } from "@/api/Idleland.js";
+import { overview, reason } from "@/api/Idleland.js";
+import { QueryOne, QueryList } from "@/api/cockpitNew";
 export default {
   props: {},
   data() {
@@ -130,22 +136,23 @@ export default {
         zd1: require("../../../../static/images/overview/icon_yrkkg.png"),
       },
       orgnList: [
-        { name: "新增耕地", prop: "suspected", unit: "公顷" },
-        { name: "新增永久基本农田", prop: "confirm", unit: "公顷" },
-        { name: "提质改造", prop: "disposal", unit: "公顷" },
-        { name: "生态修复", prop: "disposal", unit: "公顷" },
-        { name: "新增生态用地", prop: "disposal", unit: "公顷" },
+        { name: "新增耕地", prop: "xzgdmj", unit: "公顷" },
+        { name: "新增永久基本农田", prop: "xzyjjbntmj", unit: "公顷" },
+        { name: "提质改造", prop: "tzgzmj", unit: "公顷" },
+        { name: "生态修复", prop: "stxfmj", unit: "公顷" },
+        { name: "新增生态用地", prop: "xzstydmj", unit: "公顷" },
       ],
       sdata: {},
+      jxyddata: {},
       cjfkList: [
-        { name: "拟拆旧面积", area: "10.05", unit: "公顷" },
-        { name: "复垦为耕地", area: "0", unit: "公顷" },
-        { name: "拆迁房屋", area: "196", unit: "幢" },
-        { name: "复垦为种植园地", area: "196", unit: "公顷" },
-        { name: "动迁居民", area: "0.001", unit: "户" },
-        { name: "复垦为林草地", area: "74", unit: "公顷" },
-        { name: "动迁人口", area: "3.49", unit: "人" },
-        { name: "复垦为其他农用地", area: "315", unit: "公顷" },
+        { name: "拟拆旧面积", prop: "zzqjsydmj", unit: "公顷" },
+        { name: "复垦为耕地", prop: "zjfk_fkgd", unit: "公顷" },
+        { name: "拆迁房屋", prop: "zjfk_cqfw", unit: "幢" },
+        { name: "复垦为种植园地", prop: "zjfk_fkzzy", unit: "公顷" },
+        { name: "动迁居民", prop: "zjfk_dqjm", unit: "户" },
+        { name: "复垦为林草地", prop: "zjfk_fklcd", unit: "公顷" },
+        { name: "动迁人口", prop: "zjfk_dqrk", unit: "人" },
+        { name: "复垦为其他农用地", prop: "zjfk_fkqtnyd", unit: "公顷" },
       ],
       myChart: null,
     };
@@ -154,7 +161,6 @@ export default {
     pie,
   },
   mounted() {
-    this.getData();
     this.initEcharts();
   },
   methods: {
@@ -170,27 +176,43 @@ export default {
     },
     getData() {
       this.$emit("updateParent", "loading", true);
-      this.params = { districtCode: this.region };
+      this.Getzzlx();
       this.GetOverview();
+      this.Getjxyd();
+    },
 
-      this.GetSumList();
+    async Getzzlx() {
+      let { data } = await QueryList({
+        jscType: "qytuzz_sdzl_sdmb_zzlx",
+        id: this.region,
+      });
+      let num = 0;
+      data.forEach((res) => {
+        res.name = res.key;
+        res.value = res.value;
+        num += res.value;
+      });
+      this.setEchart(
+        { data, type: '"horizontal"', title: { text: "整治总规模", num } },
+        0
+      );
     },
     GetOverview() {
-      overview(this.params).then((res) => {
-        this.sdata = res.data || {};
+      QueryList({
+        jscType: "qytuzz_sdzl_sdmb_zzxx",
+        id: this.region,
+      }).then((res) => {
+        this.sdata = res.data.length ? res.data[0] : {};
         this.$emit("updateParent", "loading", false);
       });
     },
-    GetSumList() {
-      reason(this.params).then((res) => {
-        res.data.map((a) => {
-          a.name = a.reason;
-          a.value = a.area.toFixed(2);
-        });
-        let redPercent = 60;
-        let bluePercent = 40;
-        const background = `linear-gradient(to right,#DFE15A ${redPercent}%,#62ADED   ${bluePercent}%)`;
-        this.setEchart({ data: res.data, type: '"horizontal"',title:{text:'整治总规模',num:48.3} }, 0);
+    Getjxyd() {
+      QueryList({
+        jscType: "qytuzz_sdzl_ydzlqk_jxydxq",
+        id: this.region,
+      }).then((res) => {
+        console.log("--", res);
+        this.jxyddata = res.data.length ? res.data[0] : {};
         this.$emit("updateParent", "loading", false);
       });
     },

src/views/LandConsolidation/index.vue

@@ -17,6 +17,7 @@
       <div class="innerContainer leftPane" v-drag>
         <h2 class="Pangetitle darg-div el-col">
           <span class="pange_text">全域土地综合整治专题 </span>
+          <i class="document el-icon-document" @click="drawer = !drawer"></i>
           <div class="region">
             <!-- clearable -->
             <el-cascader
@@ -87,11 +88,16 @@
         class="innerContainer rightPane newContainer"
         v-show="activeIndex == 0"
       >
-        <Organize></Organize>
+        <Organize ref="organize"></Organize>
       </div>
     </div>
     <Details ref="detailModal"></Details>
     <Contrast ref="contrastModal" v-if="iscontrast"></Contrast>
+    <iframe
+      v-if="drawer"
+      src=". /data/方案文档浏览.html"
+      style="width: 100%; height: 100%; position: absolute"
+    ></iframe>
   </div>
 </template>
 
@@ -122,6 +128,7 @@ export default {
   data() {
     return {
       loading: false,
+      drawer: false,
       xzqh: "",
       checkList: [
         {
@@ -148,7 +155,8 @@ export default {
     },
   },
   created() {
-    store.setCockpitDate(sessionStorage.getItem("cockpitDate").split(","));
+    if (sessionStorage.getItem("cockpitDate"))
+      store.setCockpitDate(sessionStorage.getItem("cockpitDate").split(","));
   },
   mounted() {
     this.xzqh = store.state.cockpit_region.id;
@@ -163,8 +171,7 @@ export default {
       this.$refs.detailModal.handleView(row, type);
     },
     regionChange() {
-      this.$refs.sdgk.regionChange(this.xzqh);
-      this.$refs.qhdb.regionChange(this.xzqh);
+      this.onClick(this.activeIndex);
     },
     cockpit() {
       //驾驶舱矢量数据点选查询
@@ -174,8 +181,9 @@ export default {
       this.activeIndex = val;
       if (val != 0) this.$refs.sdgk.reset();
       if (val == 0) {
-        this.$refs.sdgk.getData();
-        this.$refs.qhdb.getData();
+        this.$refs.sdgk.regionChange(this.xzqh);
+        this.$refs.qhdb.regionChange(this.xzqh);
+        this.$refs.organize.regionChange(this.xzqh);
       }
       if (val == 1) this.$refs.list.searchFun();
       if (val == 2) this.$refs.xzgd.getData();
@@ -200,6 +208,17 @@ export default {
   .xz_box {
     padding-bottom: 0;
   }
+  .document {
+    // position: absolute;
+    // right: 110px;
+    // top: 19px;
+    color: cornflowerblue;
+    font-size: 24px;
+    margin-left: 10px;
+    margin-top: 5px;
+    cursor: pointer;
+    z-index: 100;
+  }
   .clearBtn {
     cursor: pointer;
     z-index: 200;