12.14下班上传

src/view/InfoDialoges.vue

@@ -324,9 +324,10 @@
                                             </li>
                                         </ul>
                                     </div>
+                                    <!-- //@click="changeClass(1)"  @click="initial();"  @click="calculate();"-->
                                     <div class="asdis_btn">
-                                        <div class="btn" :class="{chuactive: isActive === 1}" @click="changeClass(1)"><span class="spantext" @click="initial();">初始数据</span></div>
-                                        <div class="btn" :class="{chuactive: isActive === 2}" @click="changeClass(2)"><span class="spantext" @click="calculate();">开始计算</span></div>
+                                        <div class="btn" :class="{chuactive: isActive === 1}" @click="changeClass(1)" ><span class="spantext" >初始数据</span></div>
+                                        <div class="btn" :class="{chuactive: isActive === 2}" @click="changeClass(2)" ><span class="spantext" >开始计算</span></div>
                                     </div>
 
                                     <div class=" logs">
@@ -547,7 +548,7 @@ let tuiyanobj2 = ref({
 
 })
 let tuiyanobj3 = ref({
-    value: ['SO2'],
+    // value: ['SO2'],
     pickertime: '',
     acctime: '2024-03-06 00:00:00',
     dt: '5',
@@ -556,7 +557,20 @@ let tuiyanobj3 = ref({
     interactionstep: '3600',
     totaltime: '3600',
     coids: '1',
-    cocodes: 'CO2'
+    // cocodes: 'CO2'
+
+})
+let tuiyanobj4 = ref({
+    value: ['SO2'],
+    pickertime: '',
+    acctime: '2024-03-06 00:00:00',
+    dt: '1',
+    dx: '20',
+    reportstep: '60',
+    interactionstep: '1',
+    totaltime: '1',
+    coids: '1',
+     cocodes: 'CO2'
 
 })
 let tableobj = ref({});
@@ -912,7 +926,15 @@ const inititimeDefaultal = () => {
 
 let isActive=ref(0)
 const  changeClass= (i)=>  {
+    console.log(i);
  isActive.value = i;
+ if( i=='1'){
+    initial();
+ }else if(i=='2'){
+    calculate()
+ }else{
+
+ }
 }
 // 初始数据
 const initial = () => {
@@ -921,17 +943,34 @@ const initial = () => {
 
 }
 const addinitial=()=>{
+    console.log(classradio.value);
     if (classradio.value == "Fire") {
         tuiyanobj2.value.pickertime = inititimeDefaultal();
         tuiyanobj2.value.acctime = inititimeDefaultal();
         tuiyanobj2.value.cocodes = options.value[0].code;
         tuiyanobj2.value.coids=options.value[0].coid;
-        tuiyanobj.value = tuiyanobj2.value;
-    } else {
-
+        // tuiyanobj.value = { ...tuiyanobj2.value }
+        tuiyanobj.value.acctime="2024-12-14 17:27:57";
+        tuiyanobj.value.cocodes= "CH4";
+        tuiyanobj.value.coids= 15;
+        tuiyanobj.value.dt= "0.1";
+        tuiyanobj.value.dx= "10";
+        tuiyanobj.value.interactionstep="3600";
+        tuiyanobj.value.pickertime="2024-12-14 17:27:57";
+        tuiyanobj.value.reportstep= "60";
+        tuiyanobj.value.totaltime="3600";
+        console.log(  tuiyanobj.value);
+    } else if(classradio.value == "Water"){
+        tuiyanobj.value ={ ...tuiyanobj3.value };
+        console.log(tuiyanobj.value);
+    }
+      else if(classradio.value == "Gass"){
+        tuiyanobj.value ={ ...tuiyanobj4.value }
+        console.log( tuiyanobj.value);
+    }else{
         tuiyanobj3.value.pickertime = inititimeDefaultal();
         tuiyanobj3.value.acctime = inititimeDefaultal();
-        tuiyanobj.value = tuiyanobj3.value;
+        tuiyanobj.value = { ...tuiyanobj3.value };
     }
 }
 function zdtimechange() {

src/view/components/MenuMine.vue

@@ -968,7 +968,7 @@ console.log(val);
     }else if(val=='RECTANGLE'){
         labelobj.value.v1='全高';
         labelobj.value.v2='顶宽';
-        labelobj2.value={isshow1:true,isshow2:false,isshow3:false, isshow4:false, isshow5:false}
+        labelobj2.value={isshow1:true,isshow2:true,isshow3:false, isshow4:false, isshow5:false}
     }else if(val=='SEMICIRCULAR'||val=='BASKETHANDLE'||val=='HORSESHOE'||val=='CATENARY'||val=='SEMIELLIPTICAL'||val=='EGG'||val=='GOTHIC'){
         labelobj.value.v1='全高';
         labelobj2.value={isshow1:true,isshow2:false,isshow3:false, isshow4:false, isshow5:false}

src/view/components/MenuPhysics.vue

@@ -35,7 +35,13 @@
                                         <span >(kg/m3)</span>
                                     </template>
                                     </el-table-column>
-                                    <el-table-column prop="diffcoe" label="扩散系数" />
+                                    <!-- <el-table-column prop="diffcoe" label="扩散系数" /> -->
+                                    <el-table-column prop="diffcoe">
+                                        <template v-slot:header>
+                                        <span >扩散系数</span><br>
+                                        <span >(m2/s)</span>
+                                    </template>
+                                    </el-table-column>
                                     <el-table-column prop="speheat" label="比热" >
                                         <template v-slot:header>
                                         <span >比热</span><br>

src/view/components/Menupath.vue

@@ -87,7 +87,7 @@
                       <template v-slot:empty>
                         <p>暂无数据</p>
                         </template>
-                      <el-table-column prop="nid" label="节点编号" />
+                      <!-- <el-table-column prop="nid" label="节点编号" /> -->
                         <el-table-column prop="nname" label="节点名称" />
                       
                         <el-table-column prop="seq" label="排序" />