maxiaoxiao пре 11 месеци
родитељ
комит
3fa74f863a

+ 2 - 1
src/views/siteselection/components/dkDetailsNew.vue

@@ -54,9 +54,10 @@
       <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
       <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
         <el-form-item label="地块编码">
         <el-form-item label="地块编码">
           <div>{{ optional.dkbm }}</div>
           <div>{{ optional.dkbm }}</div>
+          <!-- :min="0" :precision="2" -->
         </el-form-item>
         </el-form-item>
         <el-form-item label="拉膜高度:" prop="height">
         <el-form-item label="拉膜高度:" prop="height">
-          <el-input class="inputwidth" v-model="ruleForm.height" size="mini" type="number"
+          <el-input class="inputwidth" v-model.number="ruleForm.height" size="mini" type="number"
             placeholder="请输入地块拉白膜高度"></el-input>
             placeholder="请输入地块拉白膜高度"></el-input>
         </el-form-item>
         </el-form-item>

+ 10 - 4
src/views/siteselection/components/xzjg.vue

@@ -350,7 +350,7 @@ export default {
                 entity.polygon.outlineColor = Cesium.Color.BLACK;
                 entity.polygon.outlineColor = Cesium.Color.BLACK;
                 entity.polygon.outlineWidth = 1.0;
                 entity.polygon.outlineWidth = 1.0;
                 // if (!addlabel) {
                 // if (!addlabel) {
-                let center = this.getCentroid(geojson, ei).geometry.coordinates;
+                let center = this.getCentroid(geojson, ei);
 
 
                 var polycenter = Cesium.Cartesian3.fromDegrees(
                 var polycenter = Cesium.Cartesian3.fromDegrees(
                   center[0],
                   center[0],
@@ -388,10 +388,10 @@ export default {
         geojson = geojson.geometry;
         geojson = geojson.geometry;
       }
       }
       if (turf.getType(geojson) === "Polygon") {
       if (turf.getType(geojson) === "Polygon") {
-        return turf.centroid(geojson);
+        return turf.centroid(geojson).geometry.coordinates;
       } else if (turf.getType(geojson) === "MultiPolygon") {
       } else if (turf.getType(geojson) === "MultiPolygon") {
         let polygon = turf.polygon(geojson.coordinates[eindex]);
         let polygon = turf.polygon(geojson.coordinates[eindex]);
-        return turf.centroid(polygon);
+        return turf.centroid(polygon).geometry.coordinates;
       } else {
       } else {
         throw new Error("Unsupported geometry type");
         throw new Error("Unsupported geometry type");
       }
       }
@@ -479,9 +479,15 @@ export default {
         this.loadGeoJSON(parse(item.geom), "#000000", upid, height, item.dkbm);
         this.loadGeoJSON(parse(item.geom), "#000000", upid, height, item.dkbm);
       else {
       else {
         let entities = dataSources[upid].entities.values;
         let entities = dataSources[upid].entities.values;
-        entities.forEach((entity) => {
+        entities.forEach((entity, ei) => {
           if (height && entity.polygon) {
           if (height && entity.polygon) {
             entity.polygon.extrudedHeight = height;
             entity.polygon.extrudedHeight = height;
+            let center = this.getCentroid(parse(item.geom), ei);
+            entity.position = Cesium.Cartesian3.fromDegrees(
+              center[0],
+              center[1],
+              height
+            );
           }
           }
         });
         });
         viewer.flyTo(dataSources[upid], {
         viewer.flyTo(dataSources[upid], {