3.25

src/view/InfoDialoges.vue

@@ -97,7 +97,7 @@
                     <div class="ddd_div" style="display: flex;">
                         <div class="demo-input-suffix firsttitle magintop">
                             <el-form-item label="事故名称">
-                                <el-input v-model="formull.name" class="w-50 m-2" :placeholder="placeholder" />
+                                <el-input v-model="formull.name" class="w-50 m-2" maxlength="18"   :placeholder="placeholder" />
                             </el-form-item>
                             <div class="l_btn class_btn" style="width: auto;">
 

src/view/appmian.vue

@@ -36,7 +36,7 @@
             </div>
             <div v-else>
               <div class="ve_time" v-show="titlefalse" @click="titleclick()">
-                <span class="l_huoqing">{{ headerobj.name }}</span>
+                <span class="l_huoqing" >{{ headerobj.name }}</span>
                 <span class="l_time">{{ headerobj.time }}</span>
               </div>
             </div>
@@ -217,7 +217,12 @@ const aidlist = () => {
 };
 // 获取子组件的方法
 const childfun = () => {
-  sourcedis.value.handledisaster(aid.value);
+
+  if(classradio.value=='Gass'){
+    sourcedis.value.Gassgetdata(aid.value);
+  }else{
+    sourcedis.value.handledisaster(aid.value);
+  }
   boundary.value.addboundary(aid.value);
   sourcedis.value.accident3();
 };
@@ -399,14 +404,16 @@ const handleSelect = (key) => {
     display: flex;
 
     .ve_time {
+      width: 190px;
       height: 55px;
       padding-top: 15px;
       height: 70px;
+      overflow: hidden;
       border-radius: 0px 0px 0px 0px;
       border-left: 2px solid rgba(12, 97, 197, 0.2);
       border-right: 2px solid rgba(12, 97, 197, 0.2);
       box-sizing: border-box;
-      padding: 15px 22px;
+      padding: 15px 5px;
       // border-image: linear-gradient(347deg, rgba(31, 107, 255, 1), rgba(164, 195, 255, 1)) 1 1;
       span {
         display: block;

src/view/components/InfoDisaster.vue

@@ -268,23 +268,23 @@
                   <div class="jc_padding">
                     <div class="xian btncolor tablefocus">
                       <el-table
-                        :data="tableDatawat"
+                        :data="tableDataws"
                         style="width: 100%"
                         :row-class-name="tableRowClassName"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
-                        @row-click="handleDelete($event)"
+                        @row-click="handlews($event)"
                         max-height="350px"
                         :highlight-current-row="currentrow" 
                       >
-                        <el-table-column prop="pname" label="编号"  />
-                        <el-table-column prop="site" label="网格文件"  />
-                        <el-table-column prop="site" label="边界文件"  />
+                      <el-table-column type="index" label="序号" width="50" />
+                        <el-table-column prop="gfname" label="网格文件"  />
+                        <el-table-column prop="bfname" label="边界文件"  />
                         <el-table-column label="操作" >
                           <template #default="scope">
                             <el-button
                               size="small"
                               type="success"
-                              @click.stop="handledetection2(scope.$index, scope.row)"
+                              @click.stop="handlook(scope.$index, scope.row)"
                               >查看</el-button
                             >
                           </template>
@@ -294,39 +294,36 @@
                         <div
                           class="flex_a"
                           @click="
-                            newtable();
+                            wanewadd();
                             Gassdialog.wsaddflie= true;
                           "
                         >
                           <div class="btns"><span class="spantext">添加</span></div>
                         </div>
-                        <div class="flex_a" @click="xiugaitable()">
+                        <div class="flex_a" @click="wsxiugai()">
                           <div class="btns"><span class="spantext">修改</span></div>
                         </div>
                         <div
                           class="flex_a"
-                          @click="
-                            shanchu('1');
+                          @click="wsdelete()
                         
                           "
                         >
                           <div class="btns"><span class="spantext">删除</span></div>
                         </div>
-                        <div class="flex_a">
-                          <div class="btns"><span class="spantext">确定</span></div>
-                        </div>
+                      
                       </div>
                     </div>
                  
                <!-- 瓦斯爆炸区域 -->
                <div
                       class="xian tablefocus wstable"
-                     
+                     v-show="Gassdialog.blast"
                     >
                       <div class="header_l header_z">
                         <el-image :src="icon" fit="contain"></el-image>
                         <h4 class="tianjia">瓦斯爆炸区域</h4>
-                        <div class="closeimg" @click="sdialog.disDisasterwter = false">
+                        <div class="closeimg" @click="Gassdialog.blast = false">
                           <el-image :src="closeimg" fit="contain"></el-image>
                         </div>
                       </div>
@@ -336,37 +333,36 @@
                         :max-height="tableHeight"
                         :row-class-name="tableRowClassName"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
-                        @row-click="handleDelete3($event)"
+                        @row-click="handleblastxg($event)"
                         :highlight-current-row="currentrow1" 
                       >
-                        <el-table-column prop="name" label="巷道" />
-                        <el-table-column prop="seti" label="开始位置" />
-                        <el-table-column prop="seti" label="结束位置" />>
+                        <el-table-column prop="pname" label="巷道" />
+                        <el-table-column prop="ssite" label="开始位置" />
+                        <el-table-column prop="esite" label="结束位置" />>
                       </el-table>
                       <div class="asdis_btn">
                         <div class="btnpading">
                         <div
                           class="flex_as"
                           @click="
-                            wsadd();
-                            Gassdialog.wsaddarea= true;
+                            wsaddblast();
                           "
                         >
                           <div class="btns"><span class="spantext">添加</span></div>
                         </div>
-                        <div class="flex_as" @click="wsxiugai()">
+                        <div class="flex_as" @click="wsxiugai2()">
                           <div class="btns"><span class="spantext"> 修改</span></div>
                         </div>
                         <div
                           class="flex_as"
                           @click="
-                            shanchu('2');
+                           wsblastdelete();
                           "
                         >
                           <div class="btns"><span class="spantext">删除</span></div>
                         </div>
                         <div class="flex_as" @click="sdialog.disDisasterwter = false">
-                          <div class="btns"><span class="spantext">确定</span></div>
+                          <div class="btns"><span class="spantext" @click="Gassdialog.blast = false" >确定</span></div>
                         </div>
                       </div>
                       </div>
@@ -374,11 +370,12 @@
                   <!-- 积聚区 -->
                <div
                       class="xian tablefocus wstable"
+                      v-show="Gassdialog.gather"
                     >
                       <div class="header_l header_z">
                         <el-image :src="icon" fit="contain"></el-image>
                         <h4 class="tianjia">积聚区</h4>
-                        <div class="closeimg" @click="sdialog.disDisasterwter = false">
+                        <div class="closeimg" @click="Gassdialog.gather= false">
                           <el-image :src="closeimg" fit="contain"></el-image>
                         </div>
                       </div>
@@ -388,16 +385,28 @@
                         :max-height="tableHeight"
                         :row-class-name="tableRowClassName"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
-                        @row-click="handleDelete3($event)"
-                        :highlight-current-row="currentrow1" 
+                        @row-click="handlegather($event)"
+                        :highlight-current-row="currentrow2" 
                       >
                         <el-table-column prop="name" label="区域名" />
-                        <el-table-column prop="seti" label="类型" />
-                        <el-table-column prop="seti" label="瓦斯浓度" />>
+                       
+                        <el-table-column
+                          label="类型"
+                          prop="type"
+                          align="center"
+                          width="80px"
+                        >
+                          <template #default="scope">
+                            <span  v-if="scope.row.type === '0'">空白区</span>
+                            <span   v-else-if="scope.row.type === '1'">积聚区</span>
+                            <span  v-else>点火区</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="gasdensity" label="瓦斯浓度" />>
                       </el-table>
                       <div class="asdis_btn">
                         <div class="btnpading">
-                        <div
+                        <!-- <div
                           class="flex_as"
                           @click="
                             firinit();
@@ -405,19 +414,19 @@
                           "
                         >
                           <div class="btns"><span class="spantext">添加</span></div>
-                        </div>
-                        <div class="flex_as" @click="zaiyuxiugai()">
+                        </div> -->
+                        <div class="flex_as" @click="gatheruxiugai()">
                           <div class="btns"><span class="spantext"> 修改</span></div>
                         </div>
-                        <div
+                        <!-- <div
                           class="flex_as"
                           @click="
                             shanchu('2');
                           "
                         >
                           <div class="btns"><span class="spantext">删除</span></div>
-                        </div>
-                        <div class="flex_as" @click="sdialog.disDisasterwter = false">
+                        </div> -->
+                        <div class="flex_as" @click="sdialog.gather = false">
                           <div class="btns"><span class="spantext">确定</span></div>
                         </div>
                       </div>
@@ -454,11 +463,12 @@
       </template>
          <div class=" btncolor tablefocus">
                       <vue-uploader
-                      ref="bdf"
-                      :projectId="'81'"
+                      ref="gfx"
+                      :projectId="aid"
                       :solverType="'fem'"
-                      :accept="'.nml'"
+                      :accept="'.x'"
                       :upId="'1'"
+                      :gfname="gfname"
                       :name="'网格文件上传'"
                       @handfiles="handfiles"
                       style="margin: 20px 0 0 0"
@@ -466,12 +476,13 @@
 
                   </vue-uploader>
                   <vue-uploader
-                      ref="fem"
-                      :projectId="'5'"
+                      ref="inp"
+                      :projectId="aid"
                       :solverType="'fem'"
-                      :accept="'.ugrid'"
+                      :accept="'.inp'"
                       :name="'边界文件'"
                       :upId="'2'"
+                      :gfname="bfname"
                       @handfiles="handfiles"
                       style="margin: 20px 0 0 0"
                     >
@@ -490,8 +501,7 @@
         <div class="footerbtn flex1">
           <div class="borderimg">
             <el-button
-              @click="
-                handleEditfire();
+              @click=" Gassadd();
                 Gassdialog.wsaddflie= false;
               "
             >
@@ -550,7 +560,7 @@
       <div class="input">
         <el-form-item label="开始位置" :label-width="formLabelWidth5">
           <el-input-number
-            v-model="source.site"
+            v-model="wasi.ssite"
             :min="0"
             :max="1"
             :precision="2"
@@ -562,7 +572,7 @@
         </el-form-item>
         <el-form-item label="结束位置" :label-width="formLabelWidth5">
           <el-input-number
-            v-model="source.site"
+            v-model="wasi.esite"
             :min="0"
             :max="1"
             :precision="2"
@@ -583,8 +593,68 @@
           <div class="borderimg">
             <el-button
               @click="
-                handleEditfire();
-                Gassdialog.wsaddarea= false;
+               wsbalastadd();
+             
+              "
+            >
+              确定
+            </el-button>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 积聚的修改 -->
+    <el-dialog
+      v-model="Gassdialog.wsaddgather"
+      width="400"
+      align-center
+      :modal="false"
+      :close-on-click-modal="false"
+      draggable
+      :fullscreen="false"
+      :modal-append-to-body="false"
+      modal-class="summary-dlg"
+      class="dialog_class bgcolor tianjia"
+    >
+      <template #header="{ titleId, titleClass }">
+        <div class="my-header">
+          <el-image :src="icon" fit="contain"></el-image>
+          <h4 :id="titleId" :class="titleClass">{{zhtext}} </h4>
+        </div>
+      </template>
+      <el-form-item label="类型" :label-width="formLabelWidth2">
+                <el-select v-model="wasi.type" placeholder="请选择">
+                  <el-option
+                    v-for="item in wasi.options"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+      <div class="input">
+        <el-form-item label="瓦斯浓度" :label-width="formLabelWidth2">
+                <el-input
+                  v-model="wasi.gasdensity"
+                  class="w-50 m-2"
+                  placeholder="请输入"
+                  oninput ="value=value.replace(/[^0-9.]/g,'')" 
+                />
+              </el-form-item>
+       
+      </div>
+      <div class="dialog-footer footer_div l_btn">
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button @click="Gassdialog.wsaddgather= false">取消</el-button>
+          </div>
+        </div>
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button
+              @click="
+               wsgatheradd();
+             
               "
             >
               确定
@@ -781,7 +851,7 @@
               placeholder="请输入时间秒"
               maxlength="12"
               step="0.01"
-              oninput ="value=value.replace(/^|[^0-9]/g,'')" 
+              oninput ="value=value.replace(/[^0-9]/g,'')"
             />
           </el-form-item>
           <el-form-item label="温度℃" :label-width="formLabelWidth6">
@@ -923,6 +993,40 @@
         </div>
       </div>
     </el-dialog>
+    <!-- 瓦斯 -->
+    <el-dialog
+      v-model="Gassdialog.wsdelete"
+      width="400"
+      class="dialog_class bgcolor tianjia"
+    >
+      <template #header="{ titleId, titleClass }">
+        <div class="my-header">
+          <el-image :src="icon" fit="contain"></el-image>
+          <h4 :id="titleId" :class="titleClass">删除框</h4>
+        </div>
+      </template>
+      <h4 class="delecttitle">
+        是否确认删除 <span class="spanclad">{{ zqname }}</span>
+      </h4>
+      <div class="dialog-footer footer_div l_btn">
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button @click="Gassdialog.wsdelete = false">取消</el-button>
+          </div>
+        </div>
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button
+              @click="wsdeledata();
+                Gassdialog.wsdelete = false;
+              "
+            >
+              确定
+            </el-button>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
   <selfdialogs ref="dialogtrue" @Dtext="Dtext"></selfdialogs>
   <!-- <filesload
@@ -957,31 +1061,54 @@ const changeModel= ()=>  {
   vtkmodel.clearJgAddMode();
   vtkmodel.renderWindow.render();
 }
+const gfx=ref();
+const inp=ref();
+let gid=ref("");
+let wsid=ref("");
+let tableDataws=ref([]);
 let currentrow = ref(false);
 let currentrow1 = ref(false);
-let gtableData=ref([
-  {name:'1',seti:0.1}
-]);
-let gjtableData=ref([
-  {name:'1',seti:0.1}
-]);
+let currentrow2 = ref(false);
+let formLabelWidth2=ref(80);
+let wasi=ref({
+  ssite:0.0,
+  esite:0.0,
+  gbid:Number,
+  pid:Number,
+  gdname:'',
+  pid:Number,
+  gid:Number,
+  blastdata:{},
+  gatherdata:{},
+  options:[{ name:"空白区" ,value:'0'},{ name:"积聚区" ,value:'1'},{ name:"点火区" ,value:'2'}],
+  type:'0',
+  gasdensity:0,
+})
+let gtableData=ref([]);
+let gjtableData=ref([]);
 const props = defineProps({
   classradio: {
     type: String,
   },
   aid: {
-    type: String,
+    type: Number,
   },
 });
 let fileurls=ref([]);
 let zaihai = ref({
   addEied: "",
 });
+let gfname=ref("");
+let bfname=ref("");
 let dialogtrue = ref();
 let zhtext = ref("");
 const Gassdialog=ref({
   wsaddflie:false,
   wsaddarea:false,
+  wsdelete:false,
+  blast:false,
+  gather:false,
+  wsaddgather:false,
 })
 const sdialog = ref({
   adddialog: false,
@@ -1026,6 +1153,7 @@ let Disastersource = ref({
   val4:Number,
 });
 let tableobj = ref({});
+
 const tableData2 = ref([]);
 let aid = ref();
 let biaoid = ref();
@@ -1154,21 +1282,19 @@ const shanchu = (val) => {
  ElMessage.error("你还没有选中删除的项目")
  } else {
     sdialog.value.dialogsgdelect = true;
- 
     }
   }else {
-    console.log(11111)
-   
     sdialog.value.dialogsgdelect = true;
   }
 };
 const fundeledata = () => {
   if (biaoid.value == "1") {
     fundeledata2();
-  } else {
+  } else{
     fundeledata3();
   }
 };
+// 
 const fundeledata2 = () => {
   const params = {
     transCode: "D000011",
@@ -1360,14 +1486,288 @@ const firinit = () => {
   Disastersource.value.val4 = "";
   zhtext.value = "添加";
 };
-// 瓦斯爆炸
-const wsadd = () => {
+//瓦斯爆炸查询
+const Gassgetdata=(aidval)=>{
+  aid.value=aidval;
+  const params = {
+    transCode: "D10020",
+    aid:aid.value
+  };
+
+  request(params)
+    .then((res) => {
+      tableDataws.value=res.rows;
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+}
+// 瓦斯爆炸的添加
+const wanewadd=()=>{
   zhtext.value = "添加";
-};
-//瓦斯的修改
-const wsxiugai=()=>{
+ gfname.value="";
+ bfname.value="";
+
+}
+const Gassadd=()=>{
+  const params = {
+    transCode: "D10021",
+    gid:gid.value,
+    gfid:gfx.value.gfid,
+    bfid:inp.value.bfid,
+    aid:aid.value
+  };
+
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: res.returnMsg,
+        type: "success",
+      });
+      Gassgetdata(aid.value);
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+}
+// 瓦斯选中一行
+const handlews=(row)=>{
+  currentrow.value=true;
+  tableobj.value=row;
+  gfname.value= tableobj.value.gfname
+  bfname.value= tableobj.value.bfname
+
+}
+// 瓦斯的修改
+const wsxiugai= ()=>{
+  // if (JSON.stringify(tableobj.value) == "{}") {
+  //   ElMessage.error("你还没有选中修改的项目");
+  // } else {
+  // zhtext.value = "修改";
+  // console.log(tableobj.value);
+  // Gassdialog.value.wsaddflie= true;
+  // gid.value=tableobj.value.gid;
+  // gfx.value.gfid=tableobj.value.gfid;
+  // inp.value.bfid=tableobj.value.bfid;
+  // // aid.value=tableobj.value
+  // }
+}
+// 瓦斯删除
+const wsdelete=()=>{
+  wsid.value='0'
+  if (JSON.stringify(tableobj.value) == "{}") {
+ ElMessage.error("你还没有选中删除的项目")
+ } else {
+      zqname.value= tableobj.value.bfname+"-"+ tableobj.value.gfname;
+      Gassdialog.value.wsdelete=true;
+ }
+}
+const wsdeledata=()=>{
+  console.log(wsid.value)
+  console.log(1111)
+  if(wsid.value=='0'){
+    // wsdelete2();
+  }if(wsid.value=='1'){
+    wsblastdelete1();
+  }
+
+}
+// 瓦斯删除
+const wsdelete2=()=>{
+  const params = {
+    transCode: "D10022",
+    gid:tableobj.value.gid
+  };
+
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: res.returnMsg,
+        type: "success",
+      });
+      Gassdialog.value.wsdelete=false;
+      Gassgetdata(aid.value);
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+}
+//瓦斯的查看
+const handlook=(index,data)=>{
+  console.log(data);
+  Gassdialog.value.blast =true;
+  Gassdialog.value.gather =true;
+  wasi.value.gid=data.gid;
+  wsblastget();
+  gatherget();
+
+}
+// // 瓦斯爆炸区域查询
+const wsblastget=()=>{
+  const params = {
+    transCode: "D10023",
+    gid: wasi.value.gid,
+
+  };
+  request(params)
+    .then((res) => {
+      gtableData.value=res.rows;
+  
+    
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+}
+// 瓦斯爆炸区域的添加
+const wsaddblast=()=>{
+  zhtext.value='添加';
+  wasi.value.ssite=0.0;
+  wasi.value.esite=0.0;
+  wasi.value.gbid=0;
+  wasi.value.pid='';
+  selectstr.value = "";
+  firepid.value = "";
+  Gassdialog.value.wsaddarea= true;
+  currentrow1.value=false;
+  wasi.value.blastdata={};
+}
+const wsbalastadd=()=>{
+  wasi.value.pid=firepid.value;
+  if( wasi.value.ssite<wasi.value.esite){
+  const params = {
+    transCode: "D10024",
+    gid: wasi.value.gid,
+    pid: wasi.value.pid,
+    ssite:wasi.value.ssite,
+    esite: wasi.value.esite,
+    gbid:wasi.value.gbid,
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: res.returnMsg,
+        type: "success",
+      });
+      Gassdialog.value.wsaddarea= false;
+      wsblastget();
+    
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+       
+  }else{
+    ElMessage.error("结束位置大于开始位置");
+  }
+}
+// 爆炸区域的修改
+
+const wsxiugai2=()=>{
+  if (JSON.stringify(wasi.value.blastdata) == "{}") {
+    ElMessage.error("你还没有选中修改的项目");
+
+}else{
+  zhtext.value='修改';
+  wasi.value.ssite=wasi.value.blastdata.ssite;
+  wasi.value.esite=wasi.value.blastdata.esite;
+  wasi.value.gbid=wasi.value.blastdata.gbid;
+  wasi.value.pid=wasi.value.blastdata.pid;
+  selectstr.value =wasi.value.blastdata.pname;
+  firepid.value =wasi.value.blastdata.pid;
   Gassdialog.value.wsaddarea= true;
+}
+}
+const handleblastxg=(data)=>{
+  wasi.value.blastdata=data;
+  currentrow1.value=true;
+
+}
+// 爆炸区域删除
+const wsblastdelete=()=>{
+  if (JSON.stringify(wasi.value.blastdata) == "{}") {
+    ElMessage.error("你还没有选中修改的项目");
+
+}else{
+  wsid.value='1';
+  zqname.value= wasi.value.blastdata.pname;
+ Gassdialog.value.wsdelete=true;
+}
+}
+const wsblastdelete1=()=>{
+
+  const params = {
+    transCode: "D10025",
+    gbid:wasi.value.blastdata.gbid,
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message:"删除成功",
+        type: "success",
+      });
+      Gassdialog.value.wsaddarea= false;
+      wsblastget();
+    
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    })   
+  }
+  // 积聚
+  const  gatherget = () => {
+    const params = {
+    transCode: "D10026",
+    gid:wasi.value.gid,
+  };
+  request(params)
+    .then((res) => {
+      gjtableData.value=res.rows;
+    
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    })  
+  }
+  // 积聚的选中
+  
+  const  handlegather = (data) => {
+    console.log(data);
+    currentrow2.value=true;
+   wasi.value.gatherdata=data;
+  }
+// 积聚的修改
+const  gatheruxiugai = () => {
   zhtext.value = "修改";
+
+  if (JSON.stringify(wasi.value.gatherdata) == "{}") {
+    ElMessage.error("你还没有选中修改的项目");
+  } else {
+    Gassdialog.value.wsaddgather=true;
+    wasi.value.gasdensity=wasi.value.gatherdata.gasdensity;
+    wasi.value.type=wasi.value.gatherdata.type;
+  }
+}
+// 
+const wsgatheradd=()=>{
+  const params = {
+    transCode: "D10027",
+    type:wasi.value.type,
+    gasdensity:wasi.value.gasdensity,
+    ggid:wasi.value.gatherdata.ggid,
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: res.returnMsg,
+        type: "success",
+      });
+      Gassdialog.value.wsaddgather=false;
+      gatherget()
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    })  
 }
 // 灾害源检测的修改
 const zaiyuxiugai = () => {
@@ -1477,7 +1877,7 @@ const handfiles = (file) => {
 onMounted(() => {
   
 });
-defineExpose({ sour, accident3, handledisaster,changeModel });
+defineExpose({ sour, accident3, handledisaster,changeModel,Gassgetdata});
 </script>
 
 <style lang="scss" scoped>

src/view/components/MenuMine.vue

@@ -142,7 +142,7 @@
 
                 <el-form>
                     <el-form-item label="名称" :label-width="formLabelWidth6">
-                        <el-input v-model="nodeobj.name"    maxlength="18" class="w-50 m-2" placeholder="请输入" />
+                        <el-input v-model="nodeobj.name"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
                     </el-form-item>
                     <el-form-item label="X" :label-width="formLabelWidth6">
                         <el-input v-model="nodeobj.x"  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
@@ -422,17 +422,17 @@ const addsg = () => {
 }
 //节点添加api
 const nodeconfirm = () => {
-    if(nodeobj.value.name==null){
+    if(nodeobj.value.name==null||nodeobj.value.name==''){
     ElMessage.error('名称不能为空')
            
-    }else if(nodeobj.value.x==null){
+    }else if(nodeobj.value.x==null||nodeobj.value.x==''){
         ElMessage.error('X不能为空')
-    }else if(nodeobj.value.y==null){
+    }else if(nodeobj.value.y==null||nodeobj.value.y==''){
         ElMessage.error('Y不能为空')
-    }else if(nodeobj.value.z==null){
+    }else if(nodeobj.value.z==null||nodeobj.value.z==''){
         ElMessage.error("Z不能为空")
-    } else{
-    
+    } else if(nodeobj.value.name!=''&&nodeobj.value.x!=''&&nodeobj.value.y!=''&&nodeobj.value.z!=''){
+   
     const params = {
         transCode: 'D10000',
         nid: nodeobj.value.nid,
@@ -456,7 +456,10 @@ const nodeconfirm = () => {
         .catch((err) => {
             ElMessage.error(err.returnMsg)
         })
+    }else{
+        ElMessage.error("不能为空")
     }
+
 }
 //选中node节点的一行
 const handleDelete = (val) => {

src/view/components/fileuploads.vue

@@ -5,6 +5,7 @@
                     <!-- <el-col :span="6"> {{name}}  </el-col>                   
                     <el-col :span="6"> <div :id="'picker'+upId" class="text_color" >选择文件</div>  </el-col> -->
                     <!-- <el-button :id="'picker'+upId"> {{name}} </el-button> -->
+                    <div class="btntext upname wenjian" > {{ gfname}}</div>
                     <div class="btntext upname" :id="'picker'+upId">{{name}}</div>
                 </el-row>
 
@@ -41,12 +42,15 @@ const props = defineProps({
         upId:String,
         name:String,
         namelist:Array,//文件名的集合
+        gfname:String
  });
 let runupboolen=ref(true);
 let uploader=ref(undefined);
 let fileName=ref(undefined);
 let md5=ref('1212');
 let files=ref([]);
+let gfid=ref('');
+let bfid=ref('');
 let nmllist=ref([]);
 let gridFileId=ref('');
 let boundaryFileId=ref('');
@@ -113,7 +117,9 @@ const  initWebUploader=()=>{
                 console.log(2222);
                fileName.value=file.name;
              console.log(fileName.value);
-                const fax=fileName.value.slice(-4) 
+                // const fax=fileName.value.slice(-4) 
+                const fax = fileName.value.split(".")[1];
+                console.log(fax)
                 if(props.accept.indexOf(fax)<0){//判断上传支持文件类型
                     uploader.value.reset();
                     ElMessage.error("只支持" +props.accept+"格式文件!");
@@ -166,15 +172,11 @@ const  initWebUploader=()=>{
            // 文件上传过程中创建进度条实时显示。
            uploader.value.on( 'uploadProgress', ( file, percentage ) =>{
                 let prage= Math.floor(percentage*100);
-                // v_this.$emit('childFn',{name:v_this.name,percentage:prage})
                 files.value.forEach(fileObj=>{
                     if(fileObj.id=file.id)
                     fileObj.msg='上传中';
                     fileObj.percentage=prage;
                 })
-                //    v_this.$nextTick(()=>{
-                // v_this.$emit('runstatezt1', v_this.runupboolen);
-                //     })
             });
             uploader.value.on( 'uploadSuccess', ( file ,response) =>{
                 console.log(file.ext);
@@ -192,16 +194,21 @@ const  initWebUploader=()=>{
                         fileObj.msg = "已上传";
                         // v_this.$emit('upoK')
                        runupboolen.value=false;
-                           v_this.$nextTick(()=>{
+                        //    v_this.$nextTick(()=>{
                         // v_this.$emit('runstatezt1', v_this.runupboolen);
-                            })
-                        }
-                        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);  
+                            // })
                         }
+                        if(file.ext=='x'){
+                    gfid.value= response.bfid;
+                }else if(file.ext=='inp'){
+                    bfid.value= response.bfid;
+                }
+                //         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) => {});
@@ -254,7 +261,7 @@ const  initWebUploader=()=>{
             })     
   
         }
-
+        defineExpose({gfid,bfid});
 </script>
 <style>
 .webuploader-container {
@@ -303,4 +310,8 @@ color: #fff;
 .disflex .el-icon{
     font-size: 20px;
 }
+.wenjian{
+    color: #fff;  
+    padding-right: 10px;
+}
 </style>