Przeglądaj źródła

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

lkk 8 miesięcy temu
rodzic
commit
062cd4f339

+ 1 - 1
src/components/TerrainAnalysis/TerrainCutFillAnalysis/TerrainCutFillAnalysisNew.vue

@@ -100,7 +100,7 @@ import { getDsm, cutFill } from "@/api/analse";
 import * as turf from "@turf/turf";
 import * as turf from "@turf/turf";
 import parse from "wellknown";
 import parse from "wellknown";
 import { loadGeoJSON, download, pickPoint } from "@/utils/MapHelper/help.js";
 import { loadGeoJSON, download, pickPoint } from "@/utils/MapHelper/help.js";
-import range from "@/components/mapview/range.vue"; ///mapview/range
+import range from "@/components/mapView/range.vue"; ///mapview/range
 let dataSource = {};
 let dataSource = {};
 export default {
 export default {
   name: "TerrainCutFillAnalysis",
   name: "TerrainCutFillAnalysis",

+ 1 - 1
src/main.js

@@ -44,7 +44,7 @@ import './utils/flexible.js'
 // 工具配置
 // 工具配置
 import Resource from "./common/js/language" //语言选择
 import Resource from "./common/js/language" //语言选择
 Vue.prototype.Resource = window.Resource = Resource;
 Vue.prototype.Resource = window.Resource = Resource;
-import URL_CONFIG from './common/js/config';
+import URL_CONFIG from './common/js/Config';
 window.URL_CONFIG = URL_CONFIG;
 window.URL_CONFIG = URL_CONFIG;
 import tooltip from './common/js/tooltip';
 import tooltip from './common/js/tooltip';
 window.createTooltip = tooltip;
 window.createTooltip = tooltip;

+ 143 - 0
src/views/LandConsolidation/components/check.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="hgxsc">
+    <el-form
+      :model="ruleForm"
+      ref="ruleForm"
+      label-width="100px"
+      :rules="rules"
+    >
+      <el-form-item label="分析范围:" prop="xzmj">
+        <range type="hgxfx" :keys="['hx', 'sc']" class="range" ref="range" />
+      </el-form-item>
+
+      <el-form-item label="预检名称:" prop="xmmc">
+        <el-input
+          v-model="ruleForm.xmmc"
+          size="mini"
+          placeholder="请输入预检名称"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+
+    <div class="bottomBtns">
+      <span class="clearBtn" @click="reset">取消</span>
+      <span class="sureBtn" @click="submitData">确定</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Add } from "@/api/ghss/hgxfx.js";
+import { Message, MessageBox } from "element-ui";
+import range from "@/components/mapView/range.vue"; ///mapview/range
+import moment from "moment";
+export default {
+  components: {
+    range,
+  },
+  props: {},
+
+  data() {
+    return {
+      ruleForm: {
+        xmmc: "",
+        xzfw: "",
+        xzmj: 0,
+      },
+      rules: {
+        xzmj: [{ required: true, message: "请填写范围的数据" }],
+        xmmc: [
+          { required: true, message: "请输入预检名称", trigger: "blur" },
+          {
+            min: 3,
+            max: 50,
+            message: "长度在 3 到 50 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.initform();
+  },
+  methods: {
+    initform() {
+      this.ruleForm.xmmc = `整治预检_${moment(new Date()).format(
+        "YYYYMMDDHHmmss"
+      )}`;
+    },
+
+    reset() {
+      this.ruleForm = {
+        xmmc: "",
+        xzfw: "",
+        xzmj: 0,
+      };
+      this.$refs.range.reset();
+    },
+    submitData() {
+      //更新范围
+      var _temp = this.$refs.range.getRange();
+      this.ruleForm.xzfw = _temp.xzfw;
+      this.ruleForm.xzmj = _temp.xzmj;
+      console.log(this.ruleForm);
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          if (!this.ruleForm.xzfw) {
+            Message.warning("请绘制或导入选址范围!");
+            return;
+          }
+
+          MessageBox.confirm("是否开始进行整治预检?", "整治预检", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            this.$emit("updateParent", "loading", true);
+            Add({ ...this.ruleForm }).then((res) => {
+              if (res.success) {
+                this.$emit("updateParent", "nowObj", this.ruleForm);
+                this.$emit("updateParent", "rzBsm", res.message);
+                this.reset();
+              } else {
+                Message.warning(res.message);
+              }
+              this.$emit("updateParent", "loading", false);
+            });
+          });
+        }
+      });
+    },
+  },
+  watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.hgxsc {
+  height: 100%;
+  line-height: 40px;
+  .rangDiv {
+    width: 100%;
+    // height: 100px;
+    display: flex;
+    justify-content: space-between;
+  }
+  .range {
+    flex: 1;
+    width: 100%;
+    // position: absolute;
+    // left: 100px;
+  }
+}
+/deep/ .el-input .el-input--mini .el-input--suffix {
+  width: 100%;
+}
+/deep/ .el-select {
+  width: 100%;
+}
+/deep/ .el-form-item__error {
+  top: 32px !important;
+}
+</style>

+ 365 - 0
src/views/LandConsolidation/components/fxjg.vue

@@ -0,0 +1,365 @@
+<template>
+  <div class="fxjg">
+    <div class="downloadDiv">
+      <div>
+        <span class="xmmc">
+          项目名称:
+          <span class="text">{{ scjgObj.xmmc }}</span>
+        </span>
+        <div
+          class="eicon"
+          :class="isshowAll ? 'eyes' : 'close_eyes'"
+          @click="allChange('all')"
+        ></div>
+      </div>
+      <div>
+        预检分析面积:
+        <span class="text">{{ compute(scjgObj.fxmj) }}亩</span>
+        <span class="export" @click="download">导出报告</span>
+      </div>
+    </div>
+
+    <div v-for="(eitem, i) in echarts" :key="i" class="echars">
+      <div class="echartTitle">
+        <div class="block-title">{{ eitem.label }}</div>
+        <div
+          class="eicon"
+          :class="eitem.iseyes ? 'eyes' : 'close_eyes'"
+          @click="eyesChaneg(i)"
+        ></div>
+        <div
+          class="eicon"
+          :class="eitem.isshow ? 'eshow' : 'eclose'"
+          @click="eitem.isshow = !eitem.isshow"
+        ></div>
+      </div>
+      <scjgContent
+        :ref="`contentRef${eitem.id}`"
+        v-show="eitem.isshow"
+        :litem="eitem"
+        :piseyes="eitem.iseyes"
+        @mapview="changeDataSources"
+      ></scjgContent>
+    </div>
+    <!-- <div class="bottomBtns">
+      <span></span>
+      <span class="sureBtn" @click="download">导出报告</span>
+    </div> -->
+  </div>
+</template>
+
+<script>
+import scjgContent from "../../complianceAnalysis/components/scjgContent.vue";
+// import collRecursiveTree from "./collRecursiveTree.vue";
+import { GetFxjg } from "@/api/ghss/hgxfx.js";
+
+import parse from "wellknown";
+let dataSourceList = {};
+let colors = [
+  "#62ADED",
+  "#DFE15A",
+  "#6EDC8D",
+  "#00A42E",
+  "#F9B447",
+  "#7F4FE5",
+  "#FF6969",
+  "#27CED9",
+  "#DF56F5",
+  "#DCFFAF",
+];
+export default {
+  components: { scjgContent },
+  props: {
+    scjgObj: {
+      type: Object,
+    },
+  },
+  data() {
+    return {
+      echarts: [],
+      ruleForm: {
+        name: "",
+        xzmj: "",
+        fileList: [],
+      },
+      tempdataSourcesId: null,
+      fileid: 1,
+      reflist: {},
+      isshowAll: false,
+    };
+  },
+  mounted() {
+    // this.initData();
+  },
+  methods: {
+    compute(mj) {
+      return mj ? (mj * 0.0015).toFixed(2) : 0;
+    },
+    addrefs(key, ref) {
+      this.reflist[key] = ref;
+    },
+    initData() {
+      console.log("----", this.$props.scjgObj);
+      this.echarts = [];
+      this.$emit("updateParent", "loading", true);
+      this.addPolygon(this.$props.scjgObj.geom, "all", "#ff0000", true);
+      GetFxjg({ bsm: this.$props.scjgObj.bsm }).then((res) => {
+        if (res.success) {
+          res.data.push({
+            bsm: "2d3f76707b4949cf9d55fdc2a1e3f36f",
+            children: [],
+            dataList: [],
+            jsf: 0,
+            rwbsm: "61581601570e45739bb47737ddf7379b",
+            scxbsm: "QHBH",
+            scxname: "整治前后土地利用结构变化",
+            scxstyle: 2,
+          });
+          res.data.push({
+            bsm: "2d3f76707b4949cf9d55fdc2a1e3f36f",
+            children: [],
+            dataList: [],
+            jsf: 0,
+            rwbsm: "61581601570e45739bb47737ddf7379b",
+            scxbsm: "XZGD",
+            scxname: "新增耕地",
+            scxstyle: 3,
+            area: 20,
+            area2: 2,
+          });
+          res.data.forEach((e) => {
+            let c = e.dataList || [];
+            c.map((ci) => {
+              ci.name = ci.yslx_name || ci.scxname;
+              // ci.value = this.compute(ci.mj);
+              ci.value = ci.mj;
+              ci.geom = ci.geom || "";
+              // ci.label = ci.mc_name;
+            });
+            this.echarts.push({
+              id: e.scxbsm,
+              label: e.scxname,
+              dataList: e.dataList,
+              lchildren: e.children || [],
+              iseyes: false,
+              isshow: false,
+              scxstyle: e.scxstyle,
+            });
+            if (e.scxstyle == 0) this.setEchart(c, e.scxbsm);
+            else if (e.scxstyle == 2) {
+              let jdData = {
+                legend_data: ["整治前", "整治后", "变化率"],
+                legendmap: [{ type: "bar" }, { type: "bar" }, { type: "line" }],
+                x_data: ["-sss-"],
+                params: {},
+                region: "",
+                result: [[10], [1], [10]],
+              };
+              this.setEchart(jdData, e.scxbsm);
+            }
+            if (e.children) this.lForEach(e.children, "echart");
+          });
+          this.$emit("updateParent", "loading", false);
+        }
+      });
+    },
+    allChange(id) {
+      this.isshowAll = !this.isshowAll;
+      if (dataSourceList[id]) {
+        dataSourceList[id].show = this.isshowAll;
+      } else {
+        this.addPolygon(this.$props.scjgObj.geom, "all", "#ff0000", true);
+      }
+    },
+    eyesChaneg(i) {
+      this.echarts[i].iseyes = !this.echarts[i].iseyes;
+      // if (i == 0 || i == 2) {
+      //   this.changeDataSources(this.echarts[i]);
+      // } else {
+      let iseyes = this.echarts[i].iseyes;
+      if (this.echarts[i].dataList)
+        this.echarts[i].dataList.forEach((child, ci) => {
+          this.changeDataSources({ ...child, iseyes }, colors[ci]);
+        });
+      this.lForEach(this.echarts[i].lchildren, "sources", iseyes);
+      // }
+      // emit("eyesChaneg");
+    },
+    lForEach(data, fun, iseyes) {
+      data.forEach((child) => {
+        if (child.dataList) {
+          child.dataList.forEach((ld, li) => {
+            if (fun == "sources")
+              this.changeDataSources({ ...ld, iseyes }, "#62ADED");
+            else {
+              ld.name = ld.yslx_name;
+              ld.value = ld.mj;
+            }
+          });
+        }
+        if (child.children) {
+          this.lForEach(child.children, fun, iseyes);
+        }
+
+        if (
+          fun == "echart" &&
+          child.scxstyle == 0 &&
+          child.scxbsm.indexOf("GGFWSS") >= 0
+        ) {
+          child.id = child.scxbsm;
+          setTimeout(() => {
+            this.setEchart(child.dataList, child.id, child.id);
+          }, 200);
+        }
+      });
+    },
+    changeDataSources({ geom, id, iseyes, iszoom }, color) {
+      if (iszoom) {
+        this.zoomTo(id, geom);
+      } else if (dataSourceList[id]) {
+        dataSourceList[id].show = iseyes;
+        this.tempdataSourcesId = null;
+      } else if (geom) {
+        this.addPolygon(geom, id, color);
+      }
+    },
+    zoomTo(id, geom) {
+      let zid = "zoom" + id;
+      if (!dataSourceList[zid]) {
+        this.tempdataSourcesId = zid;
+        this.addPolygon(geom, zid, "#ff0000");
+      }
+    },
+    setEchart(data, id, childid) {
+      this.$nextTick(() => {
+        let type = null;
+        if (!data.legend_data)
+          type = data.length <= 6 ? "horizontal" : "vertical";
+        if (!childid) this.$refs[`contentRef${id}`][0].setEchart(data, type);
+        else {
+          this.reflist[`contentRef${id}`].setEchart(data, type, childid);
+        }
+      });
+    },
+    // 加载GeoJSON数据
+    addPolygon(geom, id, colors, fillreset) {
+      let geojson = parse(geom);
+      console.log("---", geojson.type);
+      let _this = this;
+      // viewer.entities.removeAll();
+      let scolor = colors
+        ? Cesium.Color.fromCssColorString(colors)
+        : Cesium.Color.RED;
+      let fcolor =
+        colors && !fillreset
+          ? Cesium.Color.fromCssColorString(colors)
+          : Cesium.Color.WHITE;
+
+      let polygon = Cesium.GeoJsonDataSource.load(geojson, {
+        clampToGround: true,
+        stroke: scolor,
+        fill: fcolor.withAlpha(0.3), //注意:颜色必须大写,即不能为blue
+        strokeWidth: 5,
+      });
+      polygon.then(function (dataSource) {
+        // dataSource.id = id;
+        // 将数据源添加到Cesium Viewer
+        viewer.dataSources.add(dataSource);
+        viewer.zoomTo(dataSource);
+        dataSourceList[id] = dataSource;
+        if (id == "all") _this.isshowAll = true;
+        if (!geojson.type.includes("Polygon")) {
+          dataSource.entities.values.forEach((entity, ei) => {
+            if (entity.billboard) {
+              entity.billboard = new Cesium.BillboardGraphics({
+                image: "@/.././static/images/flypng/hos_point.png",
+                height: 40,
+                width: 40,
+                scale: 1.0,
+                pixelOffset: new Cesium.Cartesian2(0, -16),
+              });
+              // entity.point = {
+              //   pixelsize: 20,
+              //   color: Cesium.Color.fromCssColorString(colors),
+              // };
+            }
+          });
+        }
+      });
+    },
+
+    download() {
+      // window.open(this.$props.scjgObj.fxbg); //this.$props.scjgObj.task.fxbg
+      window.open(
+        window.axiosURI +
+          "/analyse/fzss/DownloadReport?filePath=" +
+          `${this.$props.scjgObj.fxbg}`
+      );
+    },
+    viewReport() {
+      window.open(this.$props.scjgObj.fxbg.replace(".docx", ".pdf"), "_blank");
+    },
+    reset() {
+      if (Object.keys(dataSourceList).length) viewer.dataSources.removeAll();
+      dataSourceList = {};
+    },
+  },
+
+  // watch(
+  //     () => prop.scjgObj,
+  //     (newValue, oldValue) => {
+  //       this.jcfwlist[0].value = newValue.task.fxmj + "m²";
+  //       nextTick(() => {
+  //         this.setEcharts(newValue);
+  //       });
+  //     }
+  //   );
+  watch: {
+    // scjgObj(newValue) {
+    //   this.initData();
+    // },
+    //监听区域id的变化,用于删除上一次点击生成的geojson区域面
+    tempdataSourcesId(newVal, oldVal) {
+      if (oldVal) {
+        viewer.dataSources.remove(dataSourceList[oldVal]);
+        dataSourceList[oldVal] = undefined;
+      }
+    },
+  },
+  beforeDestroy() {
+    viewer.entities.removeAll();
+    viewer.dataSources.removeAll();
+  },
+};
+</script>
+
+<style lang="scss">
+.fxjg {
+  height: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding-right: 10px;
+  line-height: 40px;
+  .downloadDiv {
+    position: relative;
+    .xmmc {
+      width: calc(100% - 60px);
+      display: inline-block;
+    }
+    .export {
+      width: 95px;
+      height: 28px;
+      background: #0f7ac8;
+      text-align: center;
+      line-height: 32px;
+      display: inline-block;
+      position: absolute;
+      right: 2px;
+      bottom: 6px;
+    }
+    .text {
+      color: #cddeeb;
+    }
+  }
+}
+</style>

+ 93 - 0
src/views/LandConsolidation/components/preCheck.vue

@@ -0,0 +1,93 @@
+<!--合规性分析-->
+<template>
+  <div class="preCheck">
+    {{ activeTabs }}
+    <el-tabs type="border-card" class="xz_box" v-model="activeTabs" stretch>
+      <el-tab-pane label="整治预检" name="check">
+        <Check
+          v-loading="loading"
+          @updateParent="changeData"
+          ref="check"
+        ></Check>
+      </el-tab-pane>
+      <el-tab-pane label="历史记录" name="lsju">
+        <Lsjl
+          v-loading="loading"
+          type="check"
+          @updateParent="changeData"
+          ref="lsju"
+        ></Lsjl>
+      </el-tab-pane>
+      <el-tab-pane
+        label="分析结果"
+        name="fxjg"
+        :disabled="activeTabs != 'fxjg'"
+      >
+        <Fxjg v-loading="loading" :scjgObj="nowObj" ref="fxjg"></Fxjg
+      ></el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import Check from "./check.vue";
+import Lsjl from "../../complianceAnalysis/components/lsjl.vue";
+import Fxjg from "./fxjg.vue";
+// import RzDtails from "./components/rzDtails.vue";
+
+export default {
+  name: "complianceAnalysis",
+  components: {
+    Check,
+    Lsjl,
+    Fxjg,
+    // RzDtails,
+  },
+  data() {
+    return {
+      loading: false,
+      activeTabs: "check",
+      // 日志
+      rzBsm: "",
+      nowObj: {}, //当前点击对象
+      // rwObj: {},
+      // tableData: [],
+    };
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    changeData(name, updata) {
+      this[name] = updata;
+    },
+  },
+  watch: {
+    activeTabs(newValue) {
+      console.log("----",newValue)
+      if (newValue != "check") this.$refs.check.reset();
+      if (newValue != "lsju") this.$refs.lsju.reset();
+      if (newValue != "fxjg") this.$refs.fxjg.reset();
+      if (newValue == "check") this.$refs.check.initform();
+      if (newValue == "lsju") {
+        this.$refs.lsju.reset();
+        this.$refs.lsju.changeForm();
+      }
+      if (newValue == "fxjg") {
+        this.$nextTick(() => {
+          this.$refs.fxjg.initData();
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.preCheck {
+  width: 100%;
+  height: 100%;
+}
+</style>
+<style lang="scss">
+// @import "ghzc";
+</style>

+ 1 - 0
src/views/LandConsolidation/components/sdgk.vue

@@ -238,6 +238,7 @@ export default {
     height: 200px !important;
     height: 200px !important;
   }
   }
   .pie_echart {
   .pie_echart {
+    width: 400px;
     height: 180px;
     height: 180px;
   }
   }
   .tzdiv {
   .tzdiv {

+ 8 - 0
src/views/LandConsolidation/index.vue

@@ -50,6 +50,12 @@
           ref="list"
           ref="list"
           v-show="activeIndex == 1"
           v-show="activeIndex == 1"
         ></List>
         ></List>
+        <preCheck
+          v-loading="loading"
+          @updateParent="changeData"
+          ref="preCheck"
+          v-show="activeIndex == 3"
+        ></preCheck>
       </div>
       </div>
     </div>
     </div>
     <div class="innerContainer bottomPane" v-drag>
     <div class="innerContainer bottomPane" v-drag>
@@ -76,6 +82,7 @@ import Organize from "./components/organize.vue";
 import Sdgk from "./components/sdgk.vue";
 import Sdgk from "./components/sdgk.vue";
 import Qhdb from "./components/qhdb.vue";
 import Qhdb from "./components/qhdb.vue";
 import List from "./components/list.vue";
 import List from "./components/list.vue";
+import preCheck from "./components/preCheck.vue";
 // import Details from "./components/details.vue";
 // import Details from "./components/details.vue";
 
 
 import * as pick_cockpit_vector from "@/components/Query/clickQuery/pick_cockpit_vector.js";
 import * as pick_cockpit_vector from "@/components/Query/clickQuery/pick_cockpit_vector.js";
@@ -85,6 +92,7 @@ export default {
     Sdgk,
     Sdgk,
     Qhdb,
     Qhdb,
     List,
     List,
+    preCheck,
     // Details,
     // Details,
     Organize
     Organize
   },
   },

+ 4 - 0
src/views/cockpit/common/ThreeStackedBarAndLine.vue

@@ -147,6 +147,10 @@ export default {
                 }],
                 }],
                 series: [],
                 series: [],
             }
             }
+            if(!obj.result)
+              obj.result = [[],[],[],[] ];
+              if(!obj.legend_data)
+              obj.legend_data = ['','','','' ];
             if(!obj.legendmap)
             if(!obj.legendmap)
             obj.legendmap = [
             obj.legendmap = [
                 { type: "line", data: obj.line_data },
                 { type: "line", data: obj.line_data },

+ 1 - 1
src/views/complianceAnalysis/components/hgxsc.vue

@@ -67,7 +67,7 @@
 <script>
 <script>
 import { Add, GetScx, UpdateScx } from "@/api/ghss/hgxfx.js";
 import { Add, GetScx, UpdateScx } from "@/api/ghss/hgxfx.js";
 import { Message, MessageBox } from "element-ui";
 import { Message, MessageBox } from "element-ui";
-import range from "@/components/mapview/range.vue"; ///mapview/range
+import range from "@/components/mapView/range.vue"; ///mapview/range
 import moment from "moment";
 import moment from "moment";
 export default {
 export default {
   components: {
   components: {

+ 10 - 0
src/views/complianceAnalysis/components/lsjl.vue

@@ -181,6 +181,8 @@ export default {
           break;
           break;
         case "gdbh":
         case "gdbh":
           next = "fxjg";
           next = "fxjg";
+        case "check":
+          next = "fxjg";
           break;
           break;
         default:
         default:
           break;
           break;
@@ -256,6 +258,14 @@ export default {
             this.datalist = [...this.datalist, ...res.rows];
             this.datalist = [...this.datalist, ...res.rows];
           }
           }
         });
         });
+      } else if (this.$props.type == "check") {
+        GetPage({ ...this.pageObj }).then((res) => {
+          setTimeout(() => {
+            this.$emit("updateParent", "loading", false);
+          }, 100);
+          this.listdisabled = res.data.length < 10;
+          this.datalist = [...this.datalist, ...res.data];
+        });
       }
       }
     },
     },
     zoomItem(item) {
     zoomItem(item) {

+ 27 - 5
src/views/complianceAnalysis/components/scjgContent.vue

@@ -27,12 +27,27 @@
         </span>
         </span>
       </div>
       </div>
     </div>
     </div>
+    <barAndLine
+      v-else-if="litem.scxstyle == 2"
+      class="echart"
+      ref="echartRef"
+    ></barAndLine>
+    <div v-else-if="litem.scxstyle == 3" class="xzgdcontent">
+      <div class="item">
+        <p>新增耕地地块</p>
+        <span class="cvalue">{{ (litem.area || 0).toFixed(2) }} </span>
+      </div>
+      <div class="item">
+        <p>新增耕地面积(平方米</p>
+        <span class="cvalue">{{ (litem.area2 || 0).toFixed(2) }} </span>
+      </div>
+    </div>
   </div>
   </div>
 </template>
 </template>
 
 
 <script>
 <script>
 import pie from "@/components/echartsTemplate/pie.vue";
 import pie from "@/components/echartsTemplate/pie.vue";
-
+import barAndLine from "@/views/cockpit/common/ThreeStackedBarAndLine.vue";
 export default {
 export default {
   name: "scjgContent",
   name: "scjgContent",
   props: {
   props: {
@@ -47,17 +62,19 @@ export default {
   data() {
   data() {
     return {};
     return {};
   },
   },
-  components: { pie },
+  components: { pie, barAndLine },
   mounted() {},
   mounted() {},
   methods: {
   methods: {
     setEchart(data, type) {
     setEchart(data, type) {
       this.$nextTick(() => {
       this.$nextTick(() => {
-        this.$refs.echartRef.setOptions({ data, type });
+        console.log(data, type, "---");
+        if (type) this.$refs.echartRef.setOptions({ data, type });
+        else this.$refs.echartRef.setOptions(data);
       });
       });
     },
     },
     echartClick(name, { iseyes }) {
     echartClick(name, { iseyes }) {
-      console.log('name: ', name);
-      let iszoom = iseyes == undefined;//红色高亮,不受眼睛控制
+      console.log("name: ", name);
+      let iszoom = iseyes == undefined; //红色高亮,不受眼睛控制
       if (this.piseyes || iszoom) {
       if (this.piseyes || iszoom) {
         let click = this.litem.dataList.filter((c) => c.name == name);
         let click = this.litem.dataList.filter((c) => c.name == name);
         if (click.length > 0) this.mapview({ ...click[0], iseyes, iszoom });
         if (click.length > 0) this.mapview({ ...click[0], iseyes, iszoom });
@@ -99,6 +116,11 @@ export default {
   .highcolor {
   .highcolor {
     color: #64daff;
     color: #64daff;
   }
   }
+  .item {
+    display: inline-block;
+    width: 48%;
+    height: 100px;
+  }
 }
 }
 </style>
 </style>
 
 

+ 1 - 1
src/views/farmlandProtection/components/fzjcyp.vue

@@ -59,7 +59,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import range from "@/components/mapview/range.vue"; //绘制范围
+import range from "@/components/mapView/range.vue"; //绘制范围
 import zdyModelPop from "./zdyModelPop.vue"; //自定义模型面板
 import zdyModelPop from "./zdyModelPop.vue"; //自定义模型面板
 import moment from "moment";
 import moment from "moment";
 import { Message } from "element-ui";
 import { Message } from "element-ui";

+ 1 - 1
src/views/modelStretch/index.vue

@@ -75,7 +75,7 @@
 </template>
 </template>
   
   
   <script>
   <script>
-import range from "@/components/mapview/range.vue"; ///mapview/range
+import range from "@/components/mapView/range.vue"; ///mapview/range
 import {} from "@/api/map";
 import {} from "@/api/map";
 import parse from "wellknown";
 import parse from "wellknown";
 import { getCentroid } from "@/utils/MapHelper/help.js";
 import { getCentroid } from "@/utils/MapHelper/help.js";

+ 1 - 1
src/views/siteselection/components/fzxz.vue

@@ -136,7 +136,7 @@
 
 
 <script>
 <script>
 import yxyzPop from "./yxyzPop.vue"; ///mapview/range
 import yxyzPop from "./yxyzPop.vue"; ///mapview/range
-import range from "@/components/mapview/range.vue"; ///mapview/range
+import range from "@/components/mapView/range.vue"; ///mapview/range
 import { Message } from "element-ui";
 import { Message } from "element-ui";
 import {
 import {
   GetDldmTree,
   GetDldmTree,