liuqiao 1 year ago
parent
commit
11e0cbc80e

+ 2 - 0
index.html

@@ -11,5 +11,7 @@
   <body>
     <div id="app"></div>
     <script type="module" src="/src/main.ts"></script>
+    <!-- <script type="module" src="./public/static/Build/Build.data"></script>
+    <script type="module" src="./public/static/Build/Build.wasm"></script> -->
   </body>
 </html>

+ 2 - 0
src/main.js

@@ -11,6 +11,8 @@ import './style/index.css' // 引入整个Element样式
 import "normalize.css/normalize.css";//重置样式
 import '@/js/lindex.js'
 import '@/utils/flexible'
+// import '../public/static/Build/Build.wasm'
+// import '../public/static/Build/Build.data'
 import directive from '@/utils/directive'
 
 // import mitt from 'mitt'

+ 2 - 3
src/view/InfoDialoges.vue

@@ -309,10 +309,10 @@
         </div>
         <!-- 瓦斯爆炸 -->
         <div class="common-layout" style="margin: 0;" v-show="leftcoll.Gass">
-            <el-aside width="278px" class="L_aside L_aside1 asideg asidegbg  leftbgimg">
+            <el-aside width="320px" 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="imgneon">
 
                             <template #title>
                                 <el-icon class="iconimg Frame4" fit="contain"></el-icon>
@@ -893,7 +893,6 @@ const selectchange = (val) => {
 const calculate = () => {
 
     rizhi.value.logs='';
-    
     emit('funcfirst');
     newlog.value ='';
     const params = {

+ 104 - 2
src/view/components/InfoBoundary.vue

@@ -155,6 +155,98 @@
          </div> 
     </el-aside>
     </div>
+    <!-- 瓦斯爆炸 -->
+    <div class="common-layout" style="margin: 0">
+      <el-aside
+        width="320px"
+        class="L_aside L_aside1 asideg asidegbg leftbgimg1"
+        v-show="boun.collGass"
+      >
+        <div class="demo-collapse">
+          <el-collapse v-model="coolactiveName1" accordion>
+            <!-- <el-collapse-item name="1"> -->
+              <!-- <template #title>
+                <el-icon class="iconimg Frame2" fit="contain"></el-icon>
+                火灾<el-icon class="header-icon"> </el-icon>
+              </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">
+                    <div class="xian btncolor tablefocus bmar">
+                      <el-table
+                        :data="ftableData"
+                        style="width: 100%"
+                        :max-height="tableHeight"
+                        :highlight-current-row="true"
+                        :row-class-name="tableRowClassName"
+                        @row-click="handleDelete($event)"
+                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
+                      >
+                        <el-table-column prop="nid" label="节点选择" />
+                        <!-- <el-table-column prop="type" label="边界类型" /> -->
+
+                        <el-table-column
+                          label="边界类型"
+                          prop="type"
+                          align="center"
+                          width="80px"
+                        >
+                          <template #default="scope">
+                            {{
+                              scope.row.type == "massflow"
+                                ? "流量边界"
+                                : scope.row.type == "Pressure"
+                                ? "压力边界"
+                                : "压力边界"
+                            }}
+                          </template>
+                        </el-table-column>
+                        <!-- <el-table-column  width="50">
+                                                //         <template #default="scope">{{scope.row.type == massflow ? '流量边界' : scope.row.type ==	Pressure?'压力边界' }} </template>
+                                                //     </el-table-column> -->
+                        <el-table-column prop="flow" label="流量(m³/s)" width="80" />
+                        <el-table-column prop="pressure" label="压强(pa)" width="70" />
+                        <el-table-column prop="temperature" label="温度(℃)" />
+                        <el-table-column prop="polcon1" label="二氧化碳" width="95" />
+                        <el-table-column prop="polcon2" label="二氧化硫" width="95" />
+                      </el-table>
+                      <div class="asdis_btn">
+                        <div class="flex_a">
+                          <div
+                            class="btns"
+                            @click="
+                              bounadd();
+                              dialog.dialogVisible = true;
+                            "
+                          >
+                            <span class="spantext">添加</span>
+                          </div>
+                        </div>
+                        <div class="flex_a">
+                          <div class="btns" @click="xiugai()">
+                            <span class="spantext">修改</span>
+                          </div>
+                        </div>
+                        <div class="flex_a">
+                          <div class="btns" @click="xiudelete();">
+                            <span class="spantext">删除</span>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </el-collapse-item>
+          </el-collapse>
+        </div>
+      </el-aside>
+    </div>
     <!-- 添加 -->
     <el-dialog
       v-model="dialog.dialogVisible"
@@ -531,6 +623,7 @@ const dialog = ref({
 const boun = ref({
   collfire: false,
   collwater: false,
+  collGass:false,
 });
 // 节点选择
 const fireclick = () => {
@@ -711,19 +804,28 @@ const tableRowClassName = ({ row, rowIndex }) => {
 };
 // 弹出框
 const accident4 = (key) => {
-  if (key == "1"||key == "2") {
+  if (key == "1"||key == "2"||key == "3") {
     console.log(key);
     if (props.classradio == "Fire") {
       boun.value.collfire = true;
       boun.value.collwater = false;
+      boun.value.collGass = false;
     } else if (props.classradio == "Water") {
       boun.value.collwater = true;
       boun.value.collfire = false;
-    } else {
+      boun.value.collGass = false;
+    } else if(props.classradio =='Gass'){
+      boun.value.collwater = false;
+      boun.value.collfire = false;
+      boun.value.collGass = false;
+
+    }else{
+      
     }
   } else {
     boun.value.collfire = false;
     boun.value.collwater = false;
+    boun.value.collGass = false;
   }
 };
 onMounted(() => {});

+ 8 - 8
src/view/components/InfoDisaster.vue

@@ -256,12 +256,12 @@
     <!-- 瓦斯爆炸 -->
      <!--火灾左侧栏-->
      <div class="common-layout " style="margin: 0" v-show="sour.Gass">
-      <el-aside width="465px" class="L_aside L_aside1 asideg asidegbg leftbgimg1">
+      <el-aside width="320px" class="L_aside L_aside1 asideg asidegbg leftbgimg1">
         <div class="demo-collapse">
           <el-collapse v-model="coolactiveName1" accordion>
-            <el-collapse-item name="1">
+            <el-collapse-item name="1" class="imgneon">
               <template #title>
-                <el-icon class="iconimg Frame4" fit="contain"></el-icon>
+                <el-icon class="iconimg Frame3" fit="contain"></el-icon>
                 瓦斯<el-icon class="header-icon"> </el-icon>
               </template>
               <div class="asides_content">
@@ -341,7 +341,7 @@
                         <el-table-column prop="esite" label="结束位置" />>
                       </el-table>
                       <div class="asdis_btn">
-                        <div class="btnpading">
+                        <!-- <div class="btnpading"> -->
                         <div
                           class="flex_as"
                           @click="
@@ -364,7 +364,7 @@
                         <div class="flex_as" @click="sdialog.disDisasterwter = false">
                           <div class="btns"><span class="spantext" @click="Gassdialog.blast = false" >确定</span></div>
                         </div>
-                      </div>
+                      <!-- </div> -->
                       </div>
                     </div>
                   <!-- 积聚区 -->
@@ -405,7 +405,7 @@
                         <el-table-column prop="gasdensity" label="瓦斯浓度" />>
                       </el-table>
                       <div class="asdis_btn">
-                        <div class="btnpading">
+                        <!-- <div class="btnpading"> -->
                         <!-- <div
                           class="flex_as"
                           @click="
@@ -429,12 +429,12 @@
                         <div class="flex_as" @click="Gassdialog.gather= false">
                           <div class="btns"><span class="spantext">确定</span></div>
                         </div>
-                      </div>
+                      <!-- </div> -->
                       </div>
                     </div>
                   </div>
 
-                  <div style="height: 200px"></div>
+                  <!-- <div style="height: 200px"></div> -->
                 </div>
               </div>
             </el-collapse-item>

+ 1 - 1
src/view/components/Menudisaster.vue

@@ -77,7 +77,7 @@
                                                 <el-image v-if="scope.row.grade=='4'" style="height: 100%" :src="bt4" fit="contain"></el-image>
                                             </template>
                                             </el-table-column>
-                                            <el-table-column prop="temperature" label="二氧化碳浓度" />
+                                            <el-table-column prop="temperature" label="度" />
                                             <el-table-column prop="co2" label="co2" />
                                             <el-table-column prop="so2" label="so2" />
                                         </el-table>

+ 2 - 2
src/view/components/Menupath.vue

@@ -162,12 +162,12 @@
             </div>
         </template>
         <div class="demo-input-suffix firsttitle magintop">
-        <el-form-item label="巷道名称" :label-width="formLabelWidth6">
+        <el-form-item label="节点选择" :label-width="formLabelWidth6">
           <el-input
             v-model="selectstr"
             disabled
             class="w-50 m-2"
-            placeholder="巷道名称"
+            placeholder="节点选择"
           />
         </el-form-item>
         <div class="btn2">

+ 0 - 12
src/view/index/htmldialog.vue

@@ -74,18 +74,6 @@
       <div>
         <iframe :src="ifr" width="100%" height="630px" frameborder="0"></iframe>
       </div>
-      <!-- <div class="dialog-footer footer_div l_btn">
-        <div class="footerbtn flex1">
-          <div class="borderimg">
-            <el-button @click="iframeshow = false">取消</el-button>
-          </div>
-        </div>
-        <div class="footerbtn flex1">
-          <div class="borderimg">
-            <el-button @click="iframeshow = false"> 确定 </el-button>
-          </div>
-        </div>
-      </div> -->
     </el-dialog>
 </template>
 <script setup>