4.18

src/style/style.css

@@ -48,6 +48,23 @@ body,html{
  .imgneon .el-icon svg path{
     display: none;
   }
+  .imgneon1 .el-collapse-item__header .el-icon svg {
+    background-image: url(../assets/img/jian.png);
+    background-repeat: no-repeat;
+    background-image: url(/src/assets/img/jian.png);
+    background-repeat: no-repeat;
+    background-position: center;
+    /* transform: rotate(346deg); */
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center;
+    transform: rotate(270deg);
+    -ms-transform: rotate(30deg);
+    transform-origin: 50% 50%;
+  }
+ .imgneon1 .el-collapse-item__header .el-icon svg path{
+    display: none;
+  }
   .L_aside .Frame4 {
     background-image: url(../assets/img/Group27.png);
     background-repeat: no-repeat;

src/view/InfoDialoges.vue

@@ -136,16 +136,15 @@
         </el-dialog>
         <!--火灾左侧栏-->
         <div class="common-layout" style="margin: 0;" v-show="leftcoll.collfire">
-            <el-aside width="278px" class="L_aside L_aside1 asideg asidegbg  leftbgimg">
+            <el-aside width="2.125rem" class="L_aside L_aside1 asideg asidegbg  leftbgimg1">
                 <div class="demo-collapse">
                     <el-collapse v-model="coolactiveName" accordion>
-                        <el-collapse-item name="1">
-
+                        <el-collapse-item name="1" class="imgneon1">
                             <template #title>
-                                <el-icon class="iconimg Frame2" fit="contain"></el-icon>
-                                火灾<el-icon class="header-icon">
-                                </el-icon>
+                          <el-icon class="iconimg imgneon Frame3"  fit="contain"></el-icon>
+                                火灾模拟参数
                             </template>
+                     
                             <div class="asides_content">
                                 <el-form :inline="true" :model="tuiyanobj" class="demo-form-inline">
                                     <div class="l_padding " style="padding:20px 20px 20px 24px; ">
@@ -801,7 +800,6 @@ const rewu=()=>{
         .then((res) => {
          
             emit('resulysucss',res.state);
-        
             arrvalue.value=res.cocodes.split(',');
             tuiyanobj.value=res;
             state.value=res.state;

src/view/appmian.vue

@@ -166,8 +166,11 @@ const  handleSelectzt=(val)=>{
 const resulysucss=(val)=>{
   state.value=val;
   // 求解成功
-  setTimeout(function(){
-  indexref.value.changeColor(0);},300)
+  setTimeout(function(){ },300)
+  if(  state.value=='1'){
+    indexref.value.changeColor(0);
+    websockfrist();
+  }
 }
 //求解成功
 // const indexinit=()=>{

src/view/components/InfoBoundary.vue

@@ -4,17 +4,22 @@
     <!--火灾左侧栏-->
     <div class="common-layout" style="margin: 0">
       <el-aside
-        width="591px"
-        class="L_aside L_aside1 asideg asidegbg leftbgimg2"
+        width="2.125rem"
+        class="L_aside L_aside1 asideg asidegbg leftbgimg1"
         v-show="boun.collfire"
       >
         <div class="demo-collapse">
           <el-collapse v-model="coolactiveName1" accordion>
-            <el-collapse-item name="1">
-              <template #title>
+            <!-- <el-collapse-item name="1"> -->
+              <!-- <template #title>
                 <el-icon class="iconimg Frame2" fit="contain"></el-icon>
                 火灾<el-icon class="header-icon"> </el-icon>
-              </template>
+              </template> -->
+              <el-collapse-item name="1" class="imgneon">
+              <template #title>
+                <el-icon class="iconimg Frame3" fit="contain"></el-icon>
+                火灾边界设置<el-icon class="header-icon"> </el-icon>
+              </template> 
               <div class="asides_content">
                 <div class="jc_content tablecolor">
                   <div class="jc_padding font12">
@@ -100,7 +105,7 @@
             <el-collapse-item name="2" class="imgneon">
               <template #title>
                 <el-icon class="iconimg Frame3" fit="contain"></el-icon>
-                突水<el-icon class="header-icon"> </el-icon>
+                突水边界设置<el-icon class="header-icon"> </el-icon>
               </template> 
               <div class="asides_content">
                 <div class="jc_content tablecolor">

src/view/components/InfoDisaster.vue

@@ -3,13 +3,13 @@
   <div class="l_Dialog bbb tablebk ">
     <!--火灾左侧栏-->
     <div class="common-layout" style="margin: 0" v-show="sour.collfire">
-      <el-aside width="354px" class="L_aside L_aside1 asideg asidegbg leftbgimg1">
+      <el-aside width="2.125rem" class="L_aside L_aside1 asideg asidegbg leftbgimg1">
         <div class="demo-collapse">
           <el-collapse v-model="coolactiveName1" accordion @change="handleChangecollapse ">
-            <el-collapse-item name="1">
+            <el-collapse-item name="1" class="imgneon">
               <template #title>
-                <el-icon class="iconimg Frame2" fit="contain"></el-icon>
-                火灾<el-icon class="header-icon"> </el-icon>
+                <el-icon class="iconimg Frame3" fit="contain"></el-icon>
+                火灾灾害源设置
               </template>
               <div class="asides_content">
                 <div class="jc_content tablecolor">

src/view/index/first-left.vue

@@ -58,9 +58,13 @@
                 <div class="hedse">
               <el-icon class="iconimg1 Frame3" fit="contain"></el-icon>{{ jcname }}
             </div>
+            <div class="zongji" v-if="props.classradio=='Fire'">
+                <div class="zongjili"><span>温度（℃）：</span><span>{{ c}}</span></div>
+                <div class="zongjili"><span>压力（Pa）：</span><span>{{ pa }}</span></div>
+              </div>
             <div class="echart">
             <div id="line" style="width: 1.526rem;height:1.03rem;"></div></div>
-            <div class="zongji">
+            <div class="zongji"  v-if="props.classradio=='Water'" >
                 <div class="zongjili img3">{{ heightnum }}<span>m</span></div>
                 <div class="zongjili img4"><p class="jcshijian">2024-03-20</p><p>14:23:00</p></div>
               </div>
@@ -136,7 +140,8 @@ let tableHeight = ref(130);
 let playshow=ref(true);
 let suspendshow=ref(false);
 let showfalse=ref(false);
-
+let c=ref(null);
+let pa=ref(null);
 const isstop = ref(false);
 let count=ref(1);
 let starttime = ref(1);
@@ -158,6 +163,14 @@ let warnin2=ref(0);
 const dynamicHeaders = ref([
 
 ]);
+const props = defineProps({
+  
+  classradio: {
+  type: String,
+  // default: '',activeIndex
+},
+})
+let classradio=ref();
 const job = ref({
   jid: 0, //	任务ID
   aid: 0, //	事故ID
@@ -212,8 +225,11 @@ onMounted(() => {
 const fcon = createFireControl();
 // 检测点的结果获取
 // 父组件获取的方法初始化 
-const indexinit= (id)=>{
+const indexinit= (id,radio)=>{
   aid.value=id;
+console.log(props.classradio);
+//  classradio.value=radio;
+  //console.log(classradio.value);
   fcon.step=count.value;
   getMonitor();
   vtkmodel.clearModeAddJg();
@@ -625,9 +641,7 @@ function vtkShow() {
   if (!fcon.scalar) {
     return;
   }
-
   const scalarArray = fcon.scalar.get(formInline.value.region);
-  console.log("执行了");
   if (!scalarArray || !fcon.polydata) {
     return;
   }
@@ -637,6 +651,7 @@ function vtkShow() {
     name: formInline.value.region,
     size: fcon.polydata.getNumberOfPoints(),
   });
+  console.log("执行了");
   // console.log(dataArray);
   dataArray.setData(scalarArray);
   fcon.polydata.getPointData().setScalars(dataArray);
@@ -663,7 +678,7 @@ function vtkGridRead() {
     .initGemetry()
     .then((result) => {
       console.log(result);
-      vtkScalarRead();
+     // vtkScalarRead();
    
     })
     .catch((err) => {});
@@ -672,8 +687,6 @@ function vtkScalarRead() {
   fcon
     .getScalrsByStep(fcon.step)
     .then((result) => {
-     console.log(fcon.scalar);
-     console.log(123444);
       velocityRead() ;
       vtkShow();
     })
@@ -687,7 +700,7 @@ watch(
 console.log("值改变了", newVal, oldVal);
     fcon.step = newVal;
     getMonitor();
-    vtkScalarRead();
+ //   vtkScalarRead();
 
   },
   { deep: true }

src/view/index/index.vue

@@ -10,7 +10,7 @@
             <li class="fontcolor"> <el-image  :src="bt3" fit="contain"></el-image>灾害对比</li> -->
         </ul>
     </div>
-    <firstLeft ref="firstleftref" />
+    <firstLeft ref="firstleftref"   :classradio="props.classradio" />
     <towright ref="towrightref"  />
      </template>
    <script setup>
@@ -67,7 +67,7 @@ const changeColor=(index)=>{
 // 求解成功后调用右边
 const firsrdata= ()=>{
     firstleftref.value.firstshow=true;
-    firstleftref.value.indexinit(props.aid);
+    firstleftref.value.indexinit(props.aid,props.classradio);
 }
 
 const indexchange=(key)=>{