3.26瓦斯爆炸接口调试完成

src/view/InfoDialoges.vue

@@ -1877,7 +1877,7 @@ ol {
     margin: 0;
 }
 .tuiy{
-    z-index: 888;
+    z-index: 888 !important;
 }
 .tuiy .asideg .el-input__inner {
     font-size: 14px !important;

src/view/appmian.vue

@@ -62,7 +62,7 @@
           @childfun="childfun"
           @moxingclick="moxingclick"
         ></Dialoges>
-        <source-disaster ref="sourcedis" :classradio="classradio" :aid="aid" />
+        <source-disaster ref="sourcedis" :classradio="classradio"  />
         <info-boundary ref="boundary" :classradio="classradio" />
         <info-animation ref="tanimation" :classradio="classradio" :aid="aid" />
         <InfoVtkmodel ref="vtkmodel" />
@@ -429,6 +429,9 @@ const handleSelect = (key) => {
         line-height: 15px;
         font-weight: bold;
         line-height: 2;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
       .l_time {

src/view/components/InfoDisaster.vue

@@ -60,7 +60,7 @@
                         </div>
                       </div>
                     </div>
-                    <!--  -->
+                    <!--火灾灾害源表  -->
                     <div
                       class="xian tablefocus"
                       style="margin-top: 20px"
@@ -158,7 +158,7 @@
                             <el-button
                               size="small"
                               type="success"
-                              @click.stop="handledetection2(scope.$index, scope.row)"
+                              @click="handledetection2(scope.$index, scope.row)"
                               >查看</el-button
                             >
                           </template>
@@ -284,7 +284,7 @@
                             <el-button
                               size="small"
                               type="success"
-                              @click.stop="handlook(scope.$index, scope.row)"
+                              @click="handlook(scope.$index, scope.row)"
                               >查看</el-button
                             >
                           </template>
@@ -295,7 +295,6 @@
                           class="flex_a"
                           @click="
                             wanewadd();
-                            Gassdialog.wsaddflie= true;
                           "
                         >
                           <div class="btns"><span class="spantext">添加</span></div>
@@ -426,7 +425,7 @@
                         >
                           <div class="btns"><span class="spantext">删除</span></div>
                         </div> -->
-                        <div class="flex_as" @click="sdialog.gather = false">
+                        <div class="flex_as" @click="Gassdialog.gather= false">
                           <div class="btns"><span class="spantext">确定</span></div>
                         </div>
                       </div>
@@ -471,6 +470,7 @@
                       :gfname="gfname"
                       :name="'网格文件上传'"
                       @handfiles="handfiles"
+                      @Gassaddgfid="Gassaddgfid"
                       style="margin: 20px 0 0 0"
                     >
 
@@ -484,6 +484,7 @@
                       :upId="'2'"
                       :gfname="bfname"
                       @handfiles="handfiles"
+                      @Gassaddbfid="Gassaddbfid"
                       style="margin: 20px 0 0 0"
                     >
                   </vue-uploader>
@@ -993,7 +994,7 @@
         </div>
       </div>
     </el-dialog>
-    <!-- 瓦斯 -->
+    <!-- 瓦斯的删除 -->
     <el-dialog
       v-model="Gassdialog.wsdelete"
       width="400"
@@ -1053,6 +1054,7 @@ import { c } from "@kitware/vtk.js/macros2";
 import { vtkmodel } from "@/control/vtkModel.js";;
 import selfdialogs from "./SetPipe.vue";
 import vueUploader from "./fileuploads.vue";
+import { NULL } from "sass";
 // import filesload from "./filesloads.vue";
 
 
@@ -1092,9 +1094,9 @@ const props = defineProps({
   classradio: {
     type: String,
   },
-  aid: {
-    type: Number,
-  },
+  // aid: {
+  //   type: String,
+  // },
 });
 let fileurls=ref([]);
 let zaihai = ref({
@@ -1177,9 +1179,11 @@ const accident3 = (key) => {
     if (props.classradio == "Fire") {
       sour.value.collfire = true;
       sour.value.collwater = false;
+      sour.value.Gass = false;
     } else if (props.classradio == "Water") {
       sour.value.collwater = true;
       sour.value.collfire = false;
+      sour.value.Gass = false;
     }else if(props.classradio == "Gass"){
       sour.value.collwater = false;
       sour.value.collfire = false;
@@ -1284,6 +1288,7 @@ const shanchu = (val) => {
  ElMessage.error("你还没有选中删除的项目")
  } else {
     sdialog.value.dialogsgdelect = true;
+
     }
   }else {
     sdialog.value.dialogsgdelect = true;
@@ -1309,6 +1314,11 @@ const fundeledata2 = () => {
         message: "删除成功",
         type: "success",
       });
+      if(props.classradio == "Fire"){
+        sdialog.value.isDisasterfire=false;
+      }else{
+        sdialog.value.disDisasterwter=false;
+      }
       handledisaster(aid.value);
     })
     .catch((err) => {
@@ -1439,7 +1449,6 @@ const getinquire = () => {
       if (props.classradio == "Fire") {
         tableDatafir.value = res.rows;
       } else {
-      
         tableData4.value = res.rows;
       }
     })
@@ -1464,7 +1473,6 @@ const addjiancf = () => {
     };
     request(params)
       .then((res) => {
-        //console.log(res);
         ElMessage({
           message: res.returnMsg,
           type: "success",
@@ -1506,21 +1514,38 @@ const Gassgetdata=(aidval)=>{
 }
 // 瓦斯爆炸的添加
 const wanewadd=()=>{
+  Gassdialog.value.wsaddflie= true;
   zhtext.value = "添加";
  gfname.value="";
  bfname.value="";
+ currentrow.value=false;
+ tableobj.value={};
 
+ gfid.value='';
+ bfid.value='';
+ gid.value='';
+ nextTick(()=>{
+  gfx.value.files=[];
+ inp.value.files=[];
+ })
+
+
+}
+const Gassaddgfid=(gf)=>{
+  gfid.value=gf;
+}
+const Gassaddbfid=( bf)=>{
+  bfid.value=bf;
 }
 const Gassadd=()=>{
-  console.log( gfx.value);
   const params = {
     transCode: "D10021",
     gid:gid.value,
-    gfid:gfx.value.gfid,
-    bfid:inp.value.bfid,
+    gfid:gfid.value,
+    bfid:bfid.value,
     aid:aid.value
   };
-
+console.log(params);
   request(params)
     .then((res) => {
       ElMessage({
@@ -1549,10 +1574,17 @@ const wsxiugai= ()=>{
   zhtext.value = "修改";
   Gassdialog.value.wsaddflie= true;
   gid.value=tableobj.value.gid;
+  Gassaddgfid(tableobj.value.gfid);
+  Gassaddbfid(tableobj.value.bfid);
+  nextTick(()=>{
+  gfx.value.files=[];
+ inp.value.files=[];
+ })
 
-  
-  gfx.value.gfid=tableobj.value.gfid;
-  inp.value.bfid=tableobj.value.bfid;
+  // console.log( gfx.value);
+  // gfx.value.gfid=tableobj.value.gfid;
+ 
+  // inp.value.bfid=tableobj.value.bfid;
   // aid.value=tableobj.value
   }
 }
@@ -1570,7 +1602,9 @@ const wsdeledata=()=>{
   console.log(wsid.value)
   console.log(1111)
   if(wsid.value=='0'){
-    // wsdelete2();
+     wsdelete2();
+
+
   }if(wsid.value=='1'){
     wsblastdelete1();
   }
@@ -1590,6 +1624,8 @@ const wsdelete2=()=>{
         type: "success",
       });
       Gassdialog.value.wsdelete=false;
+      Gassdialog.value.blast=false;
+      Gassdialog.value.gather=false;
       Gassgetdata(aid.value);
     })
     .catch((err) => {
@@ -1804,7 +1840,6 @@ const zaiyuxiugaiapi = () => {
     val3: Disastersource.value.val3,
     val4: Disastersource.value.val4,
   };
-
   request(params)
     .then((res) => {
       ElMessage({

src/view/components/fileuploads.vue

@@ -36,7 +36,7 @@ import {
   Star,
 } from '@element-plus/icons-vue'
 const props = defineProps({ 
-         projectId: String,
+         projectId: Number,
         solverType: String,
         accept:String,
         upId:String,
@@ -44,6 +44,7 @@ const props = defineProps({
         namelist:Array,//文件名的集合
         gfname:String
  });
+ let emit = defineEmits(['Gassaddgfid', 'Gassaddbfid'])
 let runupboolen=ref(true);
 let uploader=ref(undefined);
 let fileName=ref(undefined);
@@ -58,11 +59,14 @@ let uuid=ref('');
 let nmlid=ref('');
 let hcfdBoundarys=ref([]);
 onMounted(() => {
-   getUUID()
- uuid.value= getUUID()
-    initWebUploader();
+    initup();
 
 });
+const initup=()=>{
+    getUUID()
+ uuid.value= getUUID()
+    initWebUploader();
+}
 const getUUID=()=> {
           return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
           
@@ -192,23 +196,16 @@ const  initWebUploader=()=>{
                    files.value.forEach((fileObj) => {
                         if ((fileObj.id = file.id)) {
                         fileObj.msg = "已上传";
-                        // v_this.$emit('upoK')
                        runupboolen.value=false;
-                        //    v_this.$nextTick(()=>{
-                        // v_this.$emit('runstatezt1', v_this.runupboolen);
-                            // })
+                    
                         }
                         if(file.ext=='x'){
                     gfid.value= response.bfid;
+                    emit("Gassaddgfid", gfid.value);
                 }else if(file.ext=='inp'){
                     bfid.value= response.bfid;
+                    emit("Gassaddbfid", bfid.value);
                 }
-                //         if (file.ext=='bdf') {
-                //         fembdf(response.bfid);
-                //         }else if(file.ext == "igs"||file.ext == "sat"||file.ext == "sab"||file.ext == ".x_t"
-                // ||file.ext == "x_b"||file.ext == "iges"||file.ext == "step"||file.ext == "stp"||file.ext == "stl"){
-                //           bindmesh(response.bfid,file.ext);  
-                //         }
                     });
                     })
                     .catch((err) => {});
@@ -247,7 +244,7 @@ const  initWebUploader=()=>{
             files.value=[];
         }
      const fileDel=(fileId)=>{
-         
+         console.log(fileId);
                   getUUID();
                    uuid.value= getUUID();
            files.value=files.value.filter(fileObj=>{
@@ -261,7 +258,7 @@ const  initWebUploader=()=>{
             })     
   
         }
-        defineExpose({gfid,bfid});
+        defineExpose({gfid,bfid,initWebUploader,files});
 </script>
 <style>
 .webuploader-container {