zzy ++ 地质调整

src/service/my-apply.js

@@ -103,13 +103,26 @@ export function getGeologyAnalysisData(params){
   }
  })
 }
+
+export function getGeologyProfileByPoints(params){
+ return requestInstance_proxy_token({
+  url:'/CIMAPI/api/v1/momitor/cfy/getGeologyProfileByPoints',
+  params:{
+   "modelId":1075,
+   "positions":params.positions,
+   "height":"200",
+  }
+ })
+}
+
+
 export function getGeologyAnalysisDataByPoints(params){
  return requestInstance_proxy_token({
   url:'/CIMAPI/api/v1/momitor/cfy/getGeologyAnalysisDataByPoints',
   params:{
    "modelId":1075,
    "positions":params.positions,
-   "height":200,
+   "height":params.height,
   }
  })
 }

src/unit/map/AddLayer.js

@@ -1484,6 +1484,8 @@ export function PrismEffect(params){
     })
 }
 
+
+//原有剖切数据
 export function PrismDifferentHeightEffect(params){
     invokeParams('PrismDifferentHeightEffect', {
         "status": params.status,
@@ -1491,6 +1493,14 @@ export function PrismDifferentHeightEffect(params){
     })
 }
 
+//新剖切数据
+export function PrismDifferentHeightSideEffect(params){
+    invokeParams('PrismDifferentHeightSideEffect', {
+        "status": params.status,
+        "extent": params.extent,
+        "items": params.items
+    })
+}
 
 
 export function PositionSlice(params){

src/views/c-cpns/Map.vue

@@ -14,7 +14,12 @@ import CityGis from '../../unit/map/CityGis.Bridge.js'
 import {myBridge} from "@/unit/map/map";
 import {useMapStore} from "@/pinia/useStore";
 import {nextTick, ref, onMounted} from "vue";
-import {getBoatRealTimePosition, getGeologyAnalysisData, pipeCollision} from "@/service/my-apply";
+import {
+  getBoatRealTimePosition,
+  getGeologyAnalysisData,
+  getGeologyProfileByPoints,
+  pipeCollision
+} from "@/service/my-apply";
 import {
   AddSingleLayer,
   changeMapTheme,
@@ -34,7 +39,7 @@ import {
   CylinderEffect,
   RectangleSlice,
   PrismEffect,
-  PrismDifferentHeightEffect
+  PrismDifferentHeightEffect, PrismDifferentHeightSideEffect
 } from "@/unit/map/AddLayer";
 import {closeShowLoading, showLoading} from "@/unit/element-loading/element-loader";
 import {switchTheme} from "@/unit/Theme/ThemeColor";
@@ -247,16 +252,22 @@ export default {
               }
               if(props.currentSmallTool==="customCutting"){  //地质-自定义剖切分析
                 showLoading();
-                getGeologyAnalysisData({ x: arg.data.center.x, y: arg.data.center.y }).then((response) => {
+                console.log("positions22222",arg.data.geometry.rings)
+                let positions = arg.data.geometry.rings[0].slice(0, -1)
+                console.log("positions1111",positions)
+                getGeologyProfileByPoints({
+                  positions:JSON.stringify(positions)
+                }).then((response) => {
                   if (response?.payload.length > 0) {
                     let data = response.payload;
                     closeShowLoading()
-                    // PrismEffect({
+                    // PrismDifferentHeightEffect({
                     //   status:"show",
                     //   items:data
                     // })
-                    PrismDifferentHeightEffect({
+                    PrismDifferentHeightSideEffect({
                       status:"show",
+                      extent:arg.data.geometry,
                       items:data
                     })
                   }

src/views/c-views/right-tool/geologyTheme/bearingCapacityAnalysis/BearingCapacityAnalysis.vue

@@ -123,7 +123,9 @@ export default {
     })
     function startAna(){
       showLoading();
-      let rings =  mapStore.geologyDrawContent?.rings[0].slice(0,mapStore.geologyDrawContent?.rings[0].length-1);
+      console.log("ringsringsringsringsrings11111",mapStore.geologyDrawContent?.rings)
+      let rings =  mapStore.geologyDrawContent?.rings[0].slice(0,-1);
+      console.log("ringsringsringsringsrings",rings)
       let currentRings = [];
       rings.forEach((item)=>{
         currentRings.push(Object.values(item))
@@ -159,7 +161,15 @@ export default {
       })
     }
     onBeforeUnmount(()=>{
-      clearOp()
+      CreateThreeGeometry({
+        status:"clear"
+      })
+      DataHeatMap({
+        visible:false
+      })
+      clearMapDraw(true,true,true);
+      mapStore.changeIsBearingCapacityAnalysisIsShow(false);
+      mapStore.bearingCapacityAnalysisResult = {}
     })
     function close(){
       emit('update:currentToolSmall','')

src/views/c-views/right-tool/geologyTheme/boreholeAnalysis/BoreholeAnalysis.vue

@@ -66,7 +66,7 @@ export default {
       mapStore.changeGeologyDrawContent({
         type:'polygon',
         spatialReference:{wkid:102100},
-        rings:rings
+        rings:[rings]
       });
       console.log(JSON.stringify(mapStore.geologyDrawContent),'geologyDrawContent')
       getGeologyAnalysisDataByPoints({ positions: JSON.stringify(positions),height:form.value.height}).then((response) => {

src/views/c-views/right-tool/geologyTheme/customCutting/CustomCutting.vue

@@ -13,13 +13,13 @@ import {
   CylinderEffect,
   DrawMap,
   PipeAgeAnalysis,
-  PositionSlice, PrismDifferentHeightEffect,
+  PositionSlice, PrismDifferentHeightEffect, PrismDifferentHeightSideEffect,
   PrismEffect, RectangleSlice
 } from "@/unit/map/AddLayer";
 import {onBeforeUnmount} from "vue";
 import {showConfirmOrExit} from "@/unit/element-ui/tip";
 import {closeShowLoading, showLoading} from "@/unit/element-loading/element-loader";
-import {getGeologyAnalysisData} from "@/service/my-apply";
+import {getGeologyAnalysisData, getGeologyProfileByPoints} from "@/service/my-apply";
 export default {
   name: "CustomCutting",
   setup(props,{emit}){
@@ -34,16 +34,18 @@ export default {
         ])
         showConfirmOrExit(() => {
           showLoading();
-          getGeologyAnalysisData({ x: 0, y: 0 }).then((response) => {
+          let positions = mapStore.geologyDrawContent.rings[0].slice(0,-1)
+          getGeologyProfileByPoints({ positions:JSON.stringify(positions)}).then((response) => {
             if (response?.payload.length > 0) {
               let data = response.payload;
               closeShowLoading()
-              // PrismEffect({
+              // PrismDifferentHeightEffect({
               //   status:"show",
               //   items:data
               // })
-              PrismDifferentHeightEffect({
+              PrismDifferentHeightSideEffect({
                 status:"show",
+                extent:mapStore.geologyDrawContent,
                 items:data
               })
             }