5.13

src/view/InfoDialoges.vue

@@ -142,7 +142,7 @@
                         <el-collapse-item name="1" class="imgneon1">
                             <template #title>
                           <el-icon class="iconimg imgneon Frame3"  fit="contain"></el-icon>
-                                火灾模拟参数
+                                模拟参数
                             </template>
                      
                             <div class="asides_content">
@@ -308,7 +308,7 @@
             </el-aside>
         </div>
         <!-- 瓦斯爆炸 -->
-        <div class="common-layout" style="margin: 0;" v-show="leftcoll.Gass">
+        <!-- <div class="common-layout" style="margin: 0;" v-show="leftcoll.Gass">
             <el-aside   width="2.125rem" class="L_aside L_aside1 asideg asidegbg  leftbgimg1">
                 <div class="demo-collapse">
                     <el-collapse v-model="coolactiveName" accordion>
@@ -373,7 +373,7 @@
                     </el-collapse>
                 </div>
             </el-aside>
-        </div>
+        </div> -->
     </div>
 </template>
 <!-- timestampToTime -->
@@ -658,20 +658,20 @@ const accident2 = (key) => {
         if (classradio.value== "Fire") {
             leftcoll.value.collfire = true;
             leftcoll.value.collwater = false;
-            leftcoll.value.Gass = false;
+            //  leftcoll.value.Gass = false;
         } else if (classradio.value== "Water") {
             leftcoll.value.collwater = true;
             leftcoll.value.collfire = false;
-            leftcoll.value.Gass = false;
+            // leftcoll.value.Gass = false;
         } else if(classradio.value== "Gass"){
-            leftcoll.value.Gass = true;
-            leftcoll.value.collfire = false;
+            // leftcoll.value.Gass = true;
+            leftcoll.value.collfire = true;
             leftcoll.value.collwater = false;
         }
     } else {
           leftcoll.value.collfire = false;
           leftcoll.value.collwater = false;
-          leftcoll.value.Gass = false;
+        //   leftcoll.value.Gass = false;
     }
 
 }

src/view/components/InfoBoundary.vue

@@ -62,24 +62,24 @@
                         <el-table-column prop="polcon2" label="二氧化硫" width="95" />
                       </el-table>
                       <div class="asdis_btn">
-                        <div class="flex_a">
-                          <div
-                            class="btns"
-                            @click="
+                        <div class="flex_a"   @click="
                               bounadd();
                               dialog.dialogVisible = true;
-                            "
+                            ">
+                          <div
+                            class="btns"
+                            :class="{tabactive: isActive === 1}" @click="changeClass(1)"
                           >
                             <span class="spantext">添加</span>
                           </div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns" @click="xiugai()">
+                        <div class="flex_a"  @click="xiugai()">
+                          <div class="btns"  :class="{tabactive: isActive === 2}" @click="changeClass(2)">
                             <span class="spantext">修改</span>
                           </div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns" @click="xiudelete();">
+                        <div class="flex_a" @click="xiudelete();">
+                          <div class="btns"  :class="{tabactive: isActive === 3}" @click="changeClass(3)">
                             <span class="spantext">删除</span>
                           </div>
                         </div>
@@ -216,24 +216,21 @@
                         <el-table-column prop="polcon2" label="二氧化硫" width="95" />
                       </el-table>
                       <div class="asdis_btn">
-                        <div class="flex_a">
+                        <div class="flex_a"   @click=" bounadd(); dialog.dialogVisible = true;">
                           <div
                             class="btns"
-                            @click="
-                              bounadd();
-                              dialog.dialogVisible = true;
-                            "
+                            :class="{tabactive: isActive === 1}" @click="changeClass(1)"
                           >
                             <span class="spantext">添加</span>
                           </div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns" @click="xiugai()">
+                        <div class="flex_a" @click="xiugai()">
+                          <div class="btns"  :class="{tabactive: isActive === 2}" @click="changeClass(2)">
                             <span class="spantext">修改</span>
                           </div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns" @click="xiudelete();">
+                        <div class="flex_a" @click="xiudelete();">
+                          <div class="btns"  :class="{tabactive: isActive === 3}" @click="changeClass(3)">
                             <span class="spantext">删除</span>
                           </div>
                         </div>
@@ -527,6 +524,7 @@ import selfdialogs from "./SetNode.vue";
 import { vtkmodel } from "@/control/vtkModel.js";
 let isActive=ref(0)
 const  changeClass= (i)=>  {
+  console.log(i);
  isActive.value = i;
 }
 const changeModel = () => {

src/view/components/InfoDisaster.vue

@@ -298,10 +298,10 @@
                             wanewadd();
                           "
                         >
-                          <div class="btns"><span class="spantext">添加</span></div>
+                          <div class="btns" :class="{tabactive: isActive === 4}" @click="changeClass(4)"><span class="spantext">添加</span></div>
                         </div>
                         <div class="flex_a" @click="wsxiugai()">
-                          <div class="btns"><span class="spantext">修改</span></div>
+                          <div class="btns" :class="{tabactive: isActive === 5}" @click="changeClass(5)"><span class="spantext">修改</span></div>
                         </div>
                         <div
                           class="flex_a"
@@ -309,7 +309,7 @@
                         
                           "
                         >
-                          <div class="btns"><span class="spantext">删除</span></div>
+                          <div class="btns" :class="{tabactive: isActive === 6}" @click="changeClass(6)"><span class="spantext">删除</span></div>
                         </div>
                       
                       </div>
@@ -449,6 +449,7 @@
       align-center
       :modal="false"
       :close-on-click-modal="false"
+      :append-to-body="true"
       draggable
       :fullscreen="false"
       :modal-append-to-body="false"
@@ -497,14 +498,13 @@
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
-            <el-button @click="Gassdialog.wsaddflie= false">取消</el-button>
+            <el-button @click="fileboolen('cancel');">取消</el-button>
           </div>
         </div>
         <div class="footerbtn flex1">
           <div class="borderimg">
             <el-button
-              @click=" Gassadd();
-                Gassdialog.wsaddflie= false;
+              @click="fileboolen('confirm');
               "
             >
               确定
@@ -520,6 +520,7 @@
       align-center
       :modal="false"
       :close-on-click-modal="false"
+      :append-to-body="true"
       draggable
       :fullscreen="false"
       :modal-append-to-body="false"
@@ -612,6 +613,7 @@
       align-center
       :modal="false"
       :close-on-click-modal="false"
+      :append-to-body="true"
       draggable
       :fullscreen="false"
       :modal-append-to-body="false"
@@ -1580,6 +1582,7 @@ console.log(params);
         message: res.returnMsg,
         type: "success",
       });
+      Gassdialog.value.wsaddflie= false;
       Gassgetdata(aid.value);
     })
     .catch((err) => {
@@ -1750,6 +1753,20 @@ const handleblastxg=(data)=>{
   wasi.value.blastdata=data;
   currentrow1.value=true;
 
+}
+//判断文件是否上传
+const fileboolen=(val)=>{
+  let msg=gfx.value.msg;
+  let msg2=inp.value.msg;
+  if(msg=="上传中"||msg2=="上传中"){
+    ElMessage.error("上传中不能关闭");
+  }else{
+    Gassdialog.value.wsaddflie=false;
+    if(val=='confirm'&&msg=="已上传"||val=='confirm'&&msg2=="已上传"){
+    Gassadd();
+  }
+  }
+ 
 }
 // 爆炸区域删除
 const wsblastdelete=()=>{

src/view/components/fileuploads.vue

@@ -52,6 +52,7 @@ let md5=ref('1212');
 let files=ref([]);
 let gfid=ref('');
 let bfid=ref('');
+let msg=ref();
 let nmllist=ref([]);
 let gridFileId=ref('');
 let boundaryFileId=ref('');
@@ -179,6 +180,7 @@ const  initWebUploader=()=>{
                 files.value.forEach(fileObj=>{
                     if(fileObj.id=file.id)
                     fileObj.msg='上传中';
+                    msg.value=fileObj.msg;
                     fileObj.percentage=prage;
                 })
             });
@@ -196,6 +198,7 @@ const  initWebUploader=()=>{
                    files.value.forEach((fileObj) => {
                         if ((fileObj.id = file.id)) {
                         fileObj.msg = "已上传";
+                        msg.value=fileObj.msg;
                        runupboolen.value=false;
                     
                         }
@@ -250,6 +253,8 @@ const  initWebUploader=()=>{
            files.value=files.value.filter(fileObj=>{
                 if( fileObj.id == fileId){
                        console.log(fileObj);
+                       fileObj.name=fileObj.name
+                       msg.value='';
                   uploader.value.removeFile(fileId);  
            
                 }
@@ -258,7 +263,7 @@ const  initWebUploader=()=>{
             })     
   
         }
-        defineExpose({gfid,bfid,initWebUploader,files});
+        defineExpose({gfid,bfid,initWebUploader,files,msg})
 </script>
 <style>
 .webuploader-container {
@@ -311,4 +316,7 @@ color: #fff;
     color: #fff;  
     padding-right: 10px;
 }
+.webuploader-container .el-icon{
+    color: #fff;
+}
 </style>