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

src/components/Query/clickQuery/MultiLevelQuery.vue

@@ -1,6 +1,6 @@
 <template>
-    <el-tabs class="multi_level_query_table" v-if="store.state.query_pick_pane.length > 0" 
-        @tab-click="handleClick" @tab-remove="removeTab">
+    <el-tabs class="multi_level_query_table" v-if="store.state.query_pick_pane.length > 0" @tab-click="handleClick"
+        @tab-remove="removeTab">
 
 
         <el-tab-pane :label="store.state.query_pick_last_pane.name" name="second">
@@ -24,7 +24,7 @@
             v-if="item.show">
 
             <div v-if="item.name != '权属'">
-                <pie class="echart" unit="平方米" :ref="`echartRef`"></pie>
+                <pie class="echart" unit="平方米" :ref="`echartRef`" @echartClick="echartClick"></pie>
 
                 <el-table :data="tableData" style="width: 100%" :header-cell-style="{
                     background: 'rgba(10, 25, 38, 0.6)',
@@ -318,6 +318,69 @@ export default {
                     roll: 0
                 },
             });
+        },
+        reset() {
+
+            for (let index = 0; index < 10; index++) {
+                var len = viewer.dataSources.length;
+                if (len > 0) {
+                    for (var n = 0; n < len; n++) {
+
+                        if (viewer.dataSources.get(n) != undefined && viewer.dataSources.get(n).name != undefined && viewer.dataSources.get(n).name === 'MultiLevelQuery_echart') {
+                            viewer.dataSources.remove(viewer.dataSources.get(n));
+                        }
+                    }
+                }
+            }
+
+        },
+        addPolygon(geom, id, colors, fillreset) {
+            let geojson = wellknown.parse(geom);
+            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
+                dataSource.name = 'MultiLevelQuery_echart'
+                viewer.dataSources.add(dataSource);
+                viewer.zoomTo(dataSource);
+                dataSourceList_gh[id] = dataSource;
+                if (id == "all") _this.isshowAll = true;
+
+            });
+        },
+        echartClick(name, { iseyes }) {
+            this.reset();
+
+            this.tableData.forEach((res) => {
+                const keys = Object.keys(res);
+                for (const key of keys) {
+                    let value = res[key];
+                    if (value == name) {
+                        console.log('name: ', name);
+                        console.log('value ', value);
+
+                        this.addPolygon(res.空间信息.split(";")[1], "all", "#ff0000", true);
+                    }
+                }
+
+            })
+
+
         },
         clear_data() {
             const that = this;
@@ -334,6 +397,8 @@ export default {
                 manager_multi_level_query.entities.remove(entities[i]);
             }
 
+            this.reset();
+
         },
         remove_query_click_by_iserver() {
             for (var i = 0; i < 10; i++) {

src/components/Viewer/smViewer.vue

@@ -199,7 +199,8 @@ export default {
       //     // }, 1000);
       //   },
       // });
-
+      // 最小缩放高度（米）
+      viewer.scene.screenSpaceCameraController.minimumZoomDistance = 100;
       viewer.camera.flyTo({ //定位到范围中心点
         destination: {
           x: -2040463.7901390342,

src/views/cockpit/bjxm.vue

@@ -447,7 +447,7 @@ export default {
 .content {
   position: absolute;
   left: 1%;
-  width: 100%;
+  //width: 100%;
   height: 220px;
   top: 1.5rem;
 }

src/views/cockpit/common/ThreeStackedBarAndLine.vue

@@ -223,7 +223,7 @@ export default {
 #ThreeStackedBarAndLine {
     left: 0rem;
     top: 0.1rem;
-    width: 24rem;
+    width: 23vw;
     height: 12rem;
 }
 </style>

src/views/cockpit/datePicker.vue

@@ -1,12 +1,23 @@
 <template>
   <!-- value-format="yyyy-MM-dd" -->
-  <el-date-picker v-model="dateValue" class="timePicker" type="daterange" :picker-options="pickerOptions"
-    value-format="yyyyMMdd" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false"
-    align="left" @change="dateChange">
+  <el-date-picker
+    v-model="dateValue"
+    class="timePicker"
+    type="daterange"
+    :picker-options="pickerOptions"
+    value-format="yyyy-MM-dd"
+    range-separator="~"
+    start-placeholder="开始日期"
+    end-placeholder="结束日期"
+    :clearable="false"
+    align="left"
+    @change="dateChange"
+  >
   </el-date-picker>
 </template>
 
 <script>
+import moment from "moment";
 const nowYear = new Date().getFullYear();
 const nowMonth = new Date().getMonth() + 1 + "";
 const nowDay = new Date().getDate() + "";
@@ -52,11 +63,11 @@ export default {
           },
         ],
       },
-      // dateValue: [`${nowYear}-01-01`, `${nowYear}-${nowMonth}-${nowDay}`]
-      dateValue: [
-        `${nowYear}0101`,
-        `${nowYear}${setdata(nowMonth)}${setdata(nowDay)}`,
-      ],
+      dateValue: [`${nowYear}-01-01`, moment(new Date()).format("YYYY-MM-DD")],
+      // dateValue: [
+      //   `${nowYear}0101`,
+      //   `${nowYear}${setdata(nowMonth)}${setdata(nowDay)}`,
+      // ],
     };
   },
   mounted() {

src/views/cockpit/gdbh.vue

@@ -355,13 +355,13 @@ export default {
     },
     async init_zbph_hz(params) {
       const that = this;
-      let bTime = params ? params.beginTime : store.state.cockpit_date[0];
-      let eTime = params ? params.endTime : store.state.cockpit_date[1];
+      // let bTime = params ? params.beginTime : store.state.cockpit_date[0];
+      // let eTime = params ? params.endTime : store.state.cockpit_date[1];
       let obj = {
         jscType: 'jsc_gdbh_zbph_hz',
         id: params ? params.id : '4602',
-        beginTime: this.formatDate(bTime),
-        endTime: this.formatDate(eTime)
+        beginTime: params ? params.beginTime : store.state.cockpit_date[0],
+        endTime: params ? params.endTime : store.state.cockpit_date[1],
       };
       let data = await QueryOne(obj);
       this.balanceData = data.data

src/views/complianceAnalysis/components/hgxsc.vue

@@ -193,12 +193,19 @@ export default {
       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) {
           this.getCheckedNodes();
+          if (!this.ruleForm.xzfw) {
+            Message.warning("请绘制或导入选址范围!");
+            return;
+          }
           if (this.ruleForm.scxList.length == 0) {
-            Message.warning("至少选择一个项目信息");
+            Message.warning("至少选择一个项目信息!");
+            return;
           }
+
           MessageBox.confirm("是否开始进行合规性检查?", "合规性检查", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",

src/views/siteselection/components/fzxz.vue

@@ -137,6 +137,7 @@
 <script>
 import yxyzPop from "./yxyzPop.vue"; ///mapview/range
 import range from "@/components/mapview/range.vue"; ///mapview/range
+import { Message } from "element-ui";
 import {
   GetDldmTree,
   GetSjyList,
@@ -340,8 +341,13 @@ export default {
       var _temp = this.$refs.range.getRange();
       // this.ruleForm.xzfw = _temp.xzfw;
       this.ruleForm.xzmj = _temp.xzmj;
+      console.log(this.ruleForm, "0---");
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
+          if (!this.$refs.range.fileDataID) {
+            Message.warning("请绘制或导入选址范围!");
+            return;
+          }
           let obj = {
             xzmj: Number(this.ruleForm.xzmj),
             xmmc: this.ruleForm.xmmc,
@@ -379,6 +385,7 @@ export default {
           });
         } else {
           console.log("error submit!!");
+          loading.close();
           return false;
         }
       });