3.13bug修改完成

src/view/appmian.vue

@@ -96,7 +96,7 @@ const tiaozhuan = () => {
             boundary.value.accident4(key);
             lliudialog.value.accident2(key);
             tanimation.value.monitor = false;
-router.push({ path:"/configurator", query: { date: new Date().getTime()}})
+router.push({ path:"/configurator"})
      
     // console.log(router.push("/configurator"))
  

src/view/components/InfoBoundary.vue

@@ -157,6 +157,9 @@
       :modal="false"
       :close-on-click-modal="false"
       draggable
+      :fullscreen="false"
+      :modal-append-to-body="false"
+      modal-class="summary-dlg"
       class="dialog_class bgcolor foter_l"
     >
       <template #header="{ titleId, titleClass }">
@@ -174,7 +177,8 @@
                   <el-input
                     v-model="bformInline.nname"
                     class="w-50 m-2"
-                    placeholder="节点名称"
+                    placeholder="节点选择"
+                    disabled 
                   />
                 </el-form-item>
                 <div class="btn2">
@@ -206,6 +210,7 @@
                   v-model="bformInline.flow"
                   class="w-50 m-2"
                   placeholder="请输入"
+                  oninput ="value=value.replace(/[^0-9.]/g,'')" 
                 />
               </el-form-item>
               <el-form-item label="压强(pa)" :label-width="formLabelWidth6">
@@ -213,6 +218,7 @@
                   v-model="bformInline.pressure"
                   class="w-50 m-2"
                   placeholder="请输入"
+                  oninput ="value=value.replace(/[^0-9.]/g,'')" 
                 />
               </el-form-item>
               <el-form-item label="温度(℃）" :label-width="formLabelWidth6">
@@ -220,6 +226,7 @@
                   v-model="bformInline.temperature"
                   class="w-50 m-2"
                   placeholder="请输入"
+                  oninput ="value=value.replace(/[^0-9.]/g,'')" 
                 />
               </el-form-item>
               <el-form-item label="污染物1浓度" :label-width="formLabelWidth6">
@@ -227,6 +234,7 @@
                   v-model="bformInline.polcon1"
                   class="w-50 m-2"
                   placeholder="请输入"
+                  oninput ="value=value.replace(/[^0-9.]/g,'')" 
                 />
               </el-form-item>
               <el-form-item label="污染物2浓度" :label-width="formLabelWidth6">
@@ -234,6 +242,7 @@
                   v-model="bformInline.polcon2"
                   class="w-50 m-2"
                   placeholder="请输入"
+                  oninput ="value=value.replace(/[^0-9.]/g,'')" 
                 />
               </el-form-item>
             </div>
@@ -425,6 +434,7 @@ let dialogtrue = ref();
 const Dclick = () => {
   dialogtrue.value.dialoglog = true;
   vtkmodel.selectNodes();
+  dialogtrue.value.jgSelect();
   console.log(dialogtrue.value.dialoglog);
 };
 // 3D数据显示

src/view/components/InfoDisaster.vue

@@ -17,16 +17,16 @@
                     <div class="xian btncolor tablefocus">
                       <el-table
                         :data="tableDatay"
-                        style="width: 100%"
                         @row-click="handleDelete($event)"
-                        :row-class-name="tableRowClassName"
-                        max-height="350px"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
                       :highlight-current-row="currentrow" 
+                        style="width: 100%"
+                        :max-height="tableHeight"
+                        :row-class-name="tableRowClassName"
                       >
-                        <el-table-column prop="pname" label="选择巷道" width="130" />
-                        <el-table-column prop="site" label="位置" width="70" />
-                        <el-table-column label="操作" width="100">
+                        <el-table-column prop="pname" label="选择巷道" />
+                        <el-table-column prop="site" label="位置" />
+                        <el-table-column label="操作" >
                           <template #default="scope">
                             <el-button
                               size="small"
@@ -150,9 +150,9 @@
                         max-height="350px"
                         :highlight-current-row="currentrow" 
                       >
-                        <el-table-column prop="pname" label="选择巷道" width="130" />
-                        <el-table-column prop="site" label="位置" width="70" />
-                        <el-table-column label="操作" width="100">
+                        <el-table-column prop="pname" label="选择巷道"  />
+                        <el-table-column prop="site" label="位置"  />
+                        <el-table-column label="操作" >
                           <template #default="scope">
                             <el-button
                               size="small"
@@ -212,7 +212,7 @@
                         @row-click="handleDelete3($event)"
                         :highlight-current-row="currentrow1" 
                       >
-                        <el-table-column prop="timeline" label="时间" />
+                        <el-table-column prop="timeline" label="时间/s" />
                         <el-table-column prop="val1" label="突水量（m³/s）" />
                       </el-table>
                       <div class="asdis_btn">
@@ -232,7 +232,6 @@
                           class="flex_a"
                           @click="
                             shanchu('2');
-                           
                           "
                         >
                           <div class="btns"><span class="spantext">删除</span></div>
@@ -355,12 +354,8 @@
               <div class="btns" @click="searchgd"><span class="spantext">搜索</span></div>
             </div>
           </div>
-          <!-- <div class="btn2">
-     <el-button type="success" @click="searchgd">搜索</el-button></div> -->
         </div>
-        <!-- <div class="btn2">
-     <el-button type="success">导入</el-button></div>
-   </div> -->
+  
         <el-table
           :row-class-name="tableRowClassName"
           :max-height="tableHeight"
@@ -455,7 +450,7 @@
               placeholder="请输入"
               maxlength="10"
               step="0.01"
-              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
+              oninput ="value=value.replace(/[^0-9.]/g,'')"
             />
           </el-form-item>
           <el-form-item label="污染物1浓度" :label-width="formLabelWidth6">
@@ -465,7 +460,7 @@
               placeholder="请输入"
               maxlength="10"
               step="0.01"
-              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
+              oninput ="value=value.replace(/[^0-9.]/g,'')"
             />
           </el-form-item>
           <el-form-item label="污染物2浓度" :label-width="formLabelWidth6">
@@ -474,7 +469,7 @@
               class="w-50 m-2"
               placeholder="请输入"
               maxlength="10"
-              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
+              oninput ="value=value.replace(/[^0-9.]/g,'')"
             />
           </el-form-item>
         </el-form>
@@ -513,11 +508,12 @@
       </template>
       <div>
         <el-form>
-          <el-form-item label="时间" :label-width="formLabelWidth6">
+          <el-form-item label="时间/s" :label-width="formLabelWidth6">
             <el-input
               v-model="Disastersource.timeline"
               class="w-50 m-2"
-              placeholder="请输入"
+              placeholder="请输入时间秒"
+              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
             />
           </el-form-item>
           <el-form-item label="突水量（m³/s）" :label-width="formLabelWidth6">
@@ -525,6 +521,9 @@
               v-model="Disastersource.val1"
               class="w-50 m-2"
               placeholder="请输入"
+              oninput ="value=value.replace(/[^0-9.]/g,'')"
+             
+              
             />
           </el-form-item>
         </el-form>
@@ -573,8 +572,7 @@
         <div class="footerbtn flex1">
           <div class="borderimg">
             <el-button
-              @click="
-                fundeledata();
+              @click="fundeledata();
                 sdialog.dialogsgdelect = false;
               "
             >
@@ -705,6 +703,7 @@ const Dtext=(val)=>{
 const Dclick = () => {
   dialogtrue.value.dialoglog = true;
   vtkmodel.selectPipes();
+  dialogtrue.value.jgSelect();
   console.log(dialogtrue.value.dialoglog);
 };
 //灾情源查询列表
@@ -780,17 +779,19 @@ const handleDelete = (val) => {
     // }
 };
 const shanchu = (val) => {
-  console.log(val)
+
+  biaoid.value = val;
   if(val=='1'){
   if (zqname.value == "") {
  ElMessage.error("你还没有选中删除的项目")
  } else {
     sdialog.value.dialogsgdelect = true;
-  
-    biaoid.value = val;
+ 
     }
   }else {
-
+    console.log(11111)
+   
+    sdialog.value.dialogsgdelect = true;
   }
 };
 const fundeledata = () => {
@@ -941,6 +942,7 @@ const getinquire = () => {
       if (props.classradio == "Fire") {
         tableDatafir.value = res.rows;
       } else {
+      
         tableData4.value = res.rows;
       }
     })

src/view/components/MenuCheck.vue

@@ -337,6 +337,7 @@ const amend = () => {
 }
 // 选择巷道
 const fireclick = () => {
+    searchtaggd.value='';
     pipelinedata('');
 }
 // 节点搜索

src/view/components/MenuMine.vue

@@ -201,7 +201,7 @@
             </template>
             <div>
                 <el-form-item label="名称" :label-width="formLabelWidth7">
-                    <el-input v-model="guandaoobj.name"  maxlength="18" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="guandaoobj.name"   oninput="value=value.replace(/[^\w_]/g,'');" maxlength="18" class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <div class="demo-input-suffix firsttitle magintop guand_1">
                     <el-form-item label="开始节点" :label-width="formLabelWidth7">

src/view/components/MenuSensor.vue

@@ -256,9 +256,10 @@ const amend = () => {
 // 巷道方法
 // 选择巷道
 const fireclick = () => {
+    pipeline.value.searchtaggd='';
     pipeline.value.dialogVisiblenode = true;
-    pipeline.value.pipelinedata("");
-
+    pipeline.value.pipelinedata('');
+  
 }
 //点击确定
 const pipelineapi = (row) => {

src/view/components/PipeIine.vue

@@ -90,6 +90,7 @@ const multipleSelection = ref([])
 let  dialogVisiblenode=ref(false);
 let total = ref(1);
 let searchtaggd = ref("");
+let searchtag=ref("");
 const currentPage4 = ref(1);
 const pageSize4 = ref(5)
     onMounted(()=>{
@@ -109,8 +110,10 @@ const tableRowClassName = ({ row, rowIndex }) => {
 }
 // 管道搜索
 function searchgd() {
+   
   searchtag.value=searchtaggd.value;
-    pipelinedata();
+  
+  pipelinedata( searchtaggd.value);
 }
 // 管道分页查询
 const handleCurrentChange = (val) => {
@@ -164,7 +167,7 @@ const projectsSelectionSelect=(selection, row)=>{
   const  queding=()=>{
        selectfun();
      }
-     defineExpose({dialogVisiblenode,pipelinedata });
+     defineExpose({dialogVisiblenode,pipelinedata,searchtaggd});
    </script>
    <style  lang="scss" scoped>
 .vtk{

src/view/components/SetNode.vue

@@ -9,6 +9,7 @@
       :fullscreen="false"
       :modal-append-to-body="false"
       modal-class="summary-dlg"
+      @close='closeDialog'
       class="right log_class bgcolor tianjia asideg asidegbg leftbgimg"
     >
       <template #header="{ titleId, titleClass }">
@@ -29,7 +30,7 @@
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
-            <el-button @click="dialoglog = false">取消</el-button>
+            <el-button @click=" closeDialog();dialoglog = false">取消</el-button>
           </div>
         </div>
         <div class="footerbtn flex1">
@@ -60,18 +61,19 @@ let msg=ref({
   z: '',
  
 })
-defineExpose({ dialoglog });
+defineExpose({ dialoglog,jgSelect});
 let timing = ref(null);
 //管道节点选择对象
 let selectObj =  ref(null);
 const textclick=()=>{
   emit('Dtext',selectObj.value);
+  clearInterval(timing.value);
 }
+clearInterval(timing.value);
 onBeforeUnmount(() => {
   clearInterval(timing.value);
 });
 onMounted(() => {
-    jgSelect();
 });
 onUnmounted(() => {
     clearInterval(timing.value);
@@ -80,7 +82,12 @@ onUnmounted(() => {
 function jgSelect(){
     timing.value = setInterval(() => {//定时器
     selectObj.value=vtkmodel.selectObj;
-    msg.value=selectObj.value;
+    if(selectObj.value==null){
+
+    }else{
+      msg.value=selectObj.value;
+    }
+
   }, 200);
 }
 

src/view/components/SetPipe.vue

@@ -9,6 +9,7 @@
       :fullscreen="false"
       :modal-append-to-body="false"
       modal-class="summary-dlg"
+      @close='closeDialog'
       class="right log_class bgcolor tianjia asideg asidegbg leftbgimg"
     >
       <template #header="{ titleId, titleClass }">
@@ -19,7 +20,7 @@
       </template>
       <div class="mgstamkuang">
       <ul>
-        <li><span>名称：</span>{{msg.name}}</li>
+        <li><span>名称：</span>{{msg.names}}</li>
         <li><span>粗糙系数：</span>{{msg.roughCoe}}</li>
         <li><span>截面类型：</span>{{msg.sectionType}}</li>
         <li><span>截面参数1：</span>{{msg.sectionPara1}}</li>
@@ -32,7 +33,7 @@
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
-            <el-button @click="dialoglog = false">取消</el-button>
+            <el-button @click="closeDialog(); dialoglog = false">取消</el-button>
           </div>
         </div>
         <div class="footerbtn flex1">
@@ -57,29 +58,34 @@ let dialoglog = ref(false);
 let texttitle = ref("管道信息");
 // let msg = ref("内容");
 let msg=ref({
-    name: '',
-    snId: Number,
-    enId:Number ,
+    names: '',
+    snId:'',
+    enId:'' ,
     roughCoe: '',
-    sectionType: 'CIRCULAR',
+    sectionType: '',
     sectionPara1: '',
     sectionPara2: '',
     sectionPara3: '',
     sectionPara4: '',
     sectionPara5: '',
 })
-defineExpose({ dialoglog });
+defineExpose({ dialoglog,jgSelect });
 let timing = ref(null);
 //管道节点选择对象
 let selectObj =  ref(null);
 const textclick=()=>{
   emit('Dtext',selectObj.value);
+  clearInterval(timing.value);
+}
+const closeDialog=()=>{
+  clearInterval(timing.value);
 }
+
 onBeforeUnmount(() => {
   clearInterval(timing.value);
 });
 onMounted(() => {
-    jgSelect();
+   // jgSelect();
 });
 onUnmounted(() => {
     clearInterval(timing.value);
@@ -88,7 +94,12 @@ onUnmounted(() => {
 function jgSelect(){
     timing.value = setInterval(() => {//定时器
     selectObj.value=vtkmodel.selectObj;
-    msg.value=selectObj.value;
+    if(selectObj.value==null){
+    console.log(selectObj.value);
+}else{
+   console.log(selectObj.value);
+   msg.value=selectObj.value;
+}
   }, 200);
 }
 

src/view/configurator.vue

@@ -91,7 +91,7 @@ const clickreture=()=>{
 // router.push("/");
 //router.back()
 
-router.go(-1)
+router.push("/");
 }
 const handleSelect = (key,keyPath) => {
     switch (key) {