3.1 0.4

src/view/components/Sourcedisaster.vue

@@ -69,11 +69,12 @@
           <el-table-column prop="val2" label="污染物1浓度" width="100" />
           <el-table-column prop="val2" label="污染物2浓度" width="100" />
       </el-table>
-      <div class="asdis_btn">
+    <div class="asdis_btn">
       <div class="flex_a" @click="sdialog.adddialog=true"><div class="btns"><span class="spantext">添加</span></div></div>
       <div class="flex_a" @click="shanchu('2');sdialog.dialogsgdelect=true"><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>
           
@@ -101,14 +102,16 @@
               <div class="jc_content tablecolor">
            
           <div class="jc_padding">
-              <div class="xian btncolor" >
+              <div class="xian btncolor tablefocus" >
            
                       <el-table
-              :data="tableData2"
+              :data="tableDatawat"
               style="width: 100%"
               :row-class-name="tableRowClassName"
               :header-cell-style="{'background':'rgba(13, 22, 57, 0.96) '}"
-
+              @row-click="handleDelete($event)"
+              max-height="350px"
+              :highlight-current-row="true"
               >
           <el-table-column prop="pname" label="选择巷道" width="130" />
           <el-table-column prop="site" label="位置" width="70" />
@@ -117,7 +120,7 @@
          <el-button
            size="small"
            type="success"
-           @click.stop="handlexiugai(scope.$index, scope.row)"
+           @click.stop="handledetection2(scope.$index, scope.row)"
            >查看</el-button
          >
         
@@ -125,17 +128,17 @@
      </el-table-column>
       </el-table>
       <div class="asdis_btn">
-      <div class="flex_a"><div class="btns"><span class="spantext">添加</span></div></div>
-      <div class="flex_a"><div class="btns"><span class="spantext">删除</span></div></div>
+      <div class="flex_a" @click="newtable();sdialog.dianadddialog=true"><div class="btns"><span class="spantext">添加</span></div></div>
+      <div class="flex_a" @click="shanchu('2');sdialog.dialogsgdelect=true"><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" style="margin-top: 20px;">
+              <div class="xian" style="margin-top: 20px;" v-show="sdialog.disDisasterwter">
               <div class="header_l header_z">
       <el-image :src="icon" fit="contain" ></el-image>
       <h4  class="tianjia">灾害源表</h4>
-      <div class="closeimg"><el-image :src="closeimg" fit="contain" ></el-image></div>
+      <div class="closeimg" @click="sdialog.disDisasterwter"><el-image :src="closeimg" fit="contain" ></el-image></div>
   </div>   
                       <el-table
               :data="tableData4"
@@ -146,12 +149,12 @@
               :header-cell-style="{'background':'rgba(13, 22, 57, 0.96) '}"
 
               >
-          <el-table-column prop="date" label="时间"  />
-          <el-table-column prop="name" label="突水量（m³/s）" />
+          <el-table-column prop="timeline" label="时间"  />
+          <el-table-column prop="val1" label="突水量（m³/s）" />
       </el-table>
       <div class="asdis_btn">
-      <div class="flex_a"><div class="btns"><span class="spantext">添加</span></div></div>
-      <div class="flex_a"><div class="btns"><span class="spantext">删除</span></div></div>
+      <div class="flex_a" @click="sdialog.adddwater=true"><div class="btns"><span class="spantext">添加</span></div></div>
+      <div class="flex_a" @click="shanchu('2');sdialog.dialogsgdelect=true"><div class="btns"><span class="spantext">删除</span></div></div>
       <div class="flex_a"><div class="btns"><span class="spantext">确定</span></div></div>
   </div>
       </div>
@@ -279,7 +282,7 @@
     </div>
    </div>
    </el-dialog>
- <!-- 灾害源检测数据的添加-->
+ <!-- 灾害火灾源检测数据的添加-->
       <el-dialog v-model="sdialog.adddialog" width="400"   class="dialog_class bgcolor tianjia">
           <template #header="{titleId, titleClass }">
           <div class="my-header ">
@@ -290,16 +293,16 @@
           </template>
           <div>
     <el-form>
-    <el-form-item label="时间" :label-width="formLabelWidth5">
+    <el-form-item label="时间" :label-width="formLabelWidth6">
        <el-input  v-model="Disastersource.timeline" class="w-50 m-2"  placeholder="请输入"  />
      </el-form-item>
-     <el-form-item label="温度℃"  :label-width="formLabelWidth5">
+     <el-form-item label="温度℃"  :label-width="formLabelWidth6">
        <el-input  v-model="Disastersource.val1" class="w-50 m-2"  placeholder="请输入"  />
      </el-form-item>
-     <el-form-item label="污染物1浓度"  :label-width="formLabelWidth5">
+     <el-form-item label="污染物1浓度"  :label-width="formLabelWidth6">
        <el-input  v-model="Disastersource.val2" class="w-50 m-2"  placeholder="请输入"  />
      </el-form-item>
-     <el-form-item label="污染物2浓度"  :label-width="formLabelWidth5">
+     <el-form-item label="污染物2浓度"  :label-width="formLabelWidth6">
        <el-input  v-model="Disastersource.val3" class="w-50 m-2"  placeholder="请输入"  />
      </el-form-item>
   
@@ -311,6 +314,32 @@
           确定
               </el-button></div></div>
           </div>
+      </el-dialog>
+       <!-- 灾害源突水检测数据的添加-->
+       <el-dialog v-model="sdialog.adddwater" 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>
+          <div>
+    <el-form>
+    <el-form-item label="时间" :label-width="formLabelWidth6">
+       <el-input  v-model="Disastersource.timeline" class="w-50 m-2"  placeholder="请输入"  />
+     </el-form-item>
+     <el-form-item label="突水量（m³/s）"  :label-width="formLabelWidth6">
+       <el-input  v-model="Disastersource.val1" class="w-50 m-2"  placeholder="请输入"  />
+     </el-form-item>
+    </el-form>
+  </div>
+          <div class="dialog-footer footer_div l_btn">
+              <div class="footerbtn flex1"><div class="borderimg"><el-button @click="sdialog.adddwater=false">取消</el-button></div></div>
+              <div class="footerbtn flex1"><div class="borderimg"><el-button  @click="addjiancf();sdialog.adddwater=false">
+          确定
+              </el-button></div></div>
+          </div>
       </el-dialog>
       <!-- 删除 -->
       <el-dialog v-model="sdialog.dialogsgdelect" width="400"  class="dialog_class bgcolor tianjia">
@@ -354,6 +383,8 @@
       dianadddialog:false,
       dialogVisiblenode:false,
       isDisasterfire:false,
+      isDisasterwter:false,
+      adddwater:false,
    })
    let selectstr=ref('');
    const currentPage4 = ref(1);
@@ -376,6 +407,7 @@
   const multipleTableRef = ref()
   const multipleSelection = ref([])
   const formLabelWidth5=ref(77);
+  const formLabelWidth6=ref(120);
   let source=reactive({pname:"",site:0.1})
   let Disastersource=ref({
       svid:0,
@@ -385,6 +417,7 @@
       val3:'',
       val4:'',
        })
+
    const tableData2= ref([])
   let aid=ref();
   let biaoid= ref();
@@ -449,28 +482,7 @@
    },
   
   ])
-  const tableData4=[
-    {
-     
-      date: '15.30',
-      name: '100',
-    },
-    {
-     
-     date: '15.30',
-     name: '35',
-   },
-   {
-     
-     date: '15.30',
-     name: '35',
-   },
-     {
-     
-     date: '15.30',
-     name: '35',
-   },
-  ]
+  const tableData4=ref([]);
   const  accident3=()=>{
       console.log(props.classradio);
       if(props.classradio=="Fire"){
@@ -489,7 +501,12 @@
           }
           request(params)
             .then((res) => { 
-              tableDatay.value=res.rows;
+              if(props.classradio=='Fire'){
+                tableDatay.value=res.rows
+              }else{
+                tableDatawat.value=res.rows
+              }
+            ;
             })
             .catch((err) => {
               ElMessage.error(err.returnMsg)
@@ -510,7 +527,7 @@
               message: res.returnMsg,
               type: 'success',
             })
-              getdata();
+            handledisaster(aid.value)
             })
             .catch((err) => {
             })
@@ -542,27 +559,21 @@
       biaoid.value=val;
   }
   const fundeledata=()=>{
-  
-      if( biaoid.value=='1'){
-    const params = {
-          transCode: 'D000011',
-          sid:firesid.value,
-          }
-          console.log(params);
-          request(params)
-            .then((res) => { 
-              ElMessage({
-              message: '删除成功',
-              type: 'success',
-            })
-            handledisaster(aid.value);
-            })
-            .catch((err) => {
-            })
-          }
-            else{
-              fundeledata2();
+      const params = {
+            transCode: 'D000011',
+            sid:firesid.value,
             }
+            console.log(params);
+            request(params)
+              .then((res) => { 
+                ElMessage({
+                message: '删除成功',
+                type: 'success',
+              })
+              handledisaster(aid.value);
+              })
+              .catch((err) => {
+              })
   }
   // 分页查询
    function handleSizeChange(val) {
@@ -637,6 +648,13 @@
       firesid.value=row.sid;
      getinquire();
      
+  }
+  //突水灾源检测
+  const handledetection2=(index,row)=>{
+      sdialog.value.disDisasterwter=true;
+      firesid.value=row.sid;
+     getinquire();
+     
   }
   //   灾源检测查询
   const getinquire=()=>{
@@ -648,10 +666,9 @@
             .then((res) => { 
               console.log(res.rows);
               if(props.classradio=='Fire'){
-                  console.log(1111)
                 tableDatafir.value=res.rows;
               }else{
-                tableDatawat.value=res.rows
+                tableData4.value=res.rows
               }
             })
             .catch((err) => {
@@ -662,7 +679,7 @@
   //     addjiancf();
   
   //   }
-  // 灾源检测添加
+  // 灾源火灾检测添加
   const addjiancf=()=>{
       const params = {
           transCode: 'D00006',
@@ -685,6 +702,7 @@
             .catch((err) => {
             })
   }
+  // 灾源突水检测添加
   //灾情检测删除
   const handleDelete2=(val)=>{
       console.log(val);