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

src/components/Query/clickQuery/MultiLevelQuery.vue

@@ -228,10 +228,10 @@ export default {
                                     })
                                 });
 
-                                store.state.query_pick_pane.push({
-                                    name: element.dataname,
-                                    value: element.data,
-                                });
+                                // store.state.query_pick_pane.push({
+                                //     name: element.dataname,
+                                //     value: element.data,
+                                // });
 
                                 // that.draw_vector(e);
                             }

src/components/Query/clickQuery/clickQuery.vue

@@ -43,7 +43,7 @@
       </el-collapse>
     </div>
 
-    <CockpitVector></CockpitVector>
+    <CockpitVector v-show="store.state.query_vector_input"></CockpitVector>
     <MultiLevelQuery ref="MultiLevelQuery" />
   </div>
 </template>

src/store/store.js

@@ -44,7 +44,7 @@ var store2 = {
         xzqh_flag: true,
         query_pick_pane: [],
         query_pick_last_pane: null,
-
+        query_vector_input:false,
         cockpit_wpjg: {
             title: {},
             echart: {}

src/views/cockpit/bjxm.vue

@@ -15,10 +15,16 @@
         <div class="icon">
           <div class="icon_zxkg"></div>
         </div>
-        <div class="text" @click="draw_vector">
+        <!-- <div class="text" @click="draw_vector">
           <p>报建数量</p>
           <span>{{ left_value == 'csbj' ? sdata.sj_number : 0 }}</span>个
           <i style="pointer-events:all" :class="{ 'el-icon-view-switch': icon_switch, 'el-icon-view': true }"></i>
+        </div> -->
+
+        <div class="text">
+          <p>报建数量</p>
+          <span>{{ left_value == 'csbj' ? sdata.sj_number : 0 }}</span>个
+          <!-- <i style="pointer-events:all" :class="{ 'el-icon-view-switch': icon_switch, 'el-icon-view': true }"></i> -->
         </div>
       </div>
       <div class="item">

src/views/cockpit/tdsy.vue

@@ -880,7 +880,7 @@ export default {
     switch_vector_tdgy_gy_jd(flag) {
       // this.gy_jd_entity.show = flag
       // console.log('flag: ', flag);
-
+      store.state.query_vector_input = !store.state.query_vector_input
       tdsy.hidden(flag);
       // if (flag) {
       //   tdsy.add();

src/views/complianceAnalysis/components/collRecursiveTree.vue

@@ -0,0 +1,92 @@
+<template>
+  <div class="collapse-item">
+    <el-collapse-item
+      v-for="litem in data"
+      :key="litem.scxbsm"
+      :name="litem.title"
+    >
+      <template slot="title"> {{ litem.scxname }} </template>
+      <div v-if="litem.scxstyle == '1'">
+        <div v-for="ldata in litem.dataList" :key="ldata.scxbsm">
+          <el-tooltip
+            v-if="ldata.yslx_name.length > 0"
+            :content="ldata.yslx_name"
+            placement="bottom-start"
+          >
+            <span class="name">{{ ldata.yslx_name }} </span>
+          </el-tooltip>
+          <span class="value"> {{ compute(ldata.mj) }}</span>
+          亩
+          <span class="tools">
+            <i
+              class="header-icon el-icon-place"
+              @click.stop="mapviewClick(ldata)"
+            ></i>
+          </span>
+        </div>
+      </div>
+      <recursive-tree
+        v-if="litem.children"
+        :data="litem.children"
+        :piseyes="piseyes"
+        @mapview="mapview"
+      />
+    </el-collapse-item>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "recursive-tree",
+  props: {
+    data: {
+      type: Array
+    },
+    piseyes: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {};
+  },
+  components: {},
+  methods: {
+    compute(mj) {
+      return mj ? (mj * 0.0015).toFixed(2) : 0;
+    },
+    mapviewClick(ldata) {
+      if (ldata.iseyes == undefined || !this.piseyes) ldata.iseyes = true;
+      this.$set(ldata, "iseyes", !ldata.iseyes);
+      this.mapview({ ...ldata, id: ldata.yslx });
+    },
+    mapview(data) {
+      this.$emit("mapview", data);
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.collapse-item {
+  .name {
+    // width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .value {
+    width: 40px;
+    color: #64daff;
+    padding: 0px 4px;
+    text-align: center;
+  }
+  .tools {
+    position: absolute;
+    right: 30px;
+    cursor: pointer;
+  }
+  .highcolor {
+    color: #64daff;
+  }
+}
+</style>

src/views/complianceAnalysis/components/scjg.vue

@@ -37,13 +37,12 @@
         @echartClick="(name, iseyes) => echartClick(name, iseyes, i)"
         :ref="`echartRef`"
       ></pie>
-      <!-- <collapseTree
-        v-if="eitem.lchildren.length"
-        v-show="eitem.isshow"
-        :treeData="eitem.lchildren"
-      ></collapseTree> -->
       <el-collapse v-if="eitem.lchildren.length" v-show="eitem.isshow">
-        <recursiveTree :data="eitem.lchildren"></recursiveTree>
+        <collRecursiveTree
+          :data="eitem.lchildren"
+          :piseyes="eitem.iseyes"
+          @mapview="changeDataSources"
+        ></collRecursiveTree>
       </el-collapse>
     </div>
     <!-- <div class="bottomBtns">
@@ -55,10 +54,9 @@
 
 <script>
 import pie from "@/components/echartsTemplate/pie.vue";
-import collapseTree from "./collapseTree.vue";
-import recursiveTree from "./recursive-tree.vue";
+import collRecursiveTree from "./collRecursiveTree.vue";
 import { GetFxjg } from "@/api/ghss/hgxfx.js";
-import hgxfx from "../../../../static/data/ghss/data.js";
+// import hgxfx from "../../../../static/data/ghss/data.js";
 import parse from "wellknown";
 let dataSourceList = {};
 let colors = [
@@ -74,7 +72,7 @@ let colors = [
   "#DCFFAF"
 ];
 export default {
-  components: { pie, collapseTree, recursiveTree },
+  components: { pie, collRecursiveTree },
   props: {
     scjgObj: {
       type: Object
@@ -101,31 +99,31 @@ export default {
     initData() {
       this.echarts = [];
       this.$emit("updateParent", "loading", true);
-      // GetFxjg({ bsm: this.$props.scjgObj.bsm }).then(res => {
-      //   if (res.success) {
-      hgxfx.jg.data.forEach((e, ei) => {
-        let c = e.dataList || [];
-        c.map(ci => {
-          ci.name = ci.yslx_name || ci.scxname;
-          ci.value = this.compute(ci.mj);
-          ci.id = ci.yslx || ci.scxbsm;
-          ci.geom = ci.geom || (ci.data ? ci.data.geom : "");
-          // ci.label = ci.mc_name;
-        });
-        this.echarts.push({
-          id: e.scxbsm,
-          label: e.scxname,
-          children: c,
-          lchildren: e.children || [],
-          iseyes: false,
-          isshow: false
-        });
-        if (c.length > 0) this.setEchart(c, ei);
-        // if (e.children) console.log(e.children)
+      GetFxjg({ bsm: this.$props.scjgObj.bsm }).then(res => {
+        if (res.success) {
+          res.data.forEach((e, ei) => {
+            let c = e.dataList || [];
+            c.map(ci => {
+              ci.name = ci.yslx_name || ci.scxname;
+              ci.value = this.compute(ci.mj);
+              ci.id = ci.yslx || ci.scxbsm;
+              ci.geom = ci.geom || (ci.data ? ci.data.geom : "");
+              // ci.label = ci.mc_name;
+            });
+            this.echarts.push({
+              id: e.scxbsm,
+              label: e.scxname,
+              children: c,
+              lchildren: e.children || [],
+              iseyes: false,
+              isshow: false
+            });
+            if (c.length > 0) this.setEchart(c, ei);
+            // if (e.children) console.log(e.children)
+          });
+          this.$emit("updateParent", "loading", false);
+        }
       });
-      this.$emit("updateParent", "loading", false);
-      //   }
-      // });
     },
     eyesChaneg(i) {
       this.echarts[i].iseyes = !this.echarts[i].iseyes;
@@ -136,9 +134,22 @@ export default {
       this.echarts[i].children.forEach((child, ci) => {
         this.changeDataSources({ ...child, iseyes }, colors[ci]);
       });
+      this.lchangeDataSources(this.echarts[i].lchildren, iseyes);
       // }
       // emit("eyesChaneg");
     },
+    lchangeDataSources(data, iseyes) {
+      data.forEach((child, ci) => {
+        if (child.dataList) {
+          child.dataList.forEach((ld, li) => {
+            this.changeDataSources({ ...ld, id: ld.yslx, iseyes }, colors[li]);
+          });
+        }
+        if (child.children) {
+          this.lchangeDataSources(child.children, iseyes);
+        }
+      });
+    },
     changeDataSources({ geom, id, iseyes }, color) {
       if (dataSourceList[id]) {
         dataSourceList[id].show = iseyes;
@@ -170,7 +181,7 @@ export default {
       // viewer.entities.removeAll();
       let scolor = colors
         ? Cesium.Color.fromCssColorString(colors)
-        : Cesium.Color.BLUE;
+        : Cesium.Color.RED;
       let fcolor = colors
         ? Cesium.Color.fromCssColorString(colors)
         : Cesium.Color.WHITE;

src/views/siteselection/components/fzxz.vue

@@ -32,7 +32,7 @@
           placeholder="请输入建设单位"
         ></el-input>
       </el-form-item>
-      <el-form-item label="数据源:" prop="sjy">
+      <!-- <el-form-item label="数据源:" prop="sjy">
         <el-select
           v-model="ruleForm.sjy"
           placeholder="请选择数据源"
@@ -48,7 +48,7 @@
           >
           </el-option>
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="用地类型:" prop="ydlx">
         <el-cascader
           ref="Cascader"
@@ -167,10 +167,8 @@ export default {
           { required: true, message: "请输入用地面积", trigger: "blur" },
         ],
 
-        sjy: [{ required: true, message: "请选择数据源", trigger: "change" }],
-        xzys: [
-          { required: true, message: "请选择选址约束", trigger: "change" },
-        ],
+        // sjy: [{ required: true, message: "请选择数据源", trigger: "change" }],
+        xzys: [{ required: true, message: "请选择选址约束", trigger: "change" }],
       },
       options: [],
       tableData: [],

static/data/ghss/data.js

@@ -75,7 +75,8 @@ var data = {
     xxghlist: [
 		{ name: "商业用地", value:0.0347 },
 		{ name: "商务金融用地", value:0.0147 },
-    ]
+    ],
+
 };
 data.addList = function (adata) {
     let fid = adata.xmmc.indexOf("东岸卓越城项目") >= 0 ? 1 : 2;