6.7

src/view/components/InfoBoundary.vue

@@ -28,10 +28,10 @@
                         :data="ftableData"
                         style="width: 100%"
                         :max-height="tableHeight"
-                        :highlight-current-row="true"
+                        :highlight-current-row="currentrow"
                         :row-class-name="tableRowClassName"
                         @row-click="handleDelete($event)"
-                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
+                        :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
                       >
                         <el-table-column prop="nid" label="节点选择" />
                         <!-- <el-table-column prop="type" label="边界类型" /> -->
@@ -121,7 +121,7 @@
                         :data="ftableData"
                         style="width: 100%"
                         :max-height="tableHeight"
-                        :highlight-current-row="true"
+                        :highlight-current-row="currentrow"
                         :row-class-name="tableRowClassName"
                         @row-click="handleDelete($event)"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
@@ -445,6 +445,7 @@ const  changeClass= (i)=>  {
   console.log(i);
  isActive.value = i;
 }
+let currentrow=ref();
 const changeModel = () => {
   vtkmodel.clearJgAddMode();
   vtkmodel.renderWindow.render();
@@ -587,7 +588,9 @@ const projectsSelectionSelect = (selection, row) => {
   if (selection.length > 1) {
     multipleTableRef.value.clearSelection();
     multipleTableRef.value.toggleRowSelection(row, true);
-    multipleSelection.value = selection[1];
+    let arrp=[];
+        arrp.push(selection[1])
+        multipleSelection.value = arrp;
     return;
   }
   if (selection.length == 1) {
@@ -600,6 +603,7 @@ const projectsSelectionSelect = (selection, row) => {
 //边界添加前清空
 const bounadd = () => {
   console.log(22233444)
+  currentrow.value=false;
   bid.value = "";
   bformInline.value.nname = "";
   (bformInline.value.type = "Pressure"), (bformInline.value.flow = "0");
@@ -608,6 +612,7 @@ const bounadd = () => {
   bformInline.value.polcon1 = "0";
   bformInline.value.polcon2 = "0";
   buntext.value = "添加";
+  xiugaiobj.value={};
   if (props.classradio == "Fire" ||props.classradio == "Gass") {
     bformInline.value.type = "Pressure";
   } else if (props.classradio == "Water") {
@@ -682,14 +687,15 @@ const addboundary = (valaid) => {
   request(params)
     .then((res) => {
       ftableData.value = res.rows;
+      xiugaiobj.value={};
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg);
     });
 };
-//火灾边界条件删除
 const handleDelete = (val) => {
   console.log(val);
+  currentrow.value=true;
   xiugaiobj.value = val;
   bid.value = val.bid;
   zqname.value = val.nname;

src/view/components/InfoDisaster.vue

@@ -105,7 +105,7 @@
                           class="flex_a"
                           @click="
                             shanchu('2');
-                            sdialog.dialogsgdelect = true;
+                            //sdialog.dialogsgdelect = true;
                           "
                         >
                           <div class="btns"><span class="spantext">删除</span></div>
@@ -908,6 +908,7 @@
       v-model="sdialog.adddwater"
       :append-to-body="true"
       width="400"
+      align-center
       class="dialog_class bgcolor tianjia"
     >
       <template #header="{ titleId, titleClass }">
@@ -962,7 +963,8 @@
     <el-dialog
       v-model="sdialog.dialogsgdelect"
       :append-to-body="true"
-      width="400"
+      width="300"
+      align-center
       class="dialog_class bgcolor tianjia"
     >
       <template #header="{ titleId, titleClass }">
@@ -996,6 +998,7 @@
     <!-- 瓦斯的删除 -->
     <el-dialog
       v-model="Gassdialog.wsdelete"
+      align-center
       :append-to-body="true"
       width="400"
       class="dialog_class bgcolor tianjia"
@@ -1235,6 +1238,7 @@ const handledisaster = (aidval) => {
       } else {
         tableDatawat.value = res.rows;
       }
+       tableobj.value={};
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg);
@@ -1243,6 +1247,7 @@ const handledisaster = (aidval) => {
 // 灾情源添加
 const fireadd = () => {
   currentrow.value = false;
+  tableobj.value={};
   if(firepid.value==null||firepid.value==""){
     ElMessage.error("巷道不能为空")
   }else{
@@ -1291,11 +1296,12 @@ const handleEditfire = () => {
 };
 //灾情源删除
 const handleDelete = (val) => {
+  console.log("我执行了")
   zqname.value = val.pname;
-  tableobj.value=val;
+ tableobj.value=val;
   currentrow.value=true;
   shanchu.value = val;
-  sdialog.dialogsgdelect = true;
+ sdialog.dialogsgdelect = true;
   firesid.value = val.sid;
 
     // }
@@ -1304,14 +1310,22 @@ const shanchu = (val) => {
 
   biaoid.value = val;
   if(val=='1'){
-  if (zqname.value == "") {
+
+  if (JSON.stringify(tableobj.value) == "{}") {
  ElMessage.error("你还没有选中删除的项目")
  } else {
     sdialog.value.dialogsgdelect = true;
 
     }
   }else {
-    sdialog.value.dialogsgdelect = true;
+    if (JSON.stringify(jiancobj.value) == "{}") {
+      ElMessage.error("你还没有选中删除的项目")
+ } else {
+  sdialog.value.dialogsgdelect = true;
+  //sdialog.value.dialogsgdelect = true;
+
+    }
+  //  sdialog.value.dialogsgdelect = true;
   }
 };
 const fundeledata = () => {
@@ -1360,6 +1374,7 @@ const newtable = (e) => {
   styX.value.left = e.clientX + "px";
   console.log(styX.value.left);
   currentrow.value=false;
+  tableobj.value={};
   selectstr.value = "";
   firepid.value = "";
   source.site = 0;
@@ -1423,7 +1438,9 @@ const projectsSelectionSelect = (selection, row) => {
   if (selection.length > 1) {
     multipleTableRef.value.clearSelection();
     multipleTableRef.value.toggleRowSelection(row, true);
-    multipleSelection.value = selection[1];
+    let arrp=[];
+        arrp.push(selection[1])
+        multipleSelection.value = arrp;
     return;
   }
   if (selection.length == 1) {
@@ -1474,6 +1491,7 @@ const getinquire = () => {
       } else {
         tableData4.value = res.rows;
       }
+      jiancobj.value={};
     })
     .catch((err) => {});
 };
@@ -1518,6 +1536,8 @@ const firinit = () => {
   Disastersource.value.val3 = "";
   Disastersource.value.val4 = "";
   zhtext.value = "添加";
+  currentrow1.value=false;
+  jiancobj.value={};
 };
 //瓦斯爆炸查询
 const Gassgetdata=(aidval)=>{
@@ -1530,6 +1550,7 @@ const Gassgetdata=(aidval)=>{
   request(params)
     .then((res) => {
       tableDataws.value=res.rows;
+      tableobj.value={};
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg);
@@ -1542,8 +1563,8 @@ const wanewadd=()=>{
   firepid.value = "";
   zhtext.value = "添加";
 
-//  currentrow.value=false;
-//  tableobj.value={};
+ currentrow.value=false;
+ tableobj.value={};
 
 
 }
@@ -1652,7 +1673,7 @@ const wsblastget=()=>{
   request(params)
     .then((res) => {
       gtableData.value=res.rows;
-  
+      wasi.value.blastdata={}
     
     })
     .catch((err) => {
@@ -1691,6 +1712,7 @@ const wsbalastadd=()=>{
       });
       Gassdialog.value.wsaddarea= false;
       wsblastget();
+
     
     })
     .catch((err) => {
@@ -1763,7 +1785,7 @@ const wsblastdelete1=()=>{
   request(params)
     .then((res) => {
       gjtableData.value=res.rows;
-    
+      wasi.value.gatherdata={};
     })
     .catch((err) => {
       ElMessage.error(err.returnMsg);

src/view/components/MenuCheck.vue

@@ -286,7 +286,7 @@ const getsensor = () => {
     request(params)
         .then((res) => {
             tableData.value = res.rows;
-
+                tableobj.value={};
         })
         .catch((err) => {
             ElMessage.error(err.returnMsg)
@@ -301,7 +301,7 @@ const addsg = () => {
     source.value.site='';
     firepid.value='';
     cid.value='';
-    tableobj.value=[];
+    tableobj.value={};
 }
 // 添加修改的接口
 const addEditaip=()=>{
@@ -378,7 +378,9 @@ const projectsSelectionSelect=(selection, row)=>{
        if(selection.length>1){
         multipleTableRef.value.clearSelection();
         multipleTableRef.value.toggleRowSelection(row,true);
-        multipleSelection.value=selection[1];
+        let arrp=[];
+        arrp.push(selection[1])
+        multipleSelection.value = arrp;
         return;
        }
         if(selection.length==1){

src/view/components/MenuMine.vue

@@ -477,6 +477,7 @@ let bfname=ref("");
           .then((res) => {
               tableData2.value = res.rows;
               total.value = res.total;
+              nodedata.value={}
           })
           .catch((err) => {
               ElMessage.error(err.returnMsg)
@@ -493,7 +494,7 @@ let bfname=ref("");
       nodeobj.value.z = "";
       nodeobj.value.nid = '';
       nodeobj.value.code = '';
-  
+      nodedata.value={};
   }
   //节点添加api
   const nodeconfirm = () => {
@@ -501,7 +502,7 @@ let bfname=ref("");
       ElMessage.error('名称不能为空')
              
       }else if(nodeobj.value.code==null||nodeobj.value.code==''){
-          ElMessage.error('标号不能为空')
+          ElMessage.error('编号不能为空')
       }else if(nodeobj.value.x==null||nodeobj.value.x==''){
           ElMessage.error('X不能为空')
       }else if(nodeobj.value.y==null||nodeobj.value.y==''){
@@ -648,6 +649,7 @@ let bfname=ref("");
       guandaoobj.value.sectionPara5 = '';
       gfname.value="";
      bfname.value="";
+     gddata.value={};
      nextTick(()=>{
     gfx.value.files=[];
     inp.value.files=[];
@@ -713,7 +715,7 @@ let bfname=ref("");
                   message: res.returnMsg,
                   type: 'success',
               })
-  
+              gddata.value={};
           })
           .catch((err) => {
               ElMessage.error(err.returnMsg)
@@ -766,13 +768,15 @@ const Gassaddbfid=( bf)=>{
 const fileboolen=(val)=>{
   let msg=gfx.value.msg;
   let msg2=inp.value.msg;
+  console.log(msg2);
   if(msg=="上传中"||msg2=="上传中"){
     ElMessage.error("上传中不能关闭");
   }else{
     sdialog.value.gdadddialog=false;
-    if(val=='confirm'&&msg=="已上传"||val=='confirm'&&msg2=="已上传"){
+    if(val=='confirm'&&msg=="已上传"||val=='confirm'&&msg2=="已上传"||msg==undefined||msg2==undefined){
      guandaoapi();
   }
+ // guandaoapi();
   }
  
 }

src/view/components/MenuPhysics.vue

@@ -204,6 +204,7 @@ const getsensor = () => {
     request(params)
         .then((res) => {
             tableData.value = res.rows;
+            tableobj.value={};
         })
         .catch((err) => {
             ElMessage.error(err.returnMsg)
@@ -220,6 +221,7 @@ const addsg = () => {
     wuliobj.value.density = '';
     wuliobj.value.diffcoe = '';
     wuliobj.value.speheat = '';
+    tableobj.value={};
 
 
 }

src/view/components/MenuSensor.vue

@@ -212,7 +212,7 @@ const getsensor = () => {
     request(params)
         .then((res) => {
             tableData.value = res.rows;
-
+                tableobj.value={};
         })
         .catch((err) => {
             ElMessage.error(err.returnMsg)
@@ -228,6 +228,7 @@ const addsg = () => {
     senobj.value.type = '';
     senobj.value.site = 0.0;
     source.value.selectstr = '';
+    tableobj.value={};
 
 }
 // 添加修改的接口

src/view/components/Menudisaster.vue

@@ -173,21 +173,21 @@
               </el-form-item> -->
         <div v-if="resultactiveName=='Water'">
      <el-form-item label="水位" :label-width="formLabelWidth6">
-         <el-input v-model="desw.height" maxlength="15" class="w-50 m-2" placeholder="请输入" />
+         <el-input v-model="desw.height"   oninput ="value=value.replace(/[^0-9.]/g,'')"  maxlength="15" class="w-50 m-2" placeholder="请输入" />
      </el-form-item>
     </div>
     <div v-if="resultactiveName=='Fire'||resultactiveName=='Gass'">
-      <el-form-item label="二氧化碳浓度" :label-width="formLabelWidth6">
+      <el-form-item label="温度" :label-width="formLabelWidth6">
          <el-input v-model="desw.temperature" maxlength="15" class="w-50 m-2" placeholder="请输入" />
      </el-form-item>
      <el-form-item label="co2" :label-width="formLabelWidth6">
-         <el-input v-model="desw.co2" maxlength="15" class="w-50 m-2" placeholder="请输入" />
+         <el-input v-model="desw.co2"   oninput ="value=value.replace(/[^0-9.]/g,'')"  maxlength="15" class="w-50 m-2" placeholder="请输入" />
      </el-form-item>
      <el-form-item label="so2" :label-width="formLabelWidth6" v-if="resultactiveName=='Fire'">
-         <el-input v-model="desw.so2" maxlength="15" class="w-50 m-2" placeholder="请输入" />
+         <el-input v-model="desw.so2"   oninput ="value=value.replace(/[^0-9.]/g,'')"  maxlength="15" class="w-50 m-2" placeholder="请输入" />
      </el-form-item>
      <el-form-item label="ch4" :label-width="formLabelWidth6" v-if="resultactiveName=='Gass'">
-         <el-input v-model="desw.ch4" maxlength="15" class="w-50 m-2" placeholder="请输入" />
+         <el-input v-model="desw.ch4"   oninput ="value=value.replace(/[^0-9.]/g,'')"  maxlength="15" class="w-50 m-2" placeholder="请输入" />
      </el-form-item>
     </div>
  </el-form>

src/view/components/Menupath.vue

@@ -81,7 +81,7 @@
                         @row-click="handleDelete3($event)"
                         :highlight-current-row="currentrow1" 
                       >
-                      <el-table-column prop="ncode" label="节点编号" />
+                      <el-table-column prop="nid" label="节点编号" />
                         <el-table-column prop="nname" label="节点名称" />
                       
                         <el-table-column prop="seq" label="排序" />
@@ -145,8 +145,7 @@
          </el-dialog>
          <!-- 添加节点 -->
          <el-dialog   :append-to-body="true"  
-           align-left 
-           conter
+         align-center
            :modal="false"
             :lock-scroll="false"
             :close-on-click-modal="false"
@@ -185,7 +184,7 @@
         </div>
       </div>
       <el-form-item label="排序" :label-width="formLabelWidth6">
-                     <el-input v-model="seq" maxlength="18" class="w-50 m-2" placeholder="请输入" />
+                     <el-input v-model="seq"   oninput ="value=value.replace(/[^0-9]/g,'')"   maxlength="18" class="w-50 m-2" placeholder="请输入" />
                  </el-form-item>
         <div class="dialog-footer footer_div l_btn">
             <div class="footerbtn flex1">
@@ -296,14 +295,14 @@
  const shanchu = (val) => {
     delt.value=val;
     if(val=='1'){
-        if (  currentrow.value==false) {
+        if (JSON.stringify( tableobj.value ) == '{}') {
          ElMessage.error("你还没有选中修改的项目")
      } else {
          dialogsgdelect.value = true;
          zqname.value = tableobj.value.name;
      }
     }else{
-        if (  currentrow1.value==false) {
+        if ( JSON.stringify(childnodeobj.value) == '{}') {
          ElMessage.error("你还没有选中修改的项目")
      } else {
          dialogsgdelect.value = true;
@@ -367,7 +366,7 @@ console.log(wuliobj.value.wid)
      request(params)
          .then((res) => {
             childtableData.value=res.rows;
-    
+            childnodeobj.value={};
          })
          .catch((err) => {
        
@@ -385,6 +384,7 @@ console.log(wuliobj.value.wid)
      request(params)
          .then((res) => {
              tableData.value = res.rows;
+              tableobj.value={};
          })
          .catch((err) => {
              ElMessage.error(err.returnMsg)
@@ -398,7 +398,7 @@ console.log(wuliobj.value.wid)
      wuliobj.value.wid = '';
      wuliobj.value.code = '';
      wuliobj.value.name = '';
- 
+     tableobj.value={};
  
  }
  // 添加修改的接口
@@ -423,7 +423,7 @@ console.log(wuliobj.value.wid)
  //修改
  const amend = () => {
      add.value = "修改";
-     if (currentrow==false) {
+     if (JSON.stringify(tableobj.value) == '{}') {
          ElMessage.error("你还没有选中修改的项目")
      } else {
      addVisible.value = true;
@@ -469,6 +469,7 @@ const cadd=()=>{
     nid.value=null;
     selectstr.value=null;
     wnid.value='';
+    childnodeobj.value={};
 
 }
 // 添加路径节点
@@ -477,9 +478,10 @@ const addnode=(val)=>{
          transCode: 'D10034',
          wid: wuliobj.value.wid,
          wnid: wnid.value,
-         nid:  nid.value,
+         nid:nid.value,
          seq:seq.value
      }
+     console.log(seq.value)
      console.log(params);
      request(params)
          .then((res) => {
@@ -493,7 +495,7 @@ const addnode=(val)=>{
 // 修改
 
 const childamend=()=>{
-    if( currentrow1.value==false){
+    if(JSON.stringify(childnodeobj.value) == '{}'){
         ElMessage.error("你还没有选中修改的项目")
     }else{
         addVisiblenode.value=true;

src/view/components/NodeLine.vue

@@ -24,7 +24,7 @@
                 </div>
 
                 <el-table :row-class-name="tableRowClassName" :max-height="tableHeight" ref="multipleTableRef"
-                    :data="tableData2" style="width: 100%" @select="projectsSelectionSelect"
+                    :data="tableData2" style="width: 100%" @selection-change="projectsSelectionChange"  @select="projectsSelectionSelect"
                     :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.96) ' }">
                     <el-table-column type="selection" width="55" />
                     <el-table-column property="id" label='节点编号' />
@@ -114,24 +114,36 @@ function searchgd() {
     pipelinedata();
 }
 
+const projectsSelectionChange = (val) => {
+    // console.log(11111)
+    // console.log(val)
+    // if (val.length > 1) {
+    //     // 获取已选中的行数据
+    //     const selected = val.find(item => item.id === row.id);
+    //     // 如果已选中，则取消选中
+    //     // if (selected) {
+    //     //   this.$refs.multipleTable.toggleRowSelection(row, false);
+    //     // }
+    //   }
+}
 //选中项
 const projectsSelectionSelect = (selection, row) => {
     if (selection.length > 1) {
         multipleTableRef.value.clearSelection();
         multipleTableRef.value.toggleRowSelection(row, true);
-        multipleSelection.value = selection[1];
+        let arrp=[];
+        arrp.push(selection[1])
+        multipleSelection.value = arrp;
         return;
     }
+    // console.log(row);
     if (selection.length == 1) {
         multipleSelection.value = selection;
-
     } else if (selection.length == 0) {
 
     }
 }
 const selectfun = () => {
-    
-   // emit('queding', '');
     currentPage4.value = 1;
     if (multipleSelection.value.length != 0) {
         console.log(multipleSelection.value[0]);

src/view/components/PipeIine.vue

@@ -142,7 +142,9 @@ const projectsSelectionSelect=(selection, row)=>{
        if(selection.length>1){
         multipleTableRef.value.clearSelection();
         multipleTableRef.value.toggleRowSelection(row,true);
-        multipleSelection.value=selection[1];
+        let arrp=[];
+        arrp.push(selection[1])
+        multipleSelection.value = arrp;
         return;
        }
         if(selection.length==1){

src/view/evolutionView.vue

@@ -513,7 +513,9 @@ function pipelinedata(searchtag){
      if(selection.length>1){
       multipleTableRef.value.clearSelection();
       multipleTableRef.value.toggleRowSelection(row,true);
-      multipleSelection.value=selection[1];
+      let arrp=[];
+        arrp.push(selection[1])
+        multipleSelection.value = arrp;
       return;
      }
       if(selection.length==1){