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

src/components/mapView/range.vue

@@ -47,6 +47,9 @@ export default {
     activeTabs: {
       type: String,
     },
+    type: {
+      type: String,
+    },
   },
   data() {
     return {
@@ -139,9 +142,12 @@ export default {
     },
     // 加载GeoJSON数据
     addPolygon() {
-      // let geojson = CX_geojeson;
+      let geojson =
+        this.$props.type == "hegxfx"
+          ? "/static/data/ghss/导入.geojson"
+          : "static/data/draw.geojson";
       let polygon = Cesium.GeoJsonDataSource.load(
-        "/static/data/ghss/导入.geojson"
+        geojson
         // { clampToGround: true }
       );
       polygon.then(function (dataSource) {
@@ -202,13 +208,6 @@ export default {
       return this.model;
     },
   },
-
-  // watch(
-  //     () => prop.activeTabs,
-  //     (newValue, oldValue) => {
-  //       this.getXzq();
-  //     }
-  //   );
 };
 </script>
 

src/views/complianceAnalysis/components/hgxsc.vue

@@ -2,7 +2,7 @@
   <div class="hgxsc">
     <div class="rangDiv">
       <div class="block-title">选址范围</div>
-      <range :keys="['hx', 'sc']" class="range" ref="range" />
+      <range type="hgxfx" :keys="['hx', 'sc']" class="range" ref="range" />
     </div>
     <el-form :model="ruleForm" label-width="75px">
       <div class="block-title">基本信息</div>

src/views/complianceAnalysis/ghzc.scss

@@ -198,7 +198,8 @@
     padding-left: 10px;
     font-size: 16px;
     font-weight: bold;
-    span{
+
+    span {
         width: 70px;
         height: 100%;
         line-height: 1.7;
@@ -211,4 +212,55 @@
         cursor: pointer;
         margin-left: 30px;
     }
+}
+
+.el-input--mini .el-input__inner {
+    color: #fff !important;
+}
+
+.el-input__inner {
+    color: #fff;
+    background: #409eff33 !important;
+    border: 1px solid #409eff;
+}
+
+.el-input__inner::placeholder {
+    color: #fff;
+}
+
+.el-collapse-item__header {
+    color: #fff;
+    /* 修改标题颜色 */
+}
+.el-collapse-item{
+    border: none;
+}
+
+.el-collapse-item__content {
+    // background-color: rgba(255, 192, 203, 0.425) !important;
+    background-color: transparent !important;
+    /* 修改背景颜色 */
+}
+
+.el-collapse {
+    border: 1px solid #d3dce6;
+    /* 修改边框样式 */
+}
+.el-collapse-item__wrap{
+    background-color: transparent !important;
+}
+.el-scrollbar{
+    border: none !important;
+}
+
+.el-collapse-item__header {
+    border-bottom: 1px solid #d3dce6;
+    background-color: transparent !important;
+    /* 修改下边框 */
+}
+
+.el-collapse-item__header:hover,
+.el-collapse-item__header:active {
+    background-color: #40a0ff6c !important;
+    /* 鼠标悬浮和点击时的背景色 */
 }

src/views/siteselection/components/draw.json

@@ -1,37 +1,25 @@
 {
     "type": "FeatureCollection",
-    "name": "draw",
     "features": [
-        {
-            "type": "Feature",
-            "properties": {},
-            "geometry": {
-                "type": "Polygon",
-                "coordinates": [
-                    [
-                        [
-                            109.431774698027056,
-                            18.308104945636849
-                        ],
-                        [
-                            109.430011339115111,
-                            18.290042431376694
-                        ],
-                        [
-                            109.44640581116127,
-                            18.286563371901781
-                        ],
-                        [
-                            109.451743546246064,
-                            18.308438554079647
-                        ],
-                        [
-                            109.431774698027056,
-                            18.308104945636849
-                        ]
-                    ]
-                ]
-            }
+      {
+        "type": "Feature",
+        "properties": {},
+        "geometry": {
+          "coordinates": [
+            [
+              [109.51142919411961, 18.322906808030652],
+              [109.51382391646248, 18.323160890707612],
+              [109.51812407725552, 18.318549085673954],
+              [109.52096478636398, 18.31677099219241],
+              [109.52639647097506, 18.31534849921383],
+              [109.52681717214205, 18.307529099172545],
+              [109.51255360145637, 18.30725787066725],
+              [109.50859860338323, 18.311988017573178],
+              [109.51142919411961, 18.322906808030652]
+            ]
+          ],
+          "type": "Polygon"
         }
+      }
     ]
-}
+  }

src/views/siteselection/components/fzxz.vue

@@ -9,7 +9,12 @@
       <div class="block-title">选址范围</div>
       <range :keys="['hx', 'sc']" class="range" ref="range" />
     </div>
-    <el-form :model="ruleForm" label-width="100px" :rules="rules">
+    <el-form
+      :model="ruleForm"
+      ref="ruleForm"
+      label-width="100px"
+      :rules="rules"
+    >
       <div class="block-title">基本信息</div>
       <el-form-item label="项目名称:" prop="xmmc">
         <el-input
@@ -57,11 +62,15 @@
       </el-form-item>
       <el-form-item label="用地面积" required>
         <el-col :span="11">
-          <el-input v-model="ruleForm.ydmjs" size="mini"></el-input>
+          <el-form-item prop="ydmjs">
+            <el-input v-model="ruleForm.ydmjs" size="mini"></el-input>
+          </el-form-item>
         </el-col>
         <el-col class="line" :span="2">-</el-col>
         <el-col :span="11">
-          <el-input v-model="ruleForm.ydmje" size="mini"></el-input>
+          <el-form-item prop="ydmje">
+            <el-input v-model="ruleForm.ydmje" size="mini"></el-input>
+          </el-form-item>
         </el-col>
       </el-form-item>
     </el-form>
@@ -102,7 +111,7 @@ import range from "@/components/mapview/range.vue"; ///mapview/range
 export default {
   components: {
     yxyzPop,
-    range
+    range,
   },
   props: {
     activeTabs: {
@@ -399,6 +408,29 @@ export default {
   computed: {},
   mounted() {},
   methods: {
+    submitData() {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          alert("submit!");
+        } else {
+          console.log("error submit!!");
+          return false;
+        }
+      });
+    },
+    reset() {
+      (this.ruleForm = {
+        xmmc: "",
+        jsdw: "",
+        xmlx: "",
+        ydlx: "",
+        ydmjs: "", //用地面积开始
+        ydmje: "", //用地面积结束
+        sjy: "国土空间总体规划", //数据源
+      }),
+        this.$refs.ruleForm.resetFields();
+    },
+
     // 影响因子条件展示
     yztj(val) {
       // switch (val) {
@@ -445,7 +477,6 @@ export default {
     left: 100px;
   }
 
-
   .treeDiv {
     width: 100%;
     height: calc(100% - 400px);
@@ -481,9 +512,8 @@ export default {
       color: #fff;
       border: none;
     }
-    /deep/ .el-table thead{
+    /deep/ .el-table thead {
       background-color: #0a2450 !important;
-
     }
     // 设置行的背景颜色
     // /deep/ .el-table tr:nth-child(even) {
@@ -500,4 +530,7 @@ export default {
 /deep/ .el-select {
   width: 288px !important;
 }
+/deep/ .el-form-item__error {
+  top: 32px !important;
+}
 </style>

src/views/siteselection/components/规划结果.json

@@ -4,16 +4,16 @@
     {
       "type": "Feature",
       "properties": {
-        "dkbm": "FH03-21-04",
-        "kzxxgyddm": "G2",
-        "kzxxgydmc": "防护绿地",
-        "ydmj": 1148,
+        "dkbm": "BP08-06",
+        "kzxxgyddm": "0902/090104/090101",
+        "kzxxgydmc": "商务金融混合旅馆混合零售商业用地",
+        "ydmj": 35132,
         "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "85.30",
+        "xjxzqmc": "吉阳区/天涯区",
+        "xzmc": "吉阳区/天涯区",
+        "landPrice": "10420.15",
         "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
+        "time": "2024-06-18 11:01:36"
       },
       "geometry": {
         "type": "MultiPolygon",
@@ -21,88 +21,48 @@
           [
             [
               [
-                109.44286559417283,
-                18.299061738917835
+                109.51080188588696,
+                18.313927135629616
               ],
               [
-                109.44271501676826,
-                18.298960793619102
+                109.51103888571343,
+                18.315156472369807
               ],
               [
-                109.44234689255475,
-                18.298993056683543
+                109.51106386067497,
+                18.315285149226533
               ],
               [
-                109.44197904681893,
-                18.299028077982427
+                109.51110657915999,
+                18.31531892639523
               ],
               [
-                109.44187708803419,
-                18.29915184736835
+                109.51282709188092,
+                18.315309565121854
               ],
               [
-                109.44220587502141,
-                18.29911963465388
+                109.51296912091725,
+                18.315173312783838
               ],
               [
-                109.44253562679928,
-                18.299089574622457
+                109.51297076663083,
+                18.31396329668024
               ],
               [
-                109.44286559417283,
-                18.299061738917835
-              ]
-            ]
-          ]
-        ]
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {
-        "dkbm": "FH03-23-05",
-        "kzxxgyddm": "G1",
-        "kzxxgydmc": "公园绿地",
-        "ydmj": 1066,
-        "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "79.20",
-        "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
-      },
-      "geometry": {
-        "type": "MultiPolygon",
-        "coordinates": [
-          [
-            [
-              [
-                109.44909022918564,
-                18.299428494031602
-              ],
-              [
-                109.44899653040993,
-                18.299440832736266
-              ],
-              [
-                109.44908677516337,
-                18.300066000582767
+                109.5128291068021,
+                18.31382859028951
               ],
               [
-                109.44912637469773,
-                18.30034033703543
+                109.51206682609642,
+                18.313832739235963
               ],
               [
-                109.44914223535237,
-                18.300450200962203
+                109.51087810344723,
+                18.313839203575785
               ],
               [
-                109.44921978601253,
-                18.30032599326969
-              ],
-              [
-                109.44909022918564,
-                18.299428494031602
+                109.51080188588696,
+                18.313927135629616
               ]
             ]
           ]
@@ -112,16 +72,16 @@
     {
       "type": "Feature",
       "properties": {
-        "dkbm": "FH03-23-03",
-        "kzxxgyddm": "B11",
-        "kzxxgydmc": "零售商业用地",
-        "ydmj": 1850,
+        "dkbm": "BP08-11",
+        "kzxxgyddm": "0902/090104/090101",
+        "kzxxgydmc": "商务金融混合旅馆混合零售商业用地",
+        "ydmj": 34684,
         "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "0.00",
+        "xjxzqmc": "吉阳区/天涯区",
+        "xzmc": "吉阳区/天涯区",
+        "landPrice": "10287.27",
         "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
+        "time": "2024-06-18 11:01:36"
       },
       "geometry": {
         "type": "MultiPolygon",
@@ -129,188 +89,112 @@
           [
             [
               [
-                109.44914223535237,
-                18.300450200962203
+                109.51516080629291,
+                18.313930998027935
               ],
               [
-                109.44912637469773,
-                18.30034033703543
+                109.51501297773314,
+                18.313816685840113
               ],
               [
-                109.44861922271926,
-                18.30048841515309
+                109.51375633975353,
+                18.313823539064316
               ],
               [
-                109.44848796268656,
-                18.3005267393572
+                109.51330192427213,
+                18.31382601478723
               ],
               [
-                109.44857675216925,
-                18.30079127208328
+                109.51315989613414,
+                18.313962267332965
               ],
               [
-                109.449030635848,
-                18.30062894174201
+                109.51315825221715,
+                18.31517228259094
               ],
               [
-                109.44914223535237,
-                18.300450200962203
-              ]
-            ]
-          ]
-        ]
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {
-        "dkbm": "FH03-11-01",
-        "kzxxgyddm": "S42",
-        "kzxxgydmc": "社会停车场用地",
-        "ydmj": 1828,
-        "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "150.81",
-        "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
-      },
-      "geometry": {
-        "type": "MultiPolygon",
-        "coordinates": [
-          [
-            [
-              [
-                109.44280926171969,
-                18.302844279947273
+                109.51329991384252,
+                18.315306989641613
               ],
               [
-                109.44279069174611,
-                18.30258705263516
+                109.51406672385389,
+                18.315302810882187
               ],
               [
-                109.44263009902447,
-                18.302588312325124
+                109.5141711790568,
+                18.315299376624132
               ],
               [
-                109.44209258309108,
-                18.30265569335967
+                109.51427390320616,
+                18.315290342828035
               ],
               [
-                109.44209162997856,
-                18.302719476109417
+                109.51437591499152,
+                18.315275694995265
               ],
               [
-                109.44223139436203,
-                18.30285012892559
+                109.51447688023956,
+                18.31525548088163
               ],
               [
-                109.44223394378079,
-                18.3028500845764
+                109.51457646298039,
+                18.315229767004293
               ],
               [
-                109.44225723979106,
-                18.302849471363317
-              ],
-              [
-                109.44242021304824,
-                18.302846957957204
-              ],
-              [
-                109.44243816857413,
-                18.302846656041442
-              ],
-              [
-                109.44280926171969,
-                18.302844279947273
-              ]
-            ]
-          ]
-        ]
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {
-        "dkbm": "FH03-07-01",
-        "kzxxgyddm": "G1",
-        "kzxxgydmc": "公园绿地",
-        "ydmj": 1117,
-        "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "92.15",
-        "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
-      },
-      "geometry": {
-        "type": "MultiPolygon",
-        "coordinates": [
-          [
-            [
-              [
-                109.43815629038187,
-                18.303288969753453
+                109.51467433802385,
+                18.315198637788846
               ],
               [
-                109.43831234840796,
-                18.30242733376336
+                109.51477018197647,
+                18.315162198127812
               ],
               [
-                109.43826730328638,
-                18.302467975642607
+                109.51486367863124,
+                18.315120564852666
               ],
               [
-                109.43822716476284,
-                18.3025130652349
+                109.51495452076436,
+                18.315073876967595
               ],
               [
-                109.43819241074114,
-                18.302562065228148
+                109.51504356626687,
+                18.315021609990655
               ],
               [
-                109.43816345893785,
-                18.302614392255528
+                109.51541487680473,
+                18.314789376180006
               ],
               [
-                109.43814064981447,
-                18.302669422013054
+                109.51545583459179,
+                18.314601815741476
               ],
               [
-                109.43812426005209,
-                18.302726502905436
+                109.51539246294008,
+                18.31450938459454
               ],
               [
-                109.43811448009359,
-                18.302784944959075
+                109.51533964200135,
+                18.3144262797546
               ],
               [
-                109.43809888444196,
-                18.3029278858629
+                109.5152921426824,
+                18.314338554335023
               ],
               [
-                109.43809215516217,
-                18.302981713828775
+                109.51525102679184,
+                18.314247935275663
               ],
               [
-                109.43807541865012,
-                18.303102353775447
+                109.51521648477255,
+                18.31415484471476
               ],
               [
-                109.43805593958147,
-                18.303222614964906
+                109.51518867562632,
+                18.314059720994806
               ],
               [
-                109.4380419105917,
-                18.303265204606607
-              ],
-              [
-                109.43807817737635,
-                18.30330049625362
-              ],
-              [
-                109.43815629038187,
-                18.303288969753453
+                109.51516080629291,
+                18.313930998027935
               ]
             ]
           ]
@@ -320,16 +204,16 @@
     {
       "type": "Feature",
       "properties": {
-        "dkbm": "FH03-16-01",
-        "kzxxgyddm": "G1",
-        "kzxxgydmc": "公园绿地",
-        "ydmj": 1838,
+        "dkbm": "BP08-04",
+        "kzxxgyddm": "090101/090104",
+        "kzxxgydmc": "零售商业混合旅馆用地",
+        "ydmj": 14688,
         "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "143.73",
+        "xjxzqmc": "吉阳区/天涯区",
+        "xzmc": "吉阳区/天涯区",
+        "landPrice": "4356.46",
         "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
+        "time": "2024-06-18 11:01:36"
       },
       "geometry": {
         "type": "MultiPolygon",
@@ -337,340 +221,36 @@
           [
             [
               [
-                109.44957392615207,
-                18.30376641184373
-              ],
-              [
-                109.44956990529286,
-                18.30376753165529
-              ],
-              [
-                109.44956600121462,
-                18.30376899005421
-              ],
-              [
-                109.44956224805338,
-                18.303770771688903
-              ],
-              [
-                109.44955867455515,
-                18.303772863766365
-              ],
-              [
-                109.44955531036442,
-                18.30377525008219
-              ],
-              [
-                109.44955217973568,
-                18.303777911873308
-              ],
-              [
-                109.44954930782171,
-                18.303780826965234
-              ],
-              [
-                109.44954671708042,
-                18.303783974036325
-              ],
-              [
-                109.44954442907138,
-                18.303787328353508
-              ],
-              [
-                109.4495424608626,
-                18.3037908617722
-              ],
-              [
-                109.44954082682709,
-                18.303794547853624
-              ],
-              [
-                109.44953954223624,
-                18.30379835760035
-              ],
-              [
-                109.44953861517486,
-                18.303802262014983
-              ],
-              [
-                109.44949801222236,
-                18.303984055147044
-              ],
-              [
-                109.44944551916873,
-                18.30416304813935
-              ],
-              [
-                109.44938134711809,
-                18.30433853397793
-              ],
-              [
-                109.44937792633347,
-                18.304345998226488
-              ],
-              [
-                109.44937381474442,
-                18.304353136681456
-              ],
-              [
-                109.44936904828351,
-                18.304359893053963
-              ],
-              [
-                109.44936366288339,
-                18.30436621190804
-              ],
-              [
-                109.44935770256147,
-                18.304372042072035
-              ],
-              [
-                109.44935121762346,
-                18.30437733493286
-              ],
-              [
-                109.4493442619682,
-                18.30438204784746
-              ],
-              [
-                109.44933688679973,
-                18.30438614414286
-              ],
-              [
-                109.449329157695,
-                18.30438958799886
-              ],
-              [
-                109.44932113304458,
-                18.304392352976816
-              ],
-              [
-                109.4493128811204,
-                18.304394416902333
-              ],
-              [
-                109.44905410163987,
-                18.304447347202135
-              ],
-              [
-                109.44904622521146,
-                18.304448629053
-              ],
-              [
-                109.44903826164646,
-                18.30444927125772
-              ],
-              [
-                109.44903027113202,
-                18.30444926784628
+                109.51201716183762,
+                18.315494615834968
               ],
               [
-                109.44902230936364,
-                18.30444862223012
+                109.51201545773353,
+                18.316742448930025
               ],
               [
-                109.44901443203692,
-                18.30444733526207
+                109.51214185698218,
+                18.31676469935841
               ],
               [
-                109.44900669664402,
-                18.304445418029374
+                109.5129214931392,
+                18.31689185788796
               ],
               [
-                109.44899915888047,
-                18.304442884177746
+                109.51296683200991,
+                18.316855370826563
               ],
               [
-                109.44899187174687,
-                18.30443975332299
+                109.5129685073679,
+                18.31562491618387
               ],
               [
-                109.44820770987748,
-                18.304063867828994
+                109.51282684484423,
+                18.31549020938059
               ],
               [
-                109.44820036525172,
-                18.304059948068737
-              ],
-              [
-                109.44819341498638,
-                18.304055420216724
-              ],
-              [
-                109.44818691298035,
-                18.304050319240353
-              ],
-              [
-                109.44818091133591,
-                18.304044686929874
-              ],
-              [
-                109.44817545766382,
-                18.304038569339838
-              ],
-              [
-                109.44817059508321,
-                18.304032010819157
-              ],
-              [
-                109.44816636132325,
-                18.30402506595099
-              ],
-              [
-                109.4481627896217,
-                18.30401779017145
-              ],
-              [
-                109.4481599096229,
-                18.30401023976952
-              ],
-              [
-                109.44815774378473,
-                18.30400247529847
-              ],
-              [
-                109.44815630917523,
-                18.3039945573116
-              ],
-              [
-                109.44815561567584,
-                18.303986548067925
-              ],
-              [
-                109.4481556713714,
-                18.303978509826525
-              ],
-              [
-                109.44816643498511,
-                18.303777197172597
-              ],
-              [
-                109.44816657781726,
-                18.303774525999955
-              ],
-              [
-                109.44816646283289,
-                18.303773192972205
-              ],
-              [
-                109.44816611877815,
-                18.30376920071184
-              ],
-              [
-                109.44816540731243,
-                18.303765252800346
-              ],
-              [
-                109.44816433113071,
-                18.303761381646623
-              ],
-              [
-                109.44816290101281,
-                18.30375761710093
-              ],
-              [
-                109.4481611268401,
-                18.303753988160654
-              ],
-              [
-                109.4481590229857,
-                18.303750522117532
-              ],
-              [
-                109.44815660741591,
-                18.303747248821818
-              ],
-              [
-                109.44815389540207,
-                18.303744193006604
-              ],
-              [
-                109.44815091299533,
-                18.30374137769927
-              ],
-              [
-                109.44814767995862,
-                18.303738827632923
-              ],
-              [
-                109.44814422324141,
-                18.303736559864838
-              ],
-              [
-                109.44814056979317,
-                18.303734593158094
-              ],
-              [
-                109.44813674835993,
-                18.303732945422848
-              ],
-              [
-                109.44813278858616,
-                18.303731625187748
-              ],
-              [
-                109.44812872101454,
-                18.30373064524581
-              ],
-              [
-                109.44812458157772,
-                18.303730013272816
-              ],
-              [
-                109.44812039902176,
-                18.303729735238804
-              ],
-              [
-                109.44804785467267,
-                18.30372798260111
-              ],
-              [
-                109.44792173030845,
-                18.30369133498545
-              ],
-              [
-                109.44790342443959,
-                18.30368686170721
-              ],
-              [
-                109.44786788169706,
-                18.303779882843894
-              ],
-              [
-                109.44793784428802,
-                18.30396483415447
-              ],
-              [
-                109.44915949468394,
-                18.30455042742633
-              ],
-              [
-                109.44934689313367,
-                18.304488671749336
-              ],
-              [
-                109.44939794618791,
-                18.304372476178745
-              ],
-              [
-                109.44944381416632,
-                18.304254322357945
-              ],
-              [
-                109.44948441532219,
-                18.304134426057367
-              ],
-              [
-                109.4495196732988,
-                18.304012995372034
-              ],
-              [
-                109.44954952790893,
-                18.303890252896338
-              ],
-              [
-                109.44957392615207,
-                18.30376641184373
+                109.51201716183762,
+                18.315494615834968
               ]
             ]
           ]
@@ -680,16 +260,16 @@
     {
       "type": "Feature",
       "properties": {
-        "dkbm": "FH03-01-07",
-        "kzxxgyddm": "G1",
-        "kzxxgydmc": "公园绿地",
-        "ydmj": 1286,
+        "dkbm": "BP08-26",
+        "kzxxgyddm": "070102/090101",
+        "kzxxgydmc": "二类城镇住宅混合零售商业用地",
+        "ydmj": 27283,
         "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "87.58",
+        "xjxzqmc": "吉阳区/天涯区",
+        "xzmc": "吉阳区/天涯区",
+        "landPrice": "0.00",
         "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
+        "time": "2024-06-18 11:01:36"
       },
       "geometry": {
         "type": "MultiPolygon",
@@ -697,160 +277,92 @@
           [
             [
               [
-                109.43961501516442,
-                18.30560215367195
-              ],
-              [
-                109.43862940339763,
-                18.30525592285416
-              ],
-              [
-                109.43831059669319,
-                18.305240192748986
-              ],
-              [
-                109.43960758519869,
-                18.305695803187255
+                109.51602049761308,
+                18.311268223631334
               ],
               [
-                109.43961501516442,
-                18.30560215367195
-              ]
-            ]
-          ]
-        ]
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {
-        "dkbm": "FH03-01-05",
-        "kzxxgyddm": "S42",
-        "kzxxgydmc": "社会停车场用地",
-        "ydmj": 1481,
-        "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "100.86",
-        "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
-      },
-      "geometry": {
-        "type": "MultiPolygon",
-        "coordinates": [
-          [
-            [
-              [
-                109.43956791829069,
-                18.306195893829056
+                109.51634769278564,
+                18.31122759575691
               ],
               [
-                109.43936799642759,
-                18.30616679704386
+                109.51645556967148,
+                18.31101210642263
               ],
               [
-                109.43929204027704,
-                18.306729921354187
+                109.51654388843694,
+                18.310780554614436
               ],
               [
-                109.43953283189232,
-                18.306764483961217
+                109.51652971571674,
+                18.310584466636815
               ],
               [
-                109.43953296574132,
-                18.30676450357675
+                109.51651082863786,
+                18.310102631634898
               ],
               [
-                109.43956791829069,
-                18.306195893829056
-              ]
-            ]
-          ]
-        ]
-      }
-    },
-    {
-      "type": "Feature",
-      "properties": {
-        "dkbm": "FH03-09-03",
-        "kzxxgyddm": "G1",
-        "kzxxgydmc": "公园绿地",
-        "ydmj": 1771,
-        "sjxzqmc": "三亚市",
-        "xjxzqmc": "天涯区/吉阳区",
-        "xzmc": "天涯区/吉阳区",
-        "landPrice": "146.11",
-        "bzdw": "中规院（北京）规划设计有限公司",
-        "time": "2024-06-17 18:26:17"
-      },
-      "geometry": {
-        "type": "MultiPolygon",
-        "coordinates": [
-          [
-            [
-              [
-                109.44443382628344,
-                18.30359658163097
+                109.51652459711624,
+                18.309788304149603
               ],
               [
-                109.44448054855968,
-                18.303191743715395
+                109.51655301711688,
+                18.309650487629206
               ],
               [
-                109.44454201668131,
-                18.30300283341605
+                109.51662715507727,
+                18.30929030224764
               ],
               [
-                109.44454583362298,
-                18.302997081669872
+                109.51661088299421,
+                18.309289258374317
               ],
               [
-                109.4444473809628,
-                18.302990536755633
+                109.51609075305484,
+                18.309273269372834
               ],
               [
-                109.44434872528332,
-                18.302988065142145
+                109.5155642333988,
+                18.309257080805803
               ],
               [
-                109.44429450476942,
-                18.303154690021184
+                109.51541789065249,
+                18.309378750019885
               ],
               [
-                109.44420002266277,
-                18.303973359381782
+                109.51536978586905,
+                18.309810037800926
               ],
               [
-                109.44420020142752,
-                18.303973043822143
+                109.51534472466922,
+                18.310093462819864
               ],
               [
-                109.44423687964057,
-                18.303909252152526
+                109.51532558336719,
+                18.310377395662908
               ],
               [
-                109.44427442921945,
-                18.303845925270547
+                109.51531237633586,
+                18.310661637617955
               ],
               [
-                109.4443128420793,
-                18.30378307341111
+                109.51530510627028,
+                18.310946074404324
               ],
               [
-                109.44435211822015,
-                18.303720705103363
+                109.51530378215355,
+                18.31122967324622
               ],
               [
-                109.44439224416728,
-                18.303658835699448
+                109.51530529042492,
+                18.31126988238167
               ],
               [
-                109.44443321273411,
-                18.303597472875627
+                109.51596578302576,
+                18.31127501811131
               ],
               [
-                109.44443382628344,
-                18.30359658163097
+                109.51602049761308,
+                18.311268223631334
               ]
             ]
           ]

src/views/siteselection/index.vue

@@ -17,7 +17,7 @@
         <el-tab-pane label="辅助选址" name="fzxz">
           <FZXZ></FZXZ>
         </el-tab-pane>
-        <el-tab-pane label="历史记录" name="lsju">
+        <el-tab-pane label="历史记录"  name="lsju">
           <Lsjl
             :rzBsm="rzBsm"
             :activeTabs="activeTabs"
@@ -26,7 +26,7 @@
           ></Lsjl>
         </el-tab-pane>
         <!-- :disabled="activeTabs != 'scjg'" -->
-        <el-tab-pane label="选址结果" name="xzjg">
+        <el-tab-pane label="选址结果" :disabled="activeTabs != 'scjg'" name="xzjg">
           <XZJG
             :activeTabs="activeTabs"
             :loading="loading"
@@ -78,6 +78,12 @@ export default {
       this.activeTabs = evt.name;
     },
   },
+  watch: {
+    activeTabs(newValue) {
+       if (newValue != "lsju")
+        viewer.dataSources.removeAll();
+    },
+  },
 };
 </script>