418

src/view/components/InfoBoundary.vue

@@ -442,6 +442,7 @@ let dialogtrue = ref();
 // 3D弹屏
 const Dclick = () => {
   dialogtrue.value.dialoglog = true;
+  vtkmodel.clearJgAddMode() ;
   vtkmodel.selectNodes();
   dialogtrue.value.jgSelect();
   console.log(dialogtrue.value.dialoglog);

src/view/components/InfoDisaster.vue

@@ -1220,6 +1220,7 @@ const Dtext=(val)=>{
 // 3D弹屏
 const Dclick = () => {
   dialogtrue.value.dialoglog = true;
+  vtkmodel.clearJgAddMode() ;
   vtkmodel.selectPipes();
   dialogtrue.value.jgSelect();
   console.log(dialogtrue.value.dialoglog);

src/view/index/first-left.vue

@@ -260,9 +260,12 @@ console.log(props.classradio);
   // getMonitor();
   // vtkmodel.clearModeAddJg();
   // vtkGridRead()
+if(props.classradio=='Fire'){
+  formInline.value.region="Temperature";
+}else if(props.classradio=='Water'){
+  formInline.value.region="Height";
+}
  readJob();
- console.log(666666666)
-
 }
 function regionchange(val) {
   // console.log(val)
@@ -381,14 +384,11 @@ async  function getMonitor() {
             { prop:'v'+num, label: res.codes[i].code },
           )
         }
-        if(props.classradio=='Fire'){
-       
-          formInline.value.region=strResultFormatlist.value[0].value;
-         
-        }
-     
+  
         // strResultFormatlist.value=res.codes;
          dynamicHeaders.value=headertable;
+
+
         let warning=[];//一级警告
         let warning2=[];//二级警告
         let warning3=[];//突水发生
@@ -681,7 +681,7 @@ function velocityRead() {
 }
 function getMinMax(scalars) {
   // console.log("getMinMax:",scalars);
-  min.value = scalars[0];
+  min.value = 0;
   max.value = scalars[0];
   for (let index = 0; index <= scalars.length; index++) {
     let scalar = scalars[index];
@@ -692,7 +692,10 @@ function getMinMax(scalars) {
       max.value = scalar;
     }
   }
-  // console.log("max，min:", max.value, min.value);
+  if( min.value== max.value){
+     max.value=min.value+1;
+  }
+  console.log("max，min:", max.value, min.value);
 }
 function vtkShow() {
 
@@ -741,7 +744,6 @@ function vtkGridRead() {
   fcon
     .initGemetry()
     .then((result) => {
-      console.log(result);
      vtkScalarRead();
     vtkmodel.renderWindowWith.resize();
     })