liuqiao 8 months ago
parent
commit
a84bae1b25

BIN
src/assets/img/Group1392.png


BIN
src/assets/img/Group1394.png


BIN
src/assets/img/Group1400.png


+ 21 - 13
src/style/style.css

@@ -335,8 +335,9 @@ color: #fff;
     padding: 0px 10px 0 0;
   }
   .header_l h4 {
+    font-family: 'YouShe';
     font-weight: bold;
-    font-size: 0.0625rem;
+    font-size: .0729rem;
     color: #fff;
     line-height: 14px;
     text-align: left;
@@ -1629,6 +1630,11 @@ z-index: 1;
 .timers .logimg span{
   font-family: 'YouShe';
   margin-top: 6px;
+  display: block;
+    width: 102px;
+    height: 40px;
+    line-height: 1.2;
+
 }
 .headertime{
   position: absolute;
@@ -1685,7 +1691,7 @@ height:60px;
 .bgk1 .imgtupian2{
   font-family: 'YouShe';
   font-size: .0938rem;
-width: .8523rem; 
+width: .9375rem; 
   /* background-image: url(/src/assets/img/Rectangle1456.png); */
   background-image: url(/src/assets/img/Rectangle456.png);
   background-size: 100% 100% !important;
@@ -1826,26 +1832,29 @@ font-size: .0833rem;
  
 }
 .zongji{
-  padding:0 .0781rem .0781rem .0781rem ;
+  padding:0 .0781rem 0 .0781rem ;
   display: flex;
   justify-content: space-between;
   position: relative;
 }
 .zongjili{
-  width: .4271rem;
-  height: .2708rem;
-  line-height: .3542rem;
+  /* width: .4271rem;
+  height: .2708rem; */
+  width: .6615rem;
+  height: .5313rem;
+  line-height: .3646rem;
+  /* line-height: .3542rem; */
   font-size:0.0833rem;
   color: #fff;
   position: relative;
-  padding: 0 0.0925rem;
+  padding: 0 .2083rem;
   text-align: left;
   font-weight: bold;
 
 }
 .zongjili span{
   position: absolute;
-  right: 5px;
+  right: 18px;
 
 }
 .img1{
@@ -2097,20 +2106,19 @@ background-color: #52C6FF  !important;
   margin-top: 20px;
 }
 .zongji .img4{
+  flex: 1;
   line-height: 1.5;
     font-size: 10px;
-    width: 85px;
-    height: 60px;
     padding-top: 3px;
+    margin: 10px 0px 0 10px;
 
 }
 .zongji .img3{
     font-size: 18px;
-    width: 85px;
-    height: 60px;
     line-height: 66px;
     padding-top: 0.0310rem;
-
+    flex: 1;
+    margin: 10px 10px 0 0;
 }
 .zongji .jcshijian{
   line-height: 1.1;

+ 15 - 5
src/view/InfoDialoges.vue

@@ -34,7 +34,7 @@
             </template>
         </el-dialog>
         <!--火灾 事故列表 -->
-        <el-dialog v-model="dialog.dialogVisible_fire" width="600"  @close="handleClose" :modal="false" :close-on-click-modal="false"
+        <el-dialog v-model="dialog.dialogVisible_fire" width="700"  @close="handleClose" :modal="false" :close-on-click-modal="false"
             draggable class="dialog_class bgcolor tablefocus shigutable">
 
             <template #header="{ titleId, titleClass }">
@@ -61,7 +61,7 @@
                     <el-table-column type="index" label="序号" width="70" />
                     <el-table-column prop="name" label="名称" />
                     <el-table-column prop="name" label="来源" />
-                    <el-table-column prop="time" label="时间"  />
+                    <el-table-column prop="time" label="时间" width="150" />
                 </el-table>
                 <div class="demo-pagination-block pagination">
                     <el-config-provider :locale="zhCn">
@@ -110,7 +110,7 @@
                         
 
                             <el-form-item label="事故名称">
-                                <el-input v-model="formull.name"   class="w-50 m-2"   maxlength="18"   :placeholder="placeholder" />
+                                <el-input v-model="formull.name"   class="w-50 m-2"   maxlength="15"   :placeholder="placeholder" />
                             </el-form-item>
                    
                             <div class="l_btn class_btn" style="width: auto;">
@@ -839,7 +839,18 @@ const getdata = () => {
     request(params)
         .then((res) => {
             loading.value = false;
-            tableData.value = res.rows;
+            tableData.value=res.rows.map(item=>{
+             if(item.hasOwnProperty('time')){
+                return{
+                    ...item,
+                    time:item.time.replace(/[+].*/, '')
+                }
+             }else{
+                return{
+                    ...item,
+                }
+            }
+        })
             total.value = res.total;
 
         })
@@ -959,7 +970,6 @@ const addinitial=()=>{
         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);

+ 425 - 49
src/view/components/Fengmen.vue

@@ -30,16 +30,26 @@
                         <template v-slot:empty>
                           <p>暂无数据</p>
                           </template>
-                          <el-table-column prop="nname" label="风机名称" />
+                          <el-table-column prop="fanname" label="风机名称" />
                           <el-table-column prop="pname" label="选择巷道" />
                         <el-table-column prop="site" label="相对位置" />
-                        <el-table-column prop="site" >
+                        <el-table-column prop="pa" >
                             <template v-slot:header>
                             <span >增压</span><br>
                             <span >(kpa)</span>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="site" label="开启状态" />
+                          <el-table-column prop="onoff" label="开启状态">
+                          <template #default="scope">
+                            {{
+                              scope.row.onoff == "0"
+                                ? "否"
+                                : scope.row.onoff == "1"
+                                ? "是"
+                                : "是"
+                            }}
+                          </template>
+                        </el-table-column>
                         </el-table>
                         <div class="asdis_btn">
                           <div class="flex_a" >
@@ -51,12 +61,12 @@
                             </div>
                           </div>
                           <div class="flex_a" >
-                            <div class="btns">
+                            <div class="btns" @click="xiugaiclick()">
                               <span class="spantext">修改</span>
                             </div>
                           </div>
                           <div class="flex_a">
-                            <div class="btns"  >
+                            <div class="btns" @click="delonclock('风机')" >
                               <span class="spantext">删除</span>
                             </div>
                           </div>
@@ -83,33 +93,43 @@
                           :max-height="tableHeight"
                           :highlight-current-row="currentrow"
                           :row-class-name="tableRowClassName"
-                          @row-click="handlerow($event)"
+                          @row-click="handlerow2($event)"
                           :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
                         >
                         <template v-slot:empty>
                           <p>暂无数据</p>
                           </template>
-                          <el-table-column prop="nname" label="风机名称" />
+                          <el-table-column prop="doorname" label="风门名称" />
                           <el-table-column prop="pname" label="选择巷道" />
                         <el-table-column prop="site" label="相对位置" />
-                        <el-table-column prop="site" label="阻力系数" />
-                        <el-table-column prop="site" label=" 开启状态" />
+                        <el-table-column prop="dragcoe" label="阻力系数" />
+                        <el-table-column prop="onoff" label="开启状态">
+                          <template #default="scope">
+                            {{
+                              scope.row.onoff == 0
+                                ? "否"
+                                : scope.row.onoff == 1
+                                ? "是"
+                                : "是"
+                            }}
+                          </template>
+                        </el-table-column>
                         </el-table>
                         <div class="asdis_btn">
                           <div class="flex_a" >
                             <div
-                              class="btns"
+                              class="btns"   @click="fmadd();sdialog.fmdialog=true"
                             >
                               <span class="spantext">添加</span>
                             </div>
                           </div>
                           <div class="flex_a" >
-                            <div class="btns">
+                            <div class="btns" @click="fmxiugai()">
                               <span class="spantext">修改</span>
                             </div>
                           </div>
                           <div class="flex_a">
-                            <div class="btns"  >
+                            <div class="btns" @click="fmdel('风门')" >
                               <span class="spantext">删除</span>
                             </div>
                           </div>
@@ -206,7 +226,7 @@
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
-            <el-button @click="closeDialog(); sdialog.fjdialog">取消</el-button>
+            <el-button @click="closeDialog(); sdialog.fjdialog=false">取消</el-button>
           </div>
         </div>
         <div class="footerbtn flex1">
@@ -219,6 +239,103 @@
           </div>
         </div>
       </div>
+    </el-dialog>
+    <!-- 风门的添加 -->
+<el-dialog
+      v-model="sdialog.fmdialog"
+      width="400"
+      align-center
+      :modal="false"
+      :append-to-body="true"
+      :z-index='1000'
+      :close-on-click-modal="false"
+      :fullscreen="false"
+      :modal-append-to-body="false"
+      modal-class="summary-dlg"
+      class="dialog_class bgcolor tianjia"
+      draggable
+      @close='closeDialog'
+    >
+      <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 >
+      <el-form-item label="风门名称" :label-width="formLabelWidth6">
+            <el-input v-model="fmobj.doorname"  maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+        </el-form-item>
+      <div class="demo-input-suffix firsttitle magintop">
+        <el-form-item label="巷道名称" :label-width="formLabelWidth6">
+          <el-input
+            v-model="source.selectstr"
+            disabled
+            class="w-50 m-2"
+            placeholder="巷道名称"
+          />
+        </el-form-item>
+        <div class="btn2">
+          <el-button
+            type="primary"
+            @click="
+              fireclick();
+              sdialog.dialogVisiblenode = true;
+            "
+            >选择巷道</el-button
+          >
+        </div>
+        <div class="btn2" style="padding-left: 10px">
+          <el-button type="primary" @click="Dclick()">3D巷道选择</el-button>
+        </div>
+      </div>
+      <div class="input">
+        <el-form-item label="位置" :label-width="formLabelWidth6">
+          <el-input-number
+            v-model="source.site"
+            :min="0"
+            :max="1"
+            :precision="2"
+            :step="0.1"
+            controls-position="right"
+            class="w-50 m-2"
+            placeholder="位置"
+            @change="inputnuberChange"
+          />
+        </el-form-item>
+      </div>
+      <div style="display: flex;" >
+                  <span class="switchppm">开启状态</span>
+                <el-switch 
+                v-model="fmobj.onoff"
+                inline-prompt
+                active-text="是"
+                inactive-text="否"
+                :active-value="1"
+                :inactive-value="0"
+                @change="handleSwitchChange"
+              />
+            </div>
+      <el-form-item label="阻力系数" :label-width="formLabelWidth6">
+            <el-input v-model="fmobj.dragcoe"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2"  placeholder="请输入" />
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer footer_div l_btn">
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button @click="closeDialog(); sdialog.fmdialog=false">取消</el-button>
+          </div>
+        </div>
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button
+              @click="addxiufm(); "
+            >
+              确定
+            </el-button>
+          </div>
+        </div>
+      </div>
     </el-dialog>
       <!-- 选择巷道 -->
       <pipelines ref="pipeline" :selectstr="source.selectstr" @pipelineapi="pipelineapi" />
@@ -239,14 +356,32 @@
           是否确认删除 <span class="spanclad">{{ zqname }}</span>
         </h4>
         <div class="dialog-footer footer_div l_btn">
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button @click="sdialog.dialogsgdelect=false">取消</el-button>
+          </div>
+        </div>
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button
+              @click="deletefun(); "
+            >
+              确定
+            </el-button>
+          </div>
+        </div>
+      </div>
+        <!-- <div class="dialog-footer footer_div l_btn">
           <div class="footerbtn flex1">
             <div class="borderimg">
-              <el-button>取消</el-button>
+              <el-button @click="sdialog.dialogsgdelect=false">取消</el-button>
+              <el-button @click="deletefun()">确定</el-button>
             </div>
           </div>
        
-        </div>
+        </div> -->
       </el-dialog>
+      <selfdialogs ref="dialogtrue" :site="dsite"  @Dtext="Dtext"></selfdialogs>
     </div>
   </template>
   <script setup>
@@ -257,24 +392,31 @@
   import { ElMessage, ElButton, ElDialog,ElConfigProvider } from "element-plus";
   import zhCn from 'element-plus/es/locale/lang/zh-cn'
   import { Calendar, Search } from "@element-plus/icons-vue";
-  import selfdialogs from "./SetNode.vue";
+  // import selfdialogs from "./SetNode.vue";
+  import selfdialogs from "./SetPipe.vue";
   import pipelines from "./PipeIine.vue"
   import { vtkmodel } from "@/control/vtkModel.js";
   let zqname=ref();
-  let tableHeight=ref(200)
+  let tableHeight=ref(200);
+  let dsite=ref();
   let currentrow=ref();
   let pipeline = ref();
+  let dialogtrue = ref();
   let sdialog=ref({
     dialogsgdelect:false,
     dialogVisiblenode:false,
     fjdialog:false,
     fmdialog:false,
   })
+  let delte=ref();
+  let state=ref();
   let formLabelWidth6=ref(120)
   let source = ref({
     selectstr: '',
-    site: ''
+    site:null
 })
+// let selectstr=ref();
+// let firepid=ref();
 let aid=ref()//事故id
   let pid=ref();// 巷道id
   let site=ref();
@@ -284,6 +426,14 @@ let aid=ref()//事故id
     pa:null,
     onoff:0
 })
+let handobj=ref({});
+let fmobj=ref({
+  doorid:null,
+  doorname:"",
+  dragcoe:null,
+  onoff:0
+})
+let handobjfm=ref({});
 const props = defineProps({
     aid: {
     type: String,
@@ -295,7 +445,13 @@ const props = defineProps({
   let fjtableData=ref([]);
   let fmtableData=ref([]);
   const handlerow = (val) => {
-  console.log(val);
+    currentrow.value=true; 
+    handobj.value=val;
+    console.log(val);
+};
+const handlerow2 = (val) => {
+    currentrow.value=true; 
+    handobjfm.value=val;
 };
 let coolactiveName1 = ref(["1", "2"]);
 // 表格变色
@@ -305,6 +461,14 @@ const tableRowClassName = ({ row, rowIndex }) => {
   }
   return "oddRow";
 };
+// 3D弹屏
+const Dclick = () => {
+  dialogtrue.value.dialoglog = true;
+  // vtkmodel.clearJgAddMode() ;
+  // vtkmodel.selectPipes();
+  // dialogtrue.value.jgSelect();
+  console.log(dialogtrue.value.dialoglog);
+};
 // 选择巷道
 const fireclick = () => {
     pipeline.value.searchtaggd='';
@@ -312,6 +476,17 @@ const fireclick = () => {
     pipeline.value.pipelinedata('');
   
 }
+const closeDialog=()=>{
+state.value=sessionStorage.getItem("state");
+  if(state.value=='1'){
+    vtkmodel.clearModeAddJg();
+  }else{
+    vtkmodel.selectNoting();
+  }//节点图形
+  vtkmodel.clearpipsite();//清除选择巷道的位置
+  dialogtrue.value.timintclaer();
+  sdialog.value.fjdialog=false
+}
 //点击确定
 const pipelineapi = (row) => {
     console.log(row);
@@ -321,21 +496,112 @@ const pipelineapi = (row) => {
 //风机的添加
 const fjclick=()=>{
     zhtext.value='添加';
+    currentrow.value=false;
     tishi.value= zhtext.value;
+    handobj.value={};
+    fjobj.value.fanid='';
+    fjobj.value.fanname='';
+    fjobj.value.onoff='';
+    fjobj.value.pa='';
+    source.value.site='';
+    source.value.selectstr='';
+    pid.value='';
+    source.value.site=='';
+    vtkmodel.clearJgAddMode() ;
+  vtkmodel.selectPipes();
+  dialogtrue.value.jgSelect();
+}
+// 风门的修改
+const xiugaiclick=()=>{
+  zhtext.value='修改';
+  if (JSON.stringify(handobj.value) == "{}"|| currentrow.value==false) {
+    ElMessage.error("你还没有选中修改的项目");
+  } else {
+    sdialog.value.fjdialog = true;
+    aid.value=handobj.value.aid;
+    fjobj.value.fanid=handobj.value.fanid;
+    fjobj.value.fanname=handobj.value.fanname;
+    fjobj.value.onoff=handobj.value.onoff;
+    fjobj.value.pa=handobj.value.pa;
+    source.value.selectstr=handobj.value.pname;
+    source.value.site=handobj.value.site;
+    pid.value=handobj.value.pid;
+    source.value.site==handobj.value.site;
+    vtkmodel.clearJgAddMode() ;
+  vtkmodel.selectPipes();
+  dialogtrue.value.jgSelect();
+
+  }
+}
+//风机删除
+const delonclock=(val)=>{
+  if (JSON.stringify(handobj.value) == "{}"|| currentrow.value==false) {
+    ElMessage.error("你还没有选中删除的项目");
+  } else {
+    delte.value=val;
+    sdialog.value.dialogsgdelect=true;
+    zqname.value=handobj.value.pname;
+  }
 }
+const deletefun=()=>{
+  console.log(delte.value);
+  if(delte.value=="风机"){
+  const params = {
+    transCode: "D20009",
+    fanid: handobj.value.fanid,
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message:"删除风机成功",
+        type: "success",
+      });
+      sdialog.value.dialogsgdelect = false;
+      getrequest();
+    })
+
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+  }else if(delte.value=="风门"){
+    const params = {
+    transCode: "D20012",
+    doorid:handobjfm.value.doorid,
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message:"删除风门成功",
+        type: "success",
+      });
+      sdialog.value.dialogsgdelect = false;
+      fmrequest();
+    })
+
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+  }else{
+    
+  }
+  }
 const inputnuberChange = (number) => {
     source.value.site=number;
-//   dialogtrue.value.jgSelenum();
+    dsite.value=number;
+ dialogtrue.value.jgSelenum();
 
 }
 const handleSwitchChange=(value)=> {
     fjobj.value.onoff=value;
     }
-
-// 查询
+//初始化
+const getquery=(id)=>{
+  aid.value=id;
+  getrequest();
+  fmrequest();
+}
+//  风机查询
 const getrequest=()=>{
-    aid.value=props.aid;
-
   const params = {
     transCode: "D20007",
     aid: aid.value,
@@ -343,7 +609,9 @@ const getrequest=()=>{
   request(params)
     .then((res) => {
         console.log(res)
-        tableDatpump.value=res.rows;
+        fjtableData.value=res.rows;
+        currentrow.value=false;
+        console.log( currentrow.value);
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg);
@@ -355,6 +623,7 @@ const addrequest=()=>{
     ElMessage.error("巷道不能为空")
   }else{
   const params = {
+    transCode: "D20008",
     fanid:fjobj.value.fanid,
     pid:pid.value,
     fanname:fjobj.value.fanname,
@@ -363,33 +632,140 @@ const addrequest=()=>{
     onoff:fjobj.value.onoff,
     aid:aid.value,
 
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: zhtext.value+"风机成功",
+        type: "success",
+      });
+      sdialog.value.fjdialog = false;
+      getrequest();
+      // getrequest();
+      fun3D();
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+  }
 
-//     transCode: "D20008",
-//      pumpid:pumpobj.value.pumpid,
-//     pumpname:pumpobj.value.pumpname,
-//     openhig:parseFloat(pumpobj.value.openhig),
-//     closehig:parseFloat(pumpobj.value.closehig),
-//     pid: firepid.value,
-//     aid: aid.value,
-//     site: source.site,
-//    onoff:pumpobj.value.onoff
+}
+//风门查询 
+const fmrequest=()=>{
+    console.log(aid.value)
+  const params = {
+    transCode: "D20010",
+    aid: aid.value,
   };
-  console.log(params);
-//   request(params)
-//     .then((res) => {
-//       ElMessage({
-//         message: zhtext.value+"水泵成功",
-//         type: "success",
-//       });
-//       sdialog.value.addpump = false;
-//       getrequest();
-//       fun3D();
-//     })
-//     .catch((err) => {
-//       ElMessage.error(err.returnMsg);
-//     });
+  request(params)
+    .then((res) => {
+        console.log(res)
+        fmtableData.value=res.rows;
+        currentrow.value=false;
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
   }
+  //风门的add
+  const  fmadd=()=>{
+    zhtext.value='添加';
+    currentrow.value=false;
+    tishi.value= zhtext.value;
+    handobj.value={};
+    fmobj.value.doorid=null;
+    fmobj.value.doorname='';
+    fmobj.value.onoff=0;
+    fmobj.value.dragcoe=null;
+    source.value.site=null;
+    source.value.selectstr='';
+    pid.value=null;
+    vtkmodel.clearJgAddMode() ;
+  vtkmodel.selectPipes();
+  dialogtrue.value.jgSelect();
+  }
+  //风门的修改
+  const  fmxiugai=()=>{
+    zhtext.value='修改';
+  if (JSON.stringify(handobjfm.value) == "{}"|| currentrow.value==false) {
+    ElMessage.error("你还没有选中修改的项目");
+  } else {
+    sdialog.value.fmdialog = true;
+    aid.value=handobjfm.value.aid;
+    fmobj.value.doorid=handobjfm.value.doorid;
+    fmobj.value.doorname=handobjfm.value.doorname;
+    fmobj.value.onoff=handobjfm.value.onoff;
+    fmobj.value.dragcoe=handobjfm.value.dragcoe;
+    source.value.selectstr=handobjfm.value.pname;
+    source.value.site=handobjfm.value.site;
+    pid.value=handobjfm.value.pid;
+    source.value.site==handobjfm.value.site;
+    vtkmodel.clearJgAddMode() ;
+    vtkmodel.selectPipes();
+    dialogtrue.value.jgSelect();
 
+  }
+  }
+  // 删除
+ 
+  const  fmdel=(val)=>{
+    if (JSON.stringify(handobjfm.value) == "{}"|| currentrow.value==false) {
+    ElMessage.error("你还没有选中删除的项目");
+  } else {
+    delte.value=val;
+    sdialog.value.dialogsgdelect=true;
+    zqname.value=handobjfm.value.pname;
+  }
+  }
+  //添加接口
+  const  addxiufm=()=>{
+    if(pid.value==null||pid.value==""){
+    ElMessage.error("巷道不能为空")
+  }else{
+  const params = {
+    transCode:"D20011",
+    doorid:fmobj.value.doorid,
+    pid:pid.value,
+    doorname:fmobj.value.doorname,
+    site:source.value.site,
+    dragcoe:parseFloat(fmobj.value.dragcoe),
+    onoff:fmobj.value.onoff,
+    aid:aid.value,
+
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: zhtext.value+"风门成功",
+        type: "success",
+      });
+      sdialog.value.fmdialog = false;
+      fmrequest();
+      fun3D();
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+  }
+
+  }
+  
+// 3D关闭弹窗
+const fun3D = () => {
+ state.value=sessionStorage.getItem("state");
+  //console.log(state.value);
+  if(state.value=='1'){
+    vtkmodel.clearModeAddJg();
+  }else{
+    vtkmodel.selectNoting();
+  }
+  dialogtrue.value.timintclaer();
+  vtkmodel.clearpipsite();//清除选择巷道的位置
+}
+const Dtext=(val)=>{
+  console.log(val);
+  source.value.selectstr=val.name;
+  pid.value=val.id;
 }
-defineExpose({getrequest});
+defineExpose({getquery});
 </script>

+ 3 - 3
src/view/components/InfoBoundary.vue

@@ -241,7 +241,7 @@
                 </div>
               </div>
               <el-form-item label="边界类型" :label-width="formLabelWidth6">
-                <el-select v-model="bformInline.type" placeholder="请选择">
+                <el-select v-model="bformInline.type" placeholder="请选择" >
                   <el-option
                     v-for="item in bformInline.options"
                     :key="item.id"
@@ -250,7 +250,7 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="流量(m³/s)" :label-width="formLabelWidth6">
+              <el-form-item label="流量(m³/s)" :label-width="formLabelWidth6" v-if="bformInline.type=='massflow'">
                 <el-input
                   v-model="bformInline.flow"
                   class="w-50 m-2"
@@ -258,7 +258,7 @@
                   oninput ="value=value.replace(/[^0-9.]/g,'')" 
                 />
               </el-form-item>
-              <el-form-item label="压强(pa)" :label-width="formLabelWidth6">
+              <el-form-item label="压强(pa)" :label-width="formLabelWidth6" v-if="bformInline.type=='Pressure'">
                 <el-input
                   v-model="bformInline.pressure"
                   class="w-50 m-2"

+ 17 - 7
src/view/components/InfoDisaster.vue

@@ -128,7 +128,7 @@
               </div>
             </el-collapse-item>
           </el-collapse>
-        <!-- <Fengmen ref='Fengmenref' :aid='aid'></Fengmen> -->
+        <Fengmen ref='Fengmenref'></Fengmen>
         </div>
       </el-aside>
     </div>
@@ -354,7 +354,7 @@
                       <div class="header_l header_z headerimg">
                         <el-image :src="icon" fit="contain"></el-image>
                         <h4 class="tianjia">性能曲线</h4>
-                        <div class="closeimg" @click="sdialog.disDisasterwter = false">
+                        <div class="closeimg" @click="sdialog.linetable = false">
                           <el-image :src="closeimg" fit="contain"></el-image>
                         </div>
                       </div>
@@ -1438,6 +1438,7 @@
       width="400"
       align-center
       class="dialog_class bgcolor tianjia"
+
     >
       <template #header="{ titleId, titleClass }">
         <div class="my-header">
@@ -1802,6 +1803,7 @@ const accident3 = (key) => {
       sour.value.collwater = false;
       sour.value.Gass = false;
       sour.value.collGass1=false
+      Fengmenref.value.getquery(aid.value);
     } else if (props.classradio == "Water") {
      
       sour.value.collwater = true;
@@ -1844,7 +1846,6 @@ const Dclick = () => {
 //灾情源查询列表
 const handledisaster = (aidval) => {
   aid.value = aidval;
-  //Fengmenref.value.getrequest();
   const params = {
     transCode: "D00005",
     aid: aid.value,
@@ -2246,6 +2247,9 @@ const wanewadd=()=>{
 }
 const Gassadd=()=>{
   console.log(firepid.value);
+  if(firepid.value==null||firepid.value==''||firepid.value==undefined){
+    ElMessage.error('巷道名称不能为空');
+  }else{
   const params = {
     transCode: "D10021",
     gid:gid.value,
@@ -2256,7 +2260,7 @@ console.log(params);
   request(params)
     .then((res) => {
       ElMessage({
-        message: res.returnMsg,
+        message:"瓦斯添加成功",
         type: "success",
       });
       Gassdialog.value.wsaddflie= false;
@@ -2267,6 +2271,7 @@ console.log(params);
     .catch((err) => {
       ElMessage.error(err.returnMsg);
     });
+  }
 }
 // 瓦斯选中一行
 const handlews=(row)=>{
@@ -2319,7 +2324,7 @@ const wsdelete2=()=>{
   request(params)
     .then((res) => {
       ElMessage({
-        message: res.returnMsg,
+        message: "瓦斯删除成功",
         type: "success",
       });
       Gassdialog.value.wsdelete=false;
@@ -2946,7 +2951,7 @@ const yehandleEdit=()=>{
     .then((res) => {
       console.log(res);
       ElMessage({
-        message:  tishi.value+"一维灾情源",
+        message:  tishi.value+"一维灾情源成功",
         type: "success",
       });
       yiweiget();
@@ -2960,12 +2965,17 @@ const yehandleEdit=()=>{
 // 删除
 const yiweidelete=()=>{
 deltext.value='一维瓦斯';
+if (JSON.stringify(yiweiobj.value.nreobj) == "{}") {
+    ElMessage.error("你还没有选中删除的项目");
+  } else {
 sdialog.value.deletedata = true;
 zqname.value=yiweiobj.value.nreobj.pname;
+  }
 }
 const  delyiwei=()=>{
+console.log(yiweiobj.value.nreobj);
   if (JSON.stringify(yiweiobj.value.nreobj) == "{}") {
-    ElMessage.error("你还没有选中修改的项目");
+    ElMessage.error("你还没有选中删除的项目");
   } else {
   const params = {
     transCode: "D30003",

+ 1 - 0
src/view/components/MenuMine.vue

@@ -256,6 +256,7 @@
         <el-tree-select
             v-model="guandaoobj.roughCoeName"
             :data="dataselct"
+            placeholder="请选择"
             :render-after-expand="false"
             style="width: 240px"
             @change='seltree($event)'

+ 9 - 9
src/view/components/MenuPhysics.vue

@@ -90,14 +90,14 @@
                 <el-form-item label="名称" :label-width="formLabelWidth6">
                     <el-input v-model="wuliobj.name" maxlength="18" class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
-                <el-form-item label="密度(kg/m3) " :label-width="formLabelWidth6">
-                    <el-input-number v-model.number="wuliobj.density "  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+                <el-form-item label="密度(kg/m3) "   :label-width="formLabelWidth6">
+                    <el-input-number v-model.number="wuliobj.density " :min="-10" :max="1000000000"   class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
-                <el-form-item label="扩散系数(m2/s)" :label-width="formLabelWidth6">
-                    <el-input-number v-model.number="wuliobj.diffcoe"  maxlength="15"  @input="formatInput"   class="w-50 m-2" placeholder="请输入" />
+                <el-form-item label="扩散系数(m2/s)"   :label-width="formLabelWidth6">
+                    <el-input-number :min="-10" :max="1000000000" v-model.number="wuliobj.diffcoe"  maxlength="10"    class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
-                <el-form-item label="比热J/(kg*K)" :label-width="formLabelWidth6">
-                    <el-input-number v-model.number="wuliobj.speheat"  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+                <el-form-item label="比热J/(kg*K)"  :label-width="formLabelWidth6">
+                    <el-input-number :min="-10" :max="1000000000"  v-model.number="wuliobj.speheat"  maxlength="10"   class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
             </el-form>
             <div class="dialog-footer footer_div l_btn">
@@ -246,9 +246,9 @@ const addsg = () => {
     wuliobj.value.coid = '';
     wuliobj.value.code = '';
     wuliobj.value.name = '';
-    wuliobj.value.density = '';
-    wuliobj.value.diffcoe = '';
-    wuliobj.value.speheat = '';
+    wuliobj.value.density = null;
+    wuliobj.value.diffcoe = null;
+    wuliobj.value.speheat = null;
     tableobj.value={};
 
 

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

@@ -3,7 +3,7 @@
         <el-dialog
      v-model="dialogVisiblenode"
      align-center  :append-to-body="true"
-     width="700"
+     width="500"
      class="log_class bgcolor tianjia asideg asidegbg leftbgimg"
    >
    <template #header="{titleId, titleClass }">