zzy ++ 自定义高亮调整

src/service/my-apply.js

@@ -119,7 +119,8 @@ export function getPileBearingCapacityData(params){
  return requestInstance_proxy_token({
   url:'/CIMAPI/api/v1/momitor/cfy/getPileBearingCapacityData',
   params:{
-   "modelId":1075,
+   //"modelId":1075,
+   "modelId":params.modelId,
    "positions":params.positions,
    "lengthX":params.distance,
    "length":params.length,

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

@@ -8,7 +8,11 @@
           绘制
         </div>
       </div>
-      <common-num-title title="输入插值点间隔(m)" num="2" />
+      <common-num-title title="选择分析范围" num="2" />
+      <el-select  v-model="form.type">
+        <el-option   v-for="item in typeOptions" :key="item.value" :value="item.value" :label="item.label"></el-option>
+      </el-select>
+      <common-num-title title="输入插值点间隔(m)" num="3" />
       <div class="row-item">
         <el-input clearable v-model="form.distance"/>
       </div>
@@ -26,7 +30,7 @@
 </template>
 
 <script>
-import {onUnmounted, ref} from "vue";
+import {onBeforeUnmount, onUnmounted, ref} from "vue";
 import {useMapStore} from "@/pinia/useStore";
 import CommonMapToolTitle from "@/components/common/CommonMapToolTitle.vue";
 import CommonNumTitle from "@/components/common/CommonNumTitle.vue";
@@ -53,7 +57,22 @@ export default {
     const mapStore =  useMapStore();
     let maxColor = ref(null);
     let minColor = ref(null);
+    let typeOptions = ref([
+      {
+        label:"上海市地质模型",
+        value:"1450"
+      },
+      {
+        label:"上海中心城区地质模型",
+        value:"1075"
+      },
+      {
+        label:"北外滩480项目模型",
+        value:"693"
+      },
+    ])
     let form = ref({
+      type:null,
       distance:null,
       length:null,
     });
@@ -104,13 +123,14 @@ export default {
     })
     function startAna(){
       showLoading();
-      let rings =  mapStore.currentDrawContent?.rings[0].splice(0,mapStore.currentDrawContent?.rings[0].length-1);
+      let rings =  mapStore.geologyDrawContent?.rings[0].slice(0,mapStore.geologyDrawContent?.rings[0].length-1);
       let currentRings = [];
       rings.forEach((item)=>{
         currentRings.push(Object.values(item))
       })
       mapStore.bearingCapacityAnalysisResult = {}
       getPileBearingCapacityData({
+        modelId:form.value.type,
         positions:JSON.stringify(currentRings),
         //positions:"[[-1000,0],[0,-1000],[1000,0],[0,1000]]",
         distance:form.value.distance,
@@ -138,6 +158,9 @@ export default {
         })
       })
     }
+    onBeforeUnmount(()=>{
+      clearOp()
+    })
     function close(){
       emit('update:currentToolSmall','')
     }
@@ -149,7 +172,8 @@ export default {
       mapStore,
       form,
       minColor,
-      maxColor
+      maxColor,
+      typeOptions
     }
   }
 }
@@ -157,6 +181,11 @@ export default {
 
 <style scoped lang="scss">
 #bearing-capacity-analysis{
+  ::v-deep{
+    .el-select{
+      width: 100%;
+    }
+  }
   display: flex;
   flex-direction: column;
   mx-height: 500px;