فهرست منبع

1. 详细信息弹窗高度调整; 2. 我的标记加入featureGroup,增加全选功能(定位,显示)及切换菜单优化

Bella 2 سال پیش
والد
کامیت
9f2706540c

BIN
src/assets/map/white_display.png


BIN
src/assets/map/white_hide.png


BIN
src/assets/map/white_locate.png


+ 148 - 130
src/components/map/MapHolder.vue

@@ -33,7 +33,7 @@ export default {
       currentLabelHtml: null,
       tableObj: {},
       // 疑点审计的保存后的疑点状态集合
-      caseStatusMap: new Map()
+      caseStatusMap: new Map(),
     };
   },
   created() {},
@@ -64,7 +64,7 @@ export default {
       deleteSinglePolygon: this.deleteSinglePolygon,
       deleteGroupFromMap: this.deleteGroupFromMap,
       drawGeometry: this.drawGeometry,
-      deleteGeometry: this.deleteGeometry
+      deleteGeometry: this.deleteGeometry,
     });
   },
   beforeDestroyed() {
@@ -85,7 +85,7 @@ export default {
     // 监听当前菜单
     getCurrentMenu() {
       return this.$store.state.navSelect;
-    }
+    },
   },
   watch: {
     getLabelCaseBtnStatus(val) {
@@ -128,9 +128,9 @@ export default {
         this.$nextTick(() => {
           this.getJSonData();
         });
-      }
+      },
       // immediate: true
-    }
+    },
   },
   methods: {
     // 开始标记疑点事件
@@ -141,7 +141,7 @@ export default {
     stopLabelCase() {
       if (map2DViewer.measureTool) {
         map2DViewer.setDrawTool({
-          action: "remove"
+          action: "remove",
         });
       }
     },
@@ -162,31 +162,33 @@ export default {
         // 动态创建div后赋值模板样式
         div.innerHTML = this.currentHtml;
         $(() => {
-          if (properties) {
-            $(`#${str}_id .center-table-item-normal .leftcell`).each((index, domEle) => {
-              $(`#${str}_id .center-table-item-normal .leftcell`).eq(index).text(Object.keys(properties)[index]);
-            });
-            $(`#${str}_id .center-table-item-normal .rightcell`).each((index, domEle) => {
-              $(`#${str}_id .center-table-item-normal .rightcell`).eq(index).text(Object.values(properties)[index]);
-            });
-          }
+          // if (properties) {
+          //   $(`#${str}_id .center-table-item-normal .leftcell`).each((index, domEle) => {
+          //     $(`#${str}_id .center-table-item-normal .leftcell`).eq(index).text(Object.keys(properties)[index]);
+          //   });
+          //   $(`#${str}_id .center-table-item-normal .rightcell`).each((index, domEle) => {
+          //     $(`#${str}_id .center-table-item-normal .rightcell`).eq(index).text(Object.values(properties)[index]);
+          //   });
+          // }
 
           if ($(`#${str}_id .center-table-item-special select`)) {
             if (this.caseStatusMap.has(str)) {
-              $(`#${str}_id .center-table-item-special select`).val(this.caseStatusMap.get(str));
+              $(`#${str}_id .center-table-item-special select`).val(
+                this.caseStatusMap.get(str)
+              );
             }
           }
 
           // 法律法规点击事件
           if ($(`#${str}_id a`)) {
-            $(`#${str}_id a`).click(e => {
+            $(`#${str}_id a`).click((e) => {
               console.log(e, "显示疑点相关的弹窗");
               this.$store.state.lawPopupShow = true;
             });
           }
           // input添加点击事件
           if ($(`#${str}_id input`)[1]) {
-            $(`#${str}_id input`).click(e => {
+            $(`#${str}_id input`).click((e) => {
               switch (e.target.defaultValue) {
                 case "取消":
                   this.cancelBtnEvent();
@@ -221,15 +223,15 @@ export default {
         $(() => {
           console.log($(`#${str}_id textarea`).val(), "textarea");
           $(`#${str}_id`).css("height", "100%");
-          let geoName = $(`#${str}_id input`).eq(0).val()
-          $(`#${str}_id input`).click(e => {
+
+          $(`#${str}_id input`).click((e) => {
             console.log(e.target.defaultValue);
             switch (e.target.defaultValue) {
               case "取消":
                 this.cancelBtnEvent();
                 break;
               case "保存":
-                this.saveBtnEvent(str, data, geoType,geoName);
+                this.saveBtnEvent(str, data, geoType);
                 // console.log(str, coord, data);
                 break;
             }
@@ -251,20 +253,22 @@ export default {
         // 修改人员名称
         c_editor_name: localStorage.getItem("USER_NAME"),
         // 修改人员ID
-        c_editorid: localStorage.getItem("USER_ID")
+        c_editorid: localStorage.getItem("USER_ID"),
       };
       let modifyParams = new FormData();
       modifyParams = {
         columnId: 47,
         modelId: 49,
-        content: JSON.stringify(obj)
+        content: JSON.stringify(obj),
       };
-      this.$Post(this.urlsCollection.updateContent, modifyParams).then(res => {
-        if (res.code === 200) {
-          this.$message.success("数据修改成功");
-          map2DViewer.map.closePopup();
+      this.$Post(this.urlsCollection.updateContent, modifyParams).then(
+        (res) => {
+          if (res.code === 200) {
+            this.$message.success("数据修改成功");
+            map2DViewer.map.closePopup();
+          }
         }
-      });
+      );
     },
     cancelBtnEvent() {
       map2DViewer.map.closePopup();
@@ -278,64 +282,80 @@ export default {
      * @data -- 绘制几何体时获取的数据;
      * @geoType 几何体类型 类型: 0 点;1 线;2 面;3 矩形;4 圆形;5 其他;
      */
-    saveBtnEvent(str, data, geoType,geoName) {
+    saveBtnEvent(str, data, geoType) {
       if (localStorage.getItem("USER_ID")) {
         let title = $(`#${str}_id select`).val();
         let des = $(`#${str}_id textarea`).val();
-        let coordinates = [data.points];
-        let geometry = publicFun.generateGeoJSON(title, des, geoType, coordinates);
+        let geoName = "";
+        let currentName = $(`#${str}_id input`).eq(0).val();
+        if (myLabelNameMap.has(currentName)) {
+          this.$message.info("该名称已存在,请重新输入!");
+        } else {
+          geoName = $(`#${str}_id input`).eq(0).val();
+          let coordinates = [data.points];
+          let geometry = publicFun.generateGeoJSON(
+            title,
+            des,
+            geoType,
+            coordinates,
+            geoName
+          );
+          let params = new FormData();
+          let newGeojson = JSON.stringify(geometry);
+          myLabelNameMap.set(geoName, newGeojson);
+          params = {
+            geojson: newGeojson,
+            type: geoType,
+            userId: Number(localStorage.getItem("USER_ID")),
+            sourceId: 0,
+          };
 
-        let params = new FormData();
-        let newGeojson = JSON.stringify(geometry)
-        myLabelNameMap.set(geoName,newGeojson)
-        params = {
-          geojson: newGeojson,
-          type: geoType,
-          userId: Number(localStorage.getItem("USER_ID")),
-          sourceId: 0
-        };
-        this.$Post(this.urlsCollection.addConllection, params).then(
-          res => {
-            if (res.code == 200) {
-              console.log(res, "添加标记成功");
-              map2DViewer.map.closePopup();
-              // 根据用户获取标记
-              let paramData = new FormData();
-              paramData = {
-                userId: Number(localStorage.getItem("USER_ID")),
-                sourceId: 0,
-                pageSize: 10
-              };
-              // 暂存map中刚刚保存的数据
-              this.$Post(this.urlsCollection.selectByUser, paramData).then(userRes => {
-                if (userRes.code === 200) {
-                  // console.log(userRes, "获取我的标记疑点数据");
-                  if (userRes.content.length > 0) {
-                    this.$store.state.myLabelPointsArr = [];
-                    this.$store.state.myLabelPointsArr = userRes.content.map(v => {
-                      if (JSON.stringify(geometry) === v.geojson) {
-                        sessionStorage.setItem("myLabelPointsId", v.id);
+          this.$Post(this.urlsCollection.addConllection, params).then(
+            (res) => {
+              if (res.code == 200) {
+                console.log(res, "添加标记成功");
+                map2DViewer.map.closePopup();
+                // 根据用户获取标记
+                let paramData = new FormData();
+                paramData = {
+                  userId: Number(localStorage.getItem("USER_ID")),
+                  sourceId: 0,
+                  pageSize: 10,
+                };
+                // 暂存map中刚刚保存的数据
+                this.$Post(this.urlsCollection.selectByUser, paramData).then(
+                  (userRes) => {
+                    if (userRes.code === 200) {
+                      // console.log(userRes, "获取我的标记疑点数据");
+                      if (userRes.content.length > 0) {
+                        this.$store.state.myLabelPointsArr = [];
+                        this.$store.state.myLabelPointsArr =
+                          userRes.content.map((v) => {
+                            if (JSON.stringify(geometry) === v.geojson) {
+                              sessionStorage.setItem("myLabelPointsId", v.id);
+                            }
+                            return {
+                              id: v.id,
+                              geojson: v.geojson,
+                              type: v.type,
+                            };
+                          });
+                        // 判断刚刚暂存的数据,并调用小眼睛的方法
                       }
-                      return {
-                        id: v.id,
-                        geojson: v.geojson,
-                        type: v.type
-                      };
-                    });
-                    // 判断刚刚暂存的数据,并调用小眼睛的方法
+                    }
+                    // 更新时调用一次搜索接口
                   }
-                }
-                // 更新时调用一次搜索接口
-              });
+                );
+              }
+              // 保存后需要删除地图上的标记
+              this.reStartLabelCase();
+            },
+            (error) => {
+              console.log("标记疑点保存失败!", error);
+              this.reStartLabelCase();
             }
-            // 保存后需要删除地图上的标记
-            this.reStartLabelCase();
-          },
-          error => {
-            console.log("标记疑点保存失败!", error);
-            this.reStartLabelCase();
-          }
-        );
+          );
+        }
       }
     },
     // 卷帘对比
@@ -344,7 +364,9 @@ export default {
         map2DViewer.jlMap = L.tileLayer(
           "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d"
         ).addTo(map2DViewer.map);
-        map2DViewer.jlControl = L.control.sideBySide(map2DViewer.map, map2DViewer.jlMap).addTo(map2DViewer.map);
+        map2DViewer.jlControl = L.control
+          .sideBySide(map2DViewer.map, map2DViewer.jlMap)
+          .addTo(map2DViewer.map);
       } else if (map2DViewer.map.hasLayer(map2DViewer.jlMap)) {
         map2DViewer.map.removeControl(map2DViewer.jlControl);
         map2DViewer.map.removeLayer(map2DViewer.jlMap);
@@ -367,7 +389,9 @@ export default {
       // 每次点击按钮后重绘弹窗
       if (this.currentHtml && this.currentCid) {
         setTimeout(() => {
-          this.popup.setContent(this.createAuditDiv(this.currentCid, this.currentProperties));
+          this.popup.setContent(
+            this.createAuditDiv(this.currentCid, this.currentProperties)
+          );
           // .openOn(map2DViewer.map);
         }, 300);
       }
@@ -376,7 +400,7 @@ export default {
     initDraw() {
       if (!map2DViewer.measureTool) {
         // 引入疑点标记绘制方法
-        map2DViewer.drawToolFire = data => {
+        map2DViewer.drawToolFire = (data) => {
           // 纬经度
           if (data && data.points.length >= 1) {
             let geoType = null;
@@ -415,7 +439,7 @@ export default {
           color: "red",
           font_size: "14px",
           closeButton: true,
-          iconUrl: "../../static/plugins/draw-plugin/images/marker-icon.png"
+          iconUrl: "../../static/plugins/draw-plugin/images/marker-icon.png",
         });
       }
     },
@@ -444,7 +468,7 @@ export default {
         attributionControl: false,
         zoomControl: false,
         minZoom: 10,
-        maxZoom: 16
+        maxZoom: 16,
       }).setView(systemConfig.mapViewer.center, systemConfig.mapViewer.zoom);
 
       //添加默认图层
@@ -458,7 +482,7 @@ export default {
 
             // url: "http://aimap.pudong.sh:5236/maps/rest/services/basemap-shanghai-gem-blue-sh2000/mapserver",
             // tileSize: 512
-            systemConfig.blueBlackMap
+            systemConfig.blueBlackMap,
         })
         .addTo(map2DViewer.map);
       // layer.setStyle({opacity:0,fillOpacity:0})
@@ -476,14 +500,16 @@ export default {
         map2DViewer.groups["浦东新区_polygon"].remove();
       }
       // 请求并渲染新的区域图层
-      get("./static/json/simplified_pdgeojson.json", "").then(geoJson => {
+      get("./static/json/simplified_pdgeojson.json", "").then((geoJson) => {
         // 存放所有的面数据
         map2DViewer.groups["浦东新区_polygon"] = L.featureGroup();
         map2DViewer.groups["浦东新区_label"] = L.featureGroup();
         map2DViewer.groups["浦东新区_polygon"].addTo(map2DViewer.map);
         map2DViewer.groups["浦东新区_label"].addTo(map2DViewer.map);
-        geoJson.features.map(feature => {
-          if (this.town.indexOf(feature.properties.NAME.replace("镇", "")) > -1) {
+        geoJson.features.map((feature) => {
+          if (
+            this.town.indexOf(feature.properties.NAME.replace("镇", "")) > -1
+          ) {
             this.renderPolygon(feature);
           }
         });
@@ -528,7 +554,7 @@ export default {
         weight: 3,
         fillColor: this.getColor(name),
         opacity: 1,
-        fillOpacity: 0.4
+        fillOpacity: 0.4,
       }).addTo(map2DViewer.groups["浦东新区_polygon"]);
 
       center = JSON.parse(JSON.stringify(center)).geometry.coordinates;
@@ -540,25 +566,25 @@ export default {
         radius: 10,
         weight: 1,
         fillOpacity: 0,
-        color: "#e6d273"
+        color: "#e6d273",
       });
       wmarker.bindLabel(feature.properties.NAME, {
         noHide: true,
         clickable: true,
-        offset: [-25, 10]
+        offset: [-25, 10],
       });
       wmarker.addTo(map2DViewer.groups["浦东新区_label"]);
       let circle1 = L.circleMarker(center, {
         radius: 8,
         weight: 1,
         fillOpacity: 0,
-        color: "#e6d273"
+        color: "#e6d273",
       }).addTo(map2DViewer.groups["浦东新区_polygon"]);
       let circle2 = L.circleMarker(center, {
         radius: 5,
         weight: 1,
         fillOpacity: 1,
-        color: "#e6d273"
+        color: "#e6d273",
       }).addTo(map2DViewer.groups["浦东新区_polygon"]);
     },
     latLngsToReverse: function (latlngsAry) {
@@ -584,26 +610,28 @@ export default {
     addSinglePolygon(geometry, cid, color, uniqueId) {
       let uniqueIdList = [];
       if (this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId]) {
-        uniqueIdList = this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId];
+        uniqueIdList =
+          this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId];
       }
 
       let singlePolygonItem = {
         uniqueId: uniqueId,
         geometry: geometry,
-        cid: cid
+        cid: cid,
       };
       uniqueIdList.push(singlePolygonItem);
-      this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId] = uniqueIdList;
+      this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId] =
+        uniqueIdList;
       let coordinates = "";
 
       if (uniqueId === "一般耕地_47") {
         let coord = JSON.parse(geometry).geometry.coordinates[0];
-        coordinates = coord.map(v => {
+        coordinates = coord.map((v) => {
           return [v[1], v[0]];
         });
       } else {
         coordinates = JSON.parse(geometry).geometry.coordinates[0];
-        coordinates = coordinates.map(v => {
+        coordinates = coordinates.map((v) => {
           let data = transformCoord.shcj_to_wgs84(v[1], [v[0]]);
           data = [data[1], data[0]];
           return data;
@@ -621,10 +649,10 @@ export default {
         weight: 3,
         fillColor: color,
         opacity: 1,
-        fillOpacity: 0.4
+        fillOpacity: 0.4,
       }).addTo(map2DViewer.analysisGroups[uniqueId]);
 
-      polygon.on("click", e => {
+      polygon.on("click", (e) => {
         this.auditPopupShow = true;
         this.popup = L.popup({ maxWidth: 700, maxHeight: 600 })
           .setLatLng(e.latlng)
@@ -637,7 +665,7 @@ export default {
     },
     // 综合分析 - 图层绘制面
     addPolygonLayer(data, cid, color) {
-      data.map(feature => {
+      data.map((feature) => {
         let polygonData = JSON.parse(JSON.stringify(feature));
         let coordinates = polygonData.geometry.coordinates[0];
         let infos = polygonData.properties;
@@ -646,16 +674,18 @@ export default {
           weight: 3,
           fillColor: color,
           opacity: 1,
-          fillOpacity: 0.4
+          fillOpacity: 0.4,
         }).addTo(map2DViewer.map);
         map2DViewer.polygons[`${cid}_layer`].push(polygon);
         polygon.infos = infos;
-        polygon.on("click", e => {
+        polygon.on("click", (e) => {
           // console.log(e, "polygon");
           this.auditPopupShow = true;
           // console.log(e.latlng, "获取当前弹窗坐标111");
 
-          this.popup = L.popup({ maxWidth: 700, maxHeight: 600 }).setLatLng(e.latlng).setContent(this.createAuditDiv(cid));
+          this.popup = L.popup({ maxWidth: 700, maxHeight: 600 })
+            .setLatLng(e.latlng)
+            .setContent(this.createAuditDiv(cid));
           // .openOn(map2DViewer.map);
           this.auditPopupShow = false;
           this.popup.openOn(map2DViewer.map);
@@ -675,18 +705,16 @@ export default {
     //综合分析 - 标记疑点 - 删除面
     deletePolygonLayer(layer) {
       console.log(layer, "layer");
-      map2DViewer.polygons[layer].forEach(polygon => {
+      map2DViewer.polygons[layer].forEach((polygon) => {
         map2DViewer.map.removeLayer(polygon);
       });
     },
 
     drawPoints(data) {
-      this.setView(data.coord, 16);
       if (!map2DViewer.myLabels[`label_${data.id}`]) {
-        // console.log("开始绘制点", data);
         let point = L.marker(data.coord, {
-          opacity: 1
-        }).addTo(map2DViewer.map);
+          opacity: 1,
+        }).addTo(map2DViewer.groups["我的标记图层组"]);
         map2DViewer.myLabels[`label_${data.id}`] = point;
       }
     },
@@ -699,30 +727,24 @@ export default {
           weight: 3,
           fillOpacity: color,
           opacity: 1,
-          fillOpacity: 0.4
-        }).addTo(map2DViewer.map);
+          fillOpacity: 0.4,
+        }).addTo(map2DViewer.groups["我的标记图层组"]);
         // zoom the map to the polyline
-        map2DViewer.map.fitBounds(polyline.getBounds());
         map2DViewer.myLabels[`label_${data.id}`] = polyline;
-      } else {
-        map2DViewer.map.fitBounds(map2DViewer.myLabels[`label_${data.id}`].getBounds());
       }
     },
     drawPolygon(data, color) {
       if (!map2DViewer.myLabels[`label_${data.id}`]) {
-        console.log("开始绘制面", data);
         let coordinates = JSON.parse(data.geojson).geometry.coordinates[0];
         let polygon = L.polygon(coordinates, {
           color: color,
           weight: 3,
           fillOpacity: color,
           opacity: 1,
-          fillOpacity: 0.4
-        }).addTo(map2DViewer.map);
-        map2DViewer.map.fitBounds(polygon.getBounds());
+          fillOpacity: 0.4,
+        }).addTo(map2DViewer.groups["我的标记图层组"]);
+
         map2DViewer.myLabels[`label_${data.id}`] = polygon;
-      } else {
-        map2DViewer.map.fitBounds(map2DViewer.myLabels[`label_${data.id}`].getBounds());
       }
     },
 
@@ -730,27 +752,23 @@ export default {
       if (!map2DViewer.myLabels[`label_${data.id}`]) {
         console.log("开始绘制圆", data);
         let coordinates = JSON.parse(data.geojson).geometry.coordinates[0];
-        // console.log(coordinates);
+
         if ((coordinates.length = 2)) {
           let from = turf.point(coordinates[0].reverse());
           let to = turf.point(coordinates[1].reverse());
           let options = { units: "kilometers" };
           let distance = turf.distance(from, to, options);
-          (distance = parseFloat(distance * 1000).toFixed(6)), console.log(distance, "圆的半径");
+          distance = parseFloat(distance * 1000).toFixed(6);
           let circle = L.circle(coordinates[0].reverse(), {
             color: color,
             weight: 3,
             fillOpacity: color,
             opacity: 1,
             fillOpacity: 0.4,
-            radius: Number(distance)
-          }).addTo(map2DViewer.map);
-          console.log(circle);
-          map2DViewer.map.fitBounds(circle.getBounds());
+            radius: Number(distance),
+          }).addTo(map2DViewer.groups["我的标记图层组"]);
           map2DViewer.myLabels[`label_${data.id}`] = circle;
         }
-      } else {
-        map2DViewer.map.fitBounds(map2DViewer.myLabels[`label_${data.id}`].getBounds());
       }
     },
     /**
@@ -776,11 +794,11 @@ export default {
     },
     deleteGeometry(geometry) {
       if (geometry) {
-        console.log(geometry, "移除");
+        // console.log(geometry, "移除");
         geometry.removeFrom(map2DViewer.map);
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

+ 14 - 5
src/components/popup/AttributePopup.vue

@@ -1,13 +1,20 @@
 <template>
   <div
     class="attribute"
-    :style="{ width: boxWidth + 'px', height: boxHeight + 'px' }"
+    :style="{
+      width: boxWidth + 'px',
+    }"
   >
     <div class="close-btn" @click="closeEvent"></div>
     <div class="attribute-table" v-if="tableType === 'normal'">
       <div class="attribute-table-top">详细信息</div>
       <div class="attribute-table-bottom">
-        <div class="attribute-table-bottom-inner">
+        <div
+          class="attribute-table-bottom-inner"
+          :style="{
+            maxHeight: boxHeight + 'px',
+          }"
+        >
           <div
             class="attribute-table-bottom-inner-item"
             v-for="(key, value) in tableData[0]"
@@ -98,11 +105,12 @@ export default {
       &-inner {
         width: 100%;
         height: 100%;
-        background: #74ffff;
-        overflow: auto;
+        overflow: hidden scroll;
+        background: rgb(18, 43, 66, 0.5);
         &-item {
           width: 100%;
-          height: 25%;
+          // height: 50px;
+          padding: 10px 0;
           background: rgb(18, 43, 66, 0.5);
           display: flex;
           color: #fff;
@@ -118,6 +126,7 @@ export default {
             justify-content: center;
           }
           .right {
+            padding: 0 10px;
             width: 60%;
             height: 100%;
             display: flex;

+ 4 - 17
src/components/popup/CaseAuditPopup.vue

@@ -73,10 +73,10 @@ export default {
       },
       status: "normal",
       tableObj: {
-        版本: "2017年部",
-        面积: "888.4567",
-        性质: "林地 硬化地表",
-        异常: "疑似基本农田被侵占",
+        镇域名称: "--",
+        面积: "--",
+        土地类型: "--",
+        图斑编号: "--",
       },
       selectVal: "疑点",
       selectOptions: [
@@ -85,19 +85,6 @@ export default {
       ],
     };
   },
-  // props: {
-  //   tableObj: {
-  //     type: Object,
-  //     default() {
-  //       return {
-  //         版本: "2017年部",
-  //         面积: "888.4567",
-  //         性质: "林地 硬化地表",
-  //         异常: "疑似基本农田被侵占",
-  //       };
-  //     },
-  //   },
-  // },
   computed: {
     getPopupStatus() {
       //疑点审计 1,0

+ 1 - 1
src/components/popup/LabelCasePopup.vue

@@ -4,7 +4,7 @@
       <div class="header">
         <div class="header-title">名称 :</div>
         <div class="header-input">
-          <input type="text" />
+          <input type="text" v-model="nameInput"/>
         </div>
       </div>
       <div class="top">

+ 5 - 4
src/components/popup/LawPopup.vue

@@ -8,7 +8,7 @@
       <FilePreView style="width: 100%; height: 100%" ref="lawFileRef" />
     </LawDetailsPopup>
     <div class="title">
-      <div class="title-text">疑点相关法律法规</div>
+      <div class="title-text">相关法律法规</div>
       <div class="title-close-btn" @click="closeEvent"></div>
     </div>
     <div class="option">
@@ -25,11 +25,11 @@
         </el-input>
       </div>
       <div class="option-right">
-        <NewSelect
+        <!-- <NewSelect
           class="option-right-item"
           :placeholder="'排序方式'"
           style="left: 10px; top: 3px"
-        />
+        /> -->
         <!-- <NewSelect class="option-right-item" :placeholder="'搜索范围'" /> -->
         <NewSelect
           class="option-right-item"
@@ -356,10 +356,11 @@ export default {
       right: 0;
       width: 65%;
       &-item {
-        width: 150px;
+        width: 200px;
         height: 40px;
         line-height: 50px;
         position: absolute;
+        left: 0;
       }
       &-search {
         width: 60px;

+ 2 - 1
src/utils/publicFunction.js

@@ -77,7 +77,7 @@ const getRandomColor = function () {
  *
  * 类型: 0 点;1 线;2 面;3 矩形;4 圆形;5 其他;
  */
-const generateGeoJSON = (title, desc, featureType, coords) => {
+const generateGeoJSON = (title, desc, featureType, coords,geoName) => {
   let dataType = "LineString";
   let propertiesType = "面";
   switch (featureType) {
@@ -104,6 +104,7 @@ const generateGeoJSON = (title, desc, featureType, coords) => {
       desc: desc || "",
       featureType: propertiesType,
       featureTypeIndex: featureType,
+      name:geoName
     },
     geometry: {
       coordinates: coords,

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 387 - 214
src/views/ComprehensiveAnalysis.vue


برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است