710修改

src/control/vtkModel.js

@@ -316,7 +316,8 @@ addpump(pid,site){
     actor.setPosition(pipsite_point[0],pipsite_point[1],pipsite_point[2]);
     actor.getProperty().setColor(SOURECOLOR);
     actor.setMapper(mapper);
-    actor.setScale(0.3,0.3,0.3);//放大
+    actor.rotateZ(90);
+    actor.setScale(0.2,0.2,0.2);//放大
       // 旋转actor
     // actor.rotateY(90);// 绕y轴旋转
     this.pmpActors.push(actor);
@@ -358,6 +359,7 @@ addSensor(val){
     actor.setPosition(pipsite_point[0],pipsite_point[1],pipsite_point[2]);
     actor.getProperty().setColor(SOURECOLOR);
     actor.setMapper(mapper);
+    actor.rotateZ(90);
     actor.setScale(0.05,0.05,0.05);//放大
       // 旋转actor
     // actor.rotateY(90);// 绕y轴旋转
@@ -408,7 +410,7 @@ delSensor(){
   actor.getProperty().setColor(REA);
   actor.setMapper(mapper);
     // 旋转actor
-  actor.rotateZ(180);// 绕y轴旋转
+  actor.rotateZ(90);// 绕y轴旋转
   actor.setScale(0.3,0.3,0.3);//放大
   this.soureActors.push(actor);
   // this.renderer.addActor(actor);
@@ -457,7 +459,8 @@ initjc(info,x,y,z) {
   actor.setPosition(x,y,z);
   actor.getProperty().setColor(JCDCOLOR);
   actor.setMapper(mapper);
-  actor.setScale(0.2,0.2,0.2);//放大
+  actor.rotateZ(90);
+  actor.setScale(0.1,0.1,0.1);//放大
   const jc = {
     id: info.cid,
     info: info ,
@@ -565,6 +568,7 @@ addpipsensor(pid,site){
       const pipsensorMapper = vtkMapper.newInstance();
       pipsensorMapper.setInputConnection(this.cgqreader.getOutputPort());
       actorpipsensor.setMapper(pipsensorMapper);
+      actorpipsensor.rotateZ(90);
       actorpipsensor.setScale(0.05,0.05,0.05);//放大
       actorpipsensor.getProperty().setColor(SOURECOLOR);
       this.actorpipsensors.push(actorpipsensor);
@@ -600,7 +604,8 @@ addpipjc(pid,site){
       const pipjcMapper = vtkMapper.newInstance();
       pipjcMapper.setInputConnection(this.jcreader.getOutputPort());
       actorpipjc.setMapper(pipjcMapper);
-      actorpipjc.setScale(0.2,0.2,0.2);//放大
+      actorpipjc.rotateZ(90);
+      actorpipjc.setScale(0.1,0.1,0.1);//放大
       actorpipjc.getProperty().setColor(JCDCOLOR);
       this.actorpipjcs.push(actorpipjc);
     }
@@ -1128,6 +1133,7 @@ safetypathremove(){
     this.isSelectPipe = false;
     this.isSelectSensor = true;
     this.isSelectJC = false;
+    this.isJg = false;
      document.addEventListener("mousemove", throttleMouseHandler);
     this.modelShow();
     this.renderWindow.render();
@@ -1137,6 +1143,7 @@ safetypathremove(){
     this.isSelectPipe = false;
     this.isSelectSensor = false;
     this.isSelectJC = true;
+    this.isJg = false;
      document.addEventListener("mousemove", throttleMouseHandler);
     this.modelShow();
     this.renderWindow.render();
@@ -1147,6 +1154,7 @@ safetypathremove(){
     this.isSelectSensor = false;
     this.isSelectJC = false;
     this.selectObj = null;
+    this.isJg = true;
     document.removeEventListener("mousemove", throttleMouseHandler);
     this.modelShow();
     this.renderWindow.render();
@@ -1348,7 +1356,7 @@ safetypathremove(){
     }
 
     // 4. 高亮选中
-    targetSensor.actor.getProperty().setColor(BROWN);
+    targetSensor.actor.getProperty().setColor(GREEN);
     this.lastActor = targetSensor.actor; // 更新引用
     this.selectObj = targetSensor.info;
 
@@ -1419,7 +1427,7 @@ function processSelections(selections) {
     // vtkmodel.lastActor = null;
     return;
   }
-
+  console.log("选择",selections,vtkmodel.isJg);
   const {
     worldPosition: rayHitWorldPosition,
     compositeID,

src/view/index/htmldialog.vue

@@ -127,7 +127,7 @@ const getdatahtml = (val) => {
       "SO2": "二氧化硫(ppm)", 
       "H2S": "硫化氢(%)",
       "Flow":"流量(m³/s)",
-      "Height":"高(m)",
+      "Height":"水深(m)",
       "CH4":"甲烷(ppm)",
       };
   if(props.classradio=='Water'){

src/view/index/index.vue

@@ -22,6 +22,7 @@ import { ElMessage, ElButton, ElDialog, ElSelect } from 'element-plus'
 import bt1 from "@/assets/img/bt1.png"
 import bt2 from "@/assets/img/bt2.png"
 import bt3 from "@/assets/img/bt2.png"
+import { vtkmodel } from "@/control/vtkModel.js";
 const props = defineProps({
   
     classradio: {
@@ -62,10 +63,14 @@ const changeColor=(index)=>{
       firstleftref.value.isshow=false;
       emit("hiadden", null);
       towrightref.value.huoaid(props.aid);
+
+      vtkmodel.delAll();//清除风机风门等选中
    
     }else if(btnindex.value==2){
       firstleftref.value.isshow=false;
         emit("hiadden", null);
+
+        vtkmodel.delAll();
     }else{
       firstleftref.value.isshow=false;
         emit("hiadden", null);