liuqiao vor 1 Jahr
Ursprung
Commit
c2355ac664

BIN
src/assets/img/t1.png


BIN
src/assets/img/t2.png


BIN
src/assets/img/t3.png


BIN
src/assets/img/t4.png


+ 1 - 0
src/style/style.css

@@ -900,6 +900,7 @@ border-image: linear-gradient(90deg, rgba(91, 175, 222, 0), rgba(91, 175, 222, 1
     background-size: cover;
     line-height: 21px;
     overflow: hidden;
+    text-align: center;
 
   }
   .tabactive{

+ 4 - 1
src/view/InfoDialoges.vue

@@ -807,8 +807,10 @@ const rewu=()=>{
             tuiyanobj.value=res;
             state.value=res.state;
               if(state.value=="1"){
+           
              emit('websockfrist');
             }
+            sessionStorage.setItem("state",state.value);
            // console.log("状态"+state.value);
            // emit('resulysucss'); 
             tuiyanobj.value.pickertime=res.acctime;
@@ -979,8 +981,9 @@ const websocketonmessage = (res) => {
 // Websoket连接错误事件
 const websocketonerror = (res) => {
     console.log("连接错误", res);
-    websock.value.close();
     reconnect();
+    websock.value.close();
+  
 };
 // Websoket断开事件
 const websocketclose = (res) => {

+ 4 - 1
src/view/components/InfoBoundary.vue

@@ -317,7 +317,10 @@
     <!--  节点选择 -->
     <el-dialog
       v-model="sdialog.dialogVisiblenode"
-      width="600px"
+      width="700"
+      :z-index='3000'
+        align-center
+         :append-to-body="true"
       class="dialog_class bgcolor tianjia asideg asidegbg leftbgimg"
     >
       <template #header="{ titleId, titleClass }">

+ 1 - 0
src/view/components/InfoDisaster.vue

@@ -750,6 +750,7 @@
       v-model="sdialog.dialogVisiblenode"
       width="50%"
       :append-to-body="true"
+      align-center 
       class="dialog_class bgcolor tianjia asideg asidegbg leftbgimg"
     >
       <template #header="{ titleId, titleClass }">

+ 14 - 1
src/view/components/SetNode.vue

@@ -62,17 +62,30 @@ let msg=ref({
   z: '',
  
 })
+let state=ref();
 defineExpose({ dialoglog,jgSelect});
 let timing = ref(null);
 //管道节点选择对象
 let selectObj =  ref(null);
 const textclick=()=>{
   emit('Dtext',selectObj.value);
+  state.value=sessionStorage.getItem("state");
+  if(state.value=='1'){
+    vtkmodel.clearModeAddJg();
+  }else{
+    vtkmodel.selectNoting();
+  }
+
   clearInterval(timing.value);
 }
 const closeDialog=()=>{
+  state.value=sessionStorage.getItem("state");
+  if(state.value=='1'){
+    vtkmodel.clearModeAddJg();
+  }else{
+    vtkmodel.selectNoting();
+  }
 
-  vtkmodel.selectNoting();
   clearInterval(timing.value);
 }
 onBeforeUnmount(() => {

+ 13 - 2
src/view/components/SetPipe.vue

@@ -54,7 +54,7 @@ import { ElMessage, ElButton, ElDialog, ElSelect } from "element-plus";
 import icon from "@/assets/img/icon.png";
 import { vtkmodel } from "@/control/vtkModel.js";
 let emit = defineEmits(['Dtext',])
-
+let state=ref();
 let dialoglog = ref(false);
 let texttitle = ref("管道信息");
 // let msg = ref("内容");
@@ -75,11 +75,22 @@ let timing = ref(null);
 //管道节点选择对象
 let selectObj =  ref(null);
 const textclick=()=>{
+  state.value=sessionStorage.getItem("state");
   emit('Dtext',selectObj.value);
+  if(state.value=='1'){
+    vtkmodel.clearModeAddJg();
+  }else{
+    vtkmodel.selectNoting();
+  }
   clearInterval(timing.value);
 }
 const closeDialog=()=>{
-  vtkmodel.selectNoting()//节点图形
+  state.value=sessionStorage.getItem("state");
+  if(state.value=='1'){
+    vtkmodel.clearModeAddJg();
+  }else{
+    vtkmodel.selectNoting();
+  }//节点图形
   clearInterval(timing.value);
 }
 

+ 15 - 8
src/view/index/first-left.vue

@@ -95,7 +95,7 @@
           </el-collapse-item>
         </el-collapse>
         <el-collapse accordion v-model="activeNames" class="bganimation">
-          <el-collapse-item name="1" class="imgneon">
+          <el-collapse-item name="2" class="imgneon">
             <template #title>
               <el-icon class="iconimg Frame3" fit="contain"></el-icon>
               动画展示
@@ -114,9 +114,9 @@
               <!-- <el-progress type="line" :percentage="percentage" :color="customColor" :stroke-width="4"/> -->
               <div class="tanniu">
                 <div><el-image :src="t1" fit="contain" @click="Prev" ></el-image></div>
-                <div><el-image :src="t2" fit="contain" v-show="suspendshow" @click="play(500)" ></el-image></div>
-                <div><el-image :src="t4" fit="contain" v-show="playshow" @click="play(500)" ></el-image></div>
-                <div><el-image :src="t3" fit="contain" @click="increment"></el-image></div>
+                <div v-show="suspendshow"><el-image :src="t2" fit="contain"  @click="play(500)" ></el-image></div>
+                <div v-show="playshow"><el-image :src="t3" fit="contain"  @click="play(500)" ></el-image></div>
+                <div><el-image :src="t4" fit="contain" @click="increment"></el-image></div>
                 
               </div>
             </div>
@@ -153,9 +153,9 @@ import bt2 from "@/assets/img/Group1396.png"
 import t1 from "@/assets/img/t1.png";
 import t2 from "@/assets/img/t2.png";
 import t3 from "@/assets/img/t3.png";
-import t4 from "@/assets/img/bt.png";
+import t4 from "@/assets/img/t4.png";
 let firstshow = ref(false);
-let activeNames = ref(["1"]);
+let activeNames = ref(["1",'2']);
 let tableHeight = ref(130);
 let playshow=ref(true);
 let suspendshow=ref(false);
@@ -307,13 +307,16 @@ await request(params)
       vtkmodel.clearModeAddJg();
       reddate(new Date());
       vtkGridRead();
+      firstshow.value=true;
       endtime.value= Number(res.totaltime)/Number(res.reportstep);
     }else if(res.state=='-1'){
+      firstshow.value=false;
       ElMessage({
         message: " 求解失败",
         type: 'error',
       });
     }else if(res.state=='0'){
+      firstshow.value=false;
       ElMessage({ message: "求解未完成",  type: 'error',
       });
     }
@@ -468,9 +471,9 @@ const play =(time)=>{
   console.log(count.value)
   timer(time); 
   }else{
+    isstop.value = false;//暂停
     playshow.value=true;
     suspendshow.value=false;
-    isstop.value = false;//暂停
 }
 }
 function sliderchange(val) {
@@ -750,7 +753,11 @@ console.log("值改变了", newVal, oldVal);
     getMonitor();
     vtkScalarRead();
  //   vtkScalarRead();
-
+if( newVal>=endtime.value){
+  playshow.value=true;
+  suspendshow.value=false;
+   isstop.value = false;
+}
   },
   { deep: true }
 ); //深度监视

+ 14 - 7
src/view/result.vue

@@ -33,17 +33,18 @@
                   <li>
                     <el-image :src="t1" fit="contain" @click="Prev()"></el-image>
                
-                  </li>
-                  <li v-show="playshow">
-                    <el-image :src="t4" fit="contain" @click="play(500)"></el-image>
-                 
                   </li>
                   <li v-show="suspendshow">
                     <el-image :src="t2"  fit="contain" @click="play(500)"></el-image>
                    
                   </li>
+                  <li v-show="playshow">
+                    <el-image :src="t3" fit="contain" @click="play(500)"></el-image>
+                 
+                  </li>
+                
                   <li>
-                    <el-image :src="t3" fit="contain" @click="increment()"></el-image>
+                    <el-image :src="t4" fit="contain" @click="increment()"></el-image>
                  
                   </li>
                 </ul>
@@ -118,7 +119,7 @@ import { vtkmodel } from "@/control/vtkModel.js";
 import t1 from "@/assets/img/t1.png";
 import t2 from "@/assets/img/t2.png";
 import t3 from "@/assets/img/t3.png";
-import t4 from "@/assets/img/bt.png";
+import t4 from "@/assets/img/t4.png";
 import mn from "@/assets/img/Group204.png";
 import t5 from "@/assets/img/Group207.png";
 import t6 from "@/assets/img/Frame.png";
@@ -192,12 +193,18 @@ function zdtimechange() {
   // reddate(zdtimeDate);
 
 }
-
+// 播放按钮的显示隐藏
+//    playshow.value=true;
+//suspendshow.value=false;
 //滑块
 function sliderchange(val) {
   //fcon.step = count.value;
   //  console.log(val);
+  suspendshow.value=false;
+    playshow.value=true;
+    isstop.value = false;
   newcount.value =val;
+
   newtime();
 }
 // 时间计算