12.11添加水泵完成

src/style/style.css

@@ -13,6 +13,9 @@ body,html{
     margin-top: 71px;
   
   }
+  /* .el-table__empty-text{
+    color: #fff;
+  } */
   .leftzs{
     position: absolute;
     background-image: url(/src/assets/img/leftzs.png);
@@ -25,6 +28,13 @@ body,html{
     height:2.6354rem;
     left: 0;
   }
+  .switchppm{
+    display: inline-block;
+    width: 126px;
+    text-align: right;
+    padding-right: 20px;
+    color: #fff;
+  }
   .reghtzs{
     position: absolute;
     background-image: url(/src/assets/img/rightzs.png);

src/view/appmian.vue

@@ -302,6 +302,7 @@ const childfun = () => {
     sourcedis.value.Gassgetdata(aid.value);
   }else{
     sourcedis.value.handledisaster(aid.value);
+    sourcedis.value.getrequest();
   }
   boundary.value.addboundary(aid.value);
   sourcedis.value.accident3(activeIndex.value);

src/view/components/InfoBoundary.vue

@@ -275,7 +275,7 @@
                   oninput ="value=value.replace(/[^0-9.]/g,'')" 
                 />
               </el-form-item>
-              <el-form-item label="二氧化碳" :label-width="formLabelWidth6">
+              <el-form-item label="二氧化碳(%)" :label-width="formLabelWidth6">
                 <el-input
                   v-model="bformInline.polcon1"
                   class="w-50 m-2"
@@ -283,7 +283,7 @@
                   oninput ="value=value.replace(/[^0-9.]/g,'')" 
                 />
               </el-form-item>
-              <el-form-item label="二氧化硫" :label-width="formLabelWidth6">
+              <el-form-item label="二氧化硫(ppm)" :label-width="formLabelWidth6">
                 <el-input
                   v-model="bformInline.polcon2"
                   class="w-50 m-2"

src/view/components/InfoDisaster.vue

@@ -261,7 +261,160 @@
               <info-boundary :classradio="classradio" /></div>
             </el-collapse-item> -->
           </el-collapse>
-        
+        <!-- 突水灾害源结束-->
+        <!-- 水泵 -->
+        <el-collapse v-model="coolactiveName1" >
+            <el-collapse-item name="2" class="imgneon">
+              <template #title>
+                <el-icon class="iconimg Frame3" fit="contain"></el-icon>
+                水泵
+              </template>
+              <div class="asides_content">
+                <div class="jc_content tablecolor">
+                  <div class="jc_padding">
+                    <div class="xian btncolor tablefocus">
+                      <el-table
+                        :data="tableDatpump"
+                        style="width: 100%"
+                        :row-class-name="tableRowClassName"
+                        :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
+                        @row-click="pumpxz($event)"
+                        :max-height="tableHeight"
+                        :highlight-current-row="currentrow" 
+                      >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
+                        <el-table-column prop="pumpname" label="水泵名称"  />
+                        <el-table-column prop="pname" label="选择巷道"  />
+                        <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-column prop="openhig"  >
+                          <template v-slot:header>
+                            <span >开起高度</span><br>
+                            <span >(m)</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="closehig" >
+                          <template v-slot:header>
+                            <span >关闭高度</span><br>
+                            <span >(m)</span>
+                          </template>
+                        </el-table-column>
+                        <!-- <el-table-column prop="site" label="性能曲线数据量"  /> -->
+                        <el-table-column label="操作" >
+                          <template #default="scope">
+                            <el-button
+                              size="small"
+                              type="success"
+                              @click="lookpump(scope.$index, scope.row)"
+                              >查看</el-button
+                            >
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div class="asdis_btn">
+                        <div
+                          class="flex_a"
+                          @click=" addpumdfun($event); sdialog.addpump = true; "
+                        >
+                          <div class="btns" :class="{tabactive: isActive === 7}" @click="changeClass(7)"><span class="spantext">添加</span></div>
+                        </div>
+                        <div class="flex_a" @click="pumpxiugai()">
+                          <div class="btns" :class="{tabactive: isActive === 8}" @click="changeClass(8)"><span class="spantext">修改</span></div>
+                        </div>
+                        <div
+                          class="flex_a"
+                          @click="pumpdel()"
+                        >
+                          <div class="btns"  :class="{tabactive: isActive === 9}" @click="changeClass(9)"><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"
+                      style="margin-top: 20px"
+                      v-show="sdialog.linetable"
+                    >
+                      <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">
+                          <el-image :src="closeimg" fit="contain"></el-image>
+                        </div>
+                      </div>
+                      <el-table
+                        :data="tableline"
+                        style="width: 100%"
+                        :max-height="tableHeight"
+                        :row-class-name="tableRowClassName"
+                        :header-cell-style="{ background: 'rgba(13, 22, 57, 0) ' }"
+                        @row-click="xnlinehande($event)"
+                        :highlight-current-row="currentrow1" 
+                      >
+                      <template v-slot:empty>
+                        <p>暂无数据</p>
+                        </template>
+                        <el-table-column prop="hight">
+                          <template v-slot:header>
+                            <span >水位高度</span><br>
+                            <span>(m)</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="flow" >
+                          <template v-slot:header>
+                            <span >流量</span><br>
+                            <span> (m³/s)</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div class="asdis_btn">
+                        <div
+                          class="flex_a"
+                          @click="clineadd(); sdialog.addline= true;
+                          "
+                        >
+                          <div class="btns" :class="{tabactive: isActive === 4}" @click="changeClass(4)"><span class="spantext">添加</span></div>
+                        </div>
+                        <div class="flex_a" @click="xiugailine()">
+                          <div class="btns" :class="{tabactive: isActive === 5}" @click="changeClass(5)"><span class="spantext"> 修改</span></div>
+                        </div>
+                        <div
+                          class="flex_a"
+                          @click="delline()
+                          "
+                        >
+                          <div class="btns" :class="{tabactive: isActive === 6}" @click="changeClass(6)"><span class="spantext">删除</span></div>
+                        </div>
+                        <div class="flex_a" @click="sdialog.linetable = false">
+                          <div class="btns"><span class="spantext">确定</span></div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </el-collapse-item>
+            <!-- <el-collapse-item name="2">
+              <div style="position: relative;">是的
+              <info-boundary :classradio="classradio" /></div>
+            </el-collapse-item> -->
+          </el-collapse>
+        <!-- 水泵结束 -->
         </div>
       </el-aside>
     </div>
@@ -423,7 +576,12 @@
                             <span  v-else>点火区</span>
                           </template>
                         </el-table-column>
-                        <el-table-column prop="gasdensity" label="瓦斯浓度" />>
+                        <el-table-column prop="gasdensity">
+                          <template v-slot:header>
+                            <span >瓦斯浓度</span><br>
+                            <span >(ppm)</span>
+                          </template>
+                          </el-table-column>
                       </el-table>
                       <div class="asdis_btn">
                         <!-- <div class="btnpading"> -->
@@ -637,7 +795,7 @@
           <h4 :id="titleId" :class="titleClass">{{zhtext}} </h4>
         </div>
       </template>
-      <el-form-item label="类型" :label-width="formLabelWidth2">
+      <el-form-item label="类型" :label-width="formLabelWidth6">
                 <el-select v-model="wasi.type" placeholder="请选择">
                   <el-option
                     v-for="item in wasi.options"
@@ -648,7 +806,7 @@
                 </el-select>
               </el-form-item>
       <div class="input">
-        <el-form-item label="瓦斯浓度" :label-width="formLabelWidth2">
+        <el-form-item label="瓦斯浓度(ppm)" :label-width="formLabelWidth6">
                 <el-input
                   v-model="wasi.gasdensity"
                   class="w-50 m-2"
@@ -758,6 +916,111 @@
         </div>
       </div>
     </el-dialog>
+    <!-- 水泵的add -->
+    <el-dialog
+      v-model="sdialog.addpump"
+      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="pumpobj.pumpname"    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="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="pumpobj.onoff"
+                inline-prompt
+                active-text="是"
+                inactive-text="否"
+                :active-value="1"
+                :inactive-value="0"
+                @change="handleSwitchChange"
+              />
+            </div>
+      <el-form-item label="开启高度(m)" :label-width="formLabelWidth6">
+            <el-input v-model="pumpobj.openhig"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2"  placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="关闭高度(m)" :label-width="formLabelWidth6">
+            <el-input v-model="pumpobj.closehig"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2"  placeholder="请输入" />
+        </el-form-item>
+      </el-form>
+        <!-- <el-form-item label="性能曲线数据量" :label-width="formLabelWidth6">
+            <el-input v-model.number="pumpobj.timeline"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
+        </el-form-item> -->
+      <div class="dialog-footer footer_div l_btn">
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button @click="closeDialog(); sdialog.addpump = false">取消</el-button>
+          </div>
+        </div>
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button
+              @click="addrequest();
+              "
+            >
+              确定
+            </el-button>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
     <!-- 选择巷道 -->
     <el-dialog
       v-model="sdialog.dialogVisiblenode"
@@ -994,6 +1257,48 @@
         </div>
       </div>
     </el-dialog>
+    <!--性能曲线的添加  -->
+    <el-dialog
+      v-model="sdialog.addline"
+      :append-to-body="true"
+      width="400"
+      align-center
+      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 class="demo-form-inline inputnuber">
+          <el-form-item label="水位高度(m)" :label-width="formLabelWidth6">
+            <el-input v-model="pumpxc.hight"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2"  placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="流量(m³/s)" :label-width="formLabelWidth6">
+            <el-input v-model="pumpxc.flow"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" 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.addline = false">取消</el-button>
+          </div>
+        </div>
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button
+              @click="xnadd();  "
+            >
+              确定
+            </el-button>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
     <!-- 删除 -->
     <el-dialog
       v-model="sdialog.dialogsgdelect"
@@ -1029,6 +1334,42 @@
           </div>
         </div>
       </div>
+    </el-dialog>
+     <!-- 水灾删除 -->
+     <el-dialog
+      v-model="sdialog.deletedata"
+      :append-to-body="true"
+      width="300"
+      align-center
+      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="sdialog.deletedata = false">取消</el-button>
+          </div>
+        </div>
+        <div class="footerbtn flex1">
+          <div class="borderimg">
+            <el-button
+              @click="deletedata();
+                sdialog.deletedata = false;
+              "
+            >
+              确定
+            </el-button>
+          </div>
+        </div>
+      </div>
     </el-dialog>
     <!-- 瓦斯的删除 -->
     <el-dialog
@@ -1104,6 +1445,8 @@ let isActive=ref(0)
 const  changeClass= (i)=>  {
  isActive.value = i;
 }
+let deltext=ref();
+let valuesw=ref(false)
 let dsite=ref();
 let state=ref();
 const changeModel= ()=>  {
@@ -1115,6 +1458,7 @@ let styX=ref({left: ""})
 let vueupshow=ref(false);
 const gfx=ref();
 const inp=ref();
+let tableDatpump=ref();
 let gid=ref("");
 let wsid=ref("");
 let gfid=ref("");
@@ -1123,6 +1467,7 @@ let tableDataws=ref([]);
 let currentrow = ref(false);
 let currentrow1 = ref(false);
 let currentrow2 = ref(false);
+let tableline=ref();
 let formLabelWidth2=ref(80);
 let wasi=ref({
   ssite:0.0,
@@ -1138,6 +1483,23 @@ let wasi=ref({
   type:'0',
   gasdensity:0,
 })
+// 水泵参数
+let  pumpobj=ref({
+    pumpid:null,
+    pumpname:'',
+    openhig:'',
+    closehig:'',
+    onoff:'0',
+    xzobj:{},
+})
+// 水泵性能 参数
+let  pumpxc=ref({
+  pumphfid:null,
+    hight:null,
+    flow:null,
+    xnobj:{},
+})
+let tishi =ref("");
 let gtableData=ref([]);
 let gjtableData=ref([]);
 const props = defineProps({
@@ -1164,15 +1526,20 @@ const Gassdialog=ref({
   blast:false,
   gather:false,
   wsaddgather:false,
+ 
 })
 const sdialog = ref({
   adddialog: false,
   dialogsgdelect: false,
   dianadddialog: false,
+  addpump:false,
   dialogVisiblenode: false,
   isDisasterfire: false,
   isDisasterwter: false,
   adddwater: false,
+  addline:false,
+  linetable:false,
+  deletedata:false,
 });
 let selectstr = ref("");
 const currentPage4 = ref(1);
@@ -1304,7 +1671,7 @@ const fireadd = () => {
     .then((res) => {
   
       ElMessage({
-        message: res.returnMsg,
+        message: "保存成功",
         type: "success",
       });
       sdialog.value.dianadddialog = false;
@@ -2018,10 +2385,262 @@ const fundeledata3 = () => {
         });
       });
     }
+    const handleSwitchChange=(value)=> {
+      pumpobj.value.onoff=value;
+    }
+// 水泵
+const addpumdfun=(e)=>{
+  var e = e || window.Event;
+  styX.value.left = e.clientX + "px";
+  currentrow.value=false;
+  zhtext.value = "添加";
+  tishi.value =zhtext.value;
+  pumpobj.value.xzobj={};
+  pumpobj.value.pumpid=null;
+  pumpobj.value.pumpname='';
+  pumpobj.value.openhig=null;
+  pumpobj.value.closehig=null;
+  pumpobj.value.onoff=0;
+  firepid.value=null;
+  source.site=null;
+  selectstr.value=null;
+  vtkmodel.clearJgAddMode() ;
+  vtkmodel.selectPipes();
+  dialogtrue.value.jgSelect();
+}
+//修改
+
+const pumpxiugai=(val)=>{
+  zhtext.value = "修改";
+  tishi.value =zhtext.value;
+  if (JSON.stringify( pumpobj.value.xzobj) == "{}") {
+    ElMessage.error("你还没有选中修改的项目");
+  } else {
+     sdialog.value.addpump = true;
+    vtkmodel.clearJgAddMode() ;
+    vtkmodel.selectPipes();
+    dialogtrue.value.jgSelect();
+    pumpobj.value.pumpid=pumpobj.value.xzobj.pumpid;
+    pumpobj.value.pumpname=pumpobj.value.xzobj.pumpname;
+    pumpobj.value.openhig=pumpobj.value.xzobj.openhig;
+    pumpobj.value.closehig=pumpobj.value.xzobj.closehig;
+    firepid.value=pumpobj.value.xzobj.pid;
+    aid.value=pumpobj.value.xzobj.aid;
+    source.site=pumpobj.value.xzobj.site;
+  }
+}
+
+//水泵的添加接口
+const addrequest=()=>{
+  if(firepid.value==null||firepid.value==""){
+    ElMessage.error("巷道不能为空")
+  }else{
+  const params = {
+    transCode: "D20002",
+     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
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: zhtext.value+"水泵成功",
+        type: "success",
+      });
+      sdialog.value.addpump = false;
+      getrequest();
+      fun3D();
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+  }
+}
+//水泵查询
+const getrequest=()=>{
+  const params = {
+    transCode: "D20001",
+    aid: aid.value,
+  };
+  request(params)
+    .then((res) => {
+        console.log(res)
+        tableDatpump.value=res.rows;
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+  }
+  // 列表选中
+ 
+const  pumpxz=(val)=>{
+  console.log(val)
+  currentrow.value=true;
+  pumpobj.value.xzobj=val;
+  firepid.value=val.pid;
+  aid.value=val.aid;
+  source.site=val.site;
+  selectstr.value=val.pname;
+  pumpobj.value.onoff=val.onoff;
+}
+//查看
+const lookpump=(index,row)=>{
+  sdialog.value.linetable=true;
+  pumpobj.value.pumpid=row.pumpid;
+  xngetdata();
+}
+// 性能表格
+const clineadd=()=>{
+  currentrow1.value=false;
+  zhtext.value = "添加";
+  tishi.value =zhtext.value;
+  pumpxc.value.hight=null;
+  pumpxc.value.flow=null;
+  pumpxc.value.pumphfid=null;
+
+
+}
+//性能表添加接口
+const xnadd=()=>{
+  if(pumpxc.value.hight==''||pumpxc.value.hight==null){
+    ElMessage.error("水位高度不能空")
+  }else if(pumpxc.value.flow==''||pumpxc.value.flow==null){
+    ElMessage.error("流量不能为空")
+  }else{
+  const params = {
+    transCode: "D20005",
+    pumphfid:pumpxc.value.pumphfid,
+    pumpid:pumpobj.value.xzobj.pumpid,
+    hight:parseFloat(pumpxc.value.hight),
+    flow:parseFloat(pumpxc.value.flow)
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message:  tishi.value+"性能曲线",
+        type: "success",
+      });
+      xngetdata();
+      sdialog.value.addline=false;
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+  }
+}
+//性能表查询接口
+const xngetdata=()=>{
+  const params = {
+    transCode: "D20004",
+    pumpid:pumpobj.value.pumpid,
+ 
+  };
+  request(params)
+    .then((res) => {
+console.log(res)
+tableline.value=res.rows;
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+}
+// 性能选中
+
+const xnlinehande=(val)=>{
+  console.log(val);
+  pumpxc.value.xnobj=val;
+  currentrow1.value=true;
+  pumpxc.value.pumphfid=val.pumphfid;
+  pumpobj.value.xzobj.pumpid=val.pumpid;
+}
+// 性能修改
+const xiugailine=()=>{
+  zhtext.value = "修改";
+  tishi.value =zhtext.value;
+  if (JSON.stringify( pumpxc.value.xnobj) == "{}") {
+    ElMessage.error("你还没有选中修改的项目");
+  } else {
+     sdialog.value.addline= true;
+     pumpxc.value.hight=pumpxc.value.xnobj.hight;
+     pumpxc.value.flow=pumpxc.value.xnobj.flow;
+
+  }
+}
+ //水泵删除
+
+ const  getshuidel=()=>{
+ const params = {
+    transCode: "D20003",
+    pumpid:pumpobj.value.xzobj.pumpid,
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: "水泵删除成功",
+        type: "success",
+      });
+      sdialog.value.linetable=false;
+      getrequest();
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+ }
+ const pumpdel=()=>{
+    if (JSON.stringify( pumpobj.value.xzobj) == "{}") {
+    ElMessage.error("你还没有选中修改的项目");
+  } else {
+    sdialog.value.deletedata = true;
+    deltext.value='水泵';
+    zqname.value=pumpobj.value.pumpname;
+ 
+  }
+  }
+
+//性能删除
+const deletedata=()=>{
+if(deltext.value=='性能'){
+  const params = {
+    transCode: "D20006",
+    pumphfid:pumpxc.value.pumphfid,
+  };
+  request(params)
+    .then((res) => {
+      ElMessage({
+        message: "删除成功",
+        type: "success",
+      });
+      xngetdata();
+    })
+    .catch((err) => {
+      ElMessage.error(err.returnMsg);
+    });
+}else if(deltext.value=='水泵'){
+  getshuidel()
+}else{
+
+}
+
+}
+const delline=()=>{
+ 
+  if (JSON.stringify(pumpxc.value.xnobj) == "{}") {
+    ElMessage.error("你还没有选中修改的项目");
+  } else {
+    deltext.value='性能';
+    sdialog.value.deletedata = true;
+  
+  }
+}
 onMounted(() => {
   
 });
-defineExpose({ sour, accident3, handledisaster,changeModel,Gassgetdata});
+defineExpose({ sour, accident3, handledisaster,changeModel,Gassgetdata,getrequest});
 </script>
 
 

src/view/components/MenuMine.vue

@@ -37,7 +37,7 @@
                                             <p>暂无数据</p>
                                             </template>
                                             <el-table-column prop="id"  label="序号" width="80px" />
-                                            <el-table-column prop="code" label="节点编号" />
+                                            <!-- <el-table-column prop="code" label="节点编号" /> -->
                                             <el-table-column prop="name" label="节点名称" />
                                             <el-table-column prop="x" label="X" >
                                                 <template #default="scope">
@@ -253,13 +253,15 @@
     <div class="demo-input-suffix firsttitle magintop guand_1">
         <el-form-item label="截面类型" :label-width="formLabelWidth7">
             <el-select v-model="guandaoobj.sectionType" placeholder="请选择">
-                <el-option v-for="item in options" :key="item.id" :label="item.label"
-                    :value="item.value">
+                <el-option v-for="item in options" :key="item.id"
+                    :label="item.label"
+                    :value="item.value"> 
+                    <!-- -->
                      <!-- <template #prefix> 
                         <el-image :src="item.image" ></el-image>
                      </template>  -->
                      <el-image :src="item.image" ></el-image>
-                     <span style="padding-left: 10px;">{{item.value}}</span>
+                     <span style="padding-left: 10px;">{{item.label}}</span>
                     </el-option>
             </el-select>
             <div class="btn2">
@@ -425,51 +427,68 @@ let tishi=ref('');
   let tableHeight = ref(280);
   let total = ref(1);
   let searchtag = ref("");
+  const statusMap = {
+  'CIRCULAR': '圆形',
+  'RECTANGLE': '矩形',
+  'SEMICIRCULAR': '半椭圆形',
+  'SEMIELLIPTICAL': '半圆形',
+  'EGG': '蛋形',
+  'GOTHIC': '哥特形',
+  'MODBASKETHANDLE': '更正蓝形',
+  'ARCH': '拱形',
+  'RECT_ROUND': '弧底矩形',
+  'BASKETHANDLE': '蓝形',
+  'HORSESHOE': '马蹄形',
+  'RECT_TRIANGULAR': '三角底矩形',
+  'VERT_ELLIPSE': '竖向椭圆',
+  'HORZI_ELLIPSE': '水平椭圆',
+  'CATENARY': '悬链式',
+};
   let options = ref([
   {
-      label: 'CIRCULAR', value: "CIRCULAR",image:y
+      label: '圆形', value: "CIRCULAR",image:y
   },
   {
-      label: 'RECTANGLE', value: "RECTANGLE",image:j
+      label: '矩形', value: "RECTANGLE",image:j
   },
     {
-      label: 'SEMICIRCULAR', value: "SEMICIRCULAR",image:m1
+      label: '半椭圆形', value: "SEMICIRCULAR",image:m1
   },
   {
-      label: 'SEMIELLIPTICAL', value: "SEMIELLIPTICAL",image:m2
+      label: '半圆形', value: "SEMIELLIPTICAL",image:m2
   },
   {
-      label: 'EGG', value: "EGG",image:m3
+      label: '蛋形', value: "EGG",image:m3
   },
   {
-      label: 'GOTHIC', value: "GOTHIC",image:m4
+      label: '哥特形', value: "GOTHIC",image:m4
   },
   {
-      label: 'MODBASKETHANDLE', value: "MODBASKETHANDLE",image:m5
+      label: '更正蓝形', value: "MODBASKETHANDLE",image:m5
   },
   {
-      label: 'ARCH', value: "ARCH",image:m6
+      label: '拱形', value: "ARCH",image:m6
   },
   {
-      label: 'RECT_ROUND', value: "RECT_ROUND",image:m7
+      label: '弧底矩形', value: "RECT_ROUND",image:m7
   },
   {
-      label: 'BASKETHANDLE', value: "BASKETHANDLE",image:m8
+      label: '蓝形', value: "BASKETHANDLE",image:m8
   },
   {
-      label: 'HORSESHOE', value: "HORSESHOE",image:m9
+      label: '马蹄形', value: "HORSESHOE",image:m9
   },
   {
-      label: 'RECT_TRIANGULAR', value: "RECT_TRIANGULAR",image:m10
+      label: '三角底矩形', value: "RECT_TRIANGULAR",image:m10
   },
   {
-      label: 'VERT_ELLIPSE', value: "VERT_ELLIPSE",image:m11
+      label: '竖向椭圆', value: "VERT_ELLIPSE",image:m11
   },
   {
-      label: 'HORZI_ELLIPSE', value: "HORZI_ELLIPSE",image:m12
+      label: '水平椭圆', value: "HORZI_ELLIPSE",image:m12
   },
   {
-      label: 'CATENARY', value: "CATENARY",image:m13
+      label: '悬链式', value: "CATENARY",image:m13
   },
  
   ])
@@ -691,7 +710,13 @@ let tishi=ref('');
       }
       request(params)
           .then((res) => {
-              tableData3.value = res.rows;
+            tableData3.value = res.rows.map(item => {
+                    return {
+                        ...item,
+                        sectionType: statusMap[item.sectionType] || '未知' // 如果状态不存在，默认设置为'未知'
+                    };
+                    });
+         
               gd.value.total = res.total;
           })
           .catch((err) => {
@@ -826,6 +851,7 @@ let tishi=ref('');
       } else {
           zhtext.value = '修改';
           tishi.value=zhtext.value;
+          let sectionType=gddata.value.sectionType;
           sdialog.value.gdadddialog = true;
           guandaoobj.value.code = gddata.value.code;
           guandaoobj.value.pid = gddata.value.id;
@@ -839,6 +865,53 @@ let tishi=ref('');
           guandaoobj.value.sectionPara3 = gddata.value.sectionPara3;
           guandaoobj.value.sectionPara4 = gddata.value.sectionPara4;
           guandaoobj.value.sectionPara5 = gddata.value.sectionPara5;;
+          switch (sectionType) {
+          case '圆形':
+          guandaoobj.value.sectionType='CIRCULAR'
+              break;
+          case "矩形":
+          guandaoobj.value.sectionType='RECTANGLE'
+              break;
+          case '半椭圆形':
+          guandaoobj.value.sectionType='SEMICIRCULAR'
+              break;
+          case '半圆形':
+          guandaoobj.value.sectionType='SEMIELLIPTICAL'
+              break;
+              case '蛋形':
+        guandaoobj.value.sectionType='EGG'
+              break;
+          case "哥特形":
+          guandaoobj.value.sectionType='GOTHIC'
+              break;
+          case '更正蓝形':
+          guandaoobj.value.sectionType='MODBASKETHANDLE'
+              break;
+          case '拱形':
+          guandaoobj.value.sectionType='ARCH'
+          break;
+          case "弧底矩形":
+          guandaoobj.value.sectionType='RECT_ROUND'
+              break;
+          case '蓝形':
+          guandaoobj.value.sectionType='BASKETHANDLE'
+              break;
+          case '马蹄形':
+          guandaoobj.value.sectionType='HORSESHOE'
+          break;
+          case "三角底矩形":
+          guandaoobj.value.sectionType='RECT_TRIANGULAR'
+              break;
+          case '竖向椭圆':
+          guandaoobj.value.sectionType='VERT_ELLIPSE'
+              break;
+          case '水平椭圆':
+          guandaoobj.value.sectionType='HORZI_ELLIPSE'
+          break;
+          case '悬链式':
+          guandaoobj.value.sectionType='CATENARY'
+          break;
+      }
         //   guandaoobj.value.sectionPara4 = gddata.value.sectionPara4;
         //   guandaoobj.value.sectionPara5 = gddata.value.sectionPara5;;
           Gassaddgfid( gddata.value.gfid);

src/view/index/first-left.vue

@@ -49,7 +49,7 @@
               </div>
             </div>
               <div class="zongji">
-                <div class="zongjili img1">{{ warnin2 }}<span>个</span></div>
+                <!-- <div class="zongjili img1">{{ warnin2 }}<span>个</span></div> -->
                 <div class="zongjili img2">{{ warnin}}<span>个</span></div>
               </div>
               <div class="asides_content">
@@ -69,9 +69,9 @@
                       <template v-slot:empty>
                           <p>暂无数据</p>
                       </template>
-                      <el-table-column  prop="chname" label="监测点" width="120"  />
+                      <el-table-column  prop="chname" label="监测点"   />
                 
-                      <el-table-column
+                      <el-table-column  width="60"
                           v-for="(header, index) in dynamicHeaders"
                           :key="index"
                           :prop="header.prop"

src/view/result/Wdisaster.vue

@@ -5,7 +5,7 @@
               <div class="jc_content tablecolor">
                 <div class="jc_padding">
                   <div class="re_tele">灾害信息展示
-                    <div class="btn" style="display: none;">生成报告</div>
+                    <div class="btn">生成报告</div>
                   </div >
                   <div class="jiancd">
                   <div class="je_left duijc">
@@ -45,7 +45,7 @@
                 </div>
                   <div class="je_right duijc">
                     <div class="">
-                    <div class="zongjili img1">{{warnin2}}<span>个</span></div>
+                    <!-- <div class="zongjili img1">{{warnin2}}<span>个</span></div> -->
                     <div class="zongjili img2">{{warnin}}<span>个</span></div>
                   </div>
                   </div>

src/view/result/Wdisaster2.vue

@@ -5,7 +5,7 @@
               <div class="jc_content tablecolor">
                 <div class="jc_padding">
                   <div class="re_tele">灾害信息展示
-                    <div class="btn" style="display: none;">生成报告</div>
+                    <div class="btn" >生成报告</div>
                   </div >
                   <div class="jiancd">
                   <div class="je_left duijc">
@@ -45,7 +45,7 @@
                 </div>
                   <div class="je_right duijc">
                     <div class="">
-                    <div class="zongjili img1">{{warnin2}}<span>个</span></div>
+                    <!-- <div class="zongjili img1">{{warnin2}}<span>个</span></div> -->
                     <div class="zongjili img2">{{warnin}}<span>个</span></div>
                   </div>
                   </div>