3.13

src/components/layout/NavigateBar.vue

@@ -187,7 +187,6 @@ onMounted(() => {
     right: 0;
     display: flex;
   .ve_time{
-    width: 190px;
     height: 55px;
     padding-top: 15px;
     height: 70px;

src/view/InfoDialoges.vue

@@ -15,7 +15,7 @@
                 <el-radio-group v-model="classradio1" class="radio-group">
                     <el-radio label="Fire">火灾</el-radio>
                     <el-radio label="Water">突水</el-radio>
-                    <el-radio label="9">瓦斯爆炸</el-radio>
+                    <!-- <el-radio label="9">瓦斯爆炸</el-radio> -->
                 </el-radio-group>
             </div>
 
@@ -483,8 +483,7 @@ const handleCurrentChange = ({ row, rowIndex }) => {
 
 // 类型选择
 const classclick = () => {
-
-        console.log( dialogVisible.value);
+    scoperadio.value="";
     dialog.value.dialogVisible_fire = true;
     classradio.value = classradio1.value;
     props.addselect();
@@ -502,8 +501,10 @@ const accident = () => {
         emit('moxingclick', true);
         pollute();
         emit('handleSelect', '1');
+
     }
     fetchFileContent();
+
 }
 // const accident2 = () => {
 //     if (classradio.value == "Fire") {
@@ -572,7 +573,6 @@ function handleCurrentChange2(val) {
 }
 // 事故添加按钮
 const addsg = (val) => {
-    console.log(val);
     if (val == '1') {
         shigtext.value = '事故添加';
         aid.value = 0;
@@ -1383,7 +1383,7 @@ defineExpose({ monitor, accident2, leftcoll, classradio, aid, dialogVisible ,add
 }
 
 .ddd .el-form-item {
-    width: 80%;
+    width: 72% ;
 }
 
 /* .el-input__inner::placeholder {

src/view/appmian.vue

@@ -290,7 +290,6 @@ const handleSelect = (key) => {
         display: flex;
 
         .ve_time {
-            width: 190px;
             height: 55px;
             padding-top: 15px;
             height: 70px;

src/view/components/InfoAnimation.vue

@@ -1112,9 +1112,6 @@ defineExpose({ monitor, accident5 });
   width: 100%;
 }
 
-.ddd .el-form-item {
-  width: 80%;
-}
 
 /* .el-input__inner::placeholder {
                 color: #fff !important;

src/view/components/InfoDisaster.vue

@@ -22,7 +22,7 @@
                         :row-class-name="tableRowClassName"
                         max-height="350px"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
-                        :highlight-current-row="true"
+                      :highlight-current-row="currentrow" 
                       >
                         <el-table-column prop="pname" label="选择巷道" width="130" />
                         <el-table-column prop="site" label="位置" width="70" />
@@ -45,7 +45,7 @@
                             sdialog.dianadddialog = true;
                           "
                         >
-                          <div class="btns"><span class="spantext">添加</span></div>
+                          <div class="btns" ><span class="spantext">添加</span></div>
                         </div>
                         <div class="flex_a" @click="xiugaitable()">
                           <div class="btns"><span class="spantext">修改</span></div>
@@ -54,12 +54,10 @@
                           class="flex_a"
                           @click="
                             shanchu('1');
-                            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>
                     <!--  -->
@@ -82,12 +80,12 @@
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
                         :max-height="tableHeight"
                         @row-click="handleDelete2($event)"
-                        :highlight-current-row="true"
+                        :highlight-current-row="currentrow1" 
                       >
                         <el-table-column prop="timeline" label="时间" width="70" />
                         <el-table-column prop="val1" label="温度℃" width="70" />
                         <el-table-column prop="val2" label="污染物1浓度" width="100" />
-                        <el-table-column prop="val2" label="污染物2浓度" width="100" />
+                        <el-table-column prop="val3" label="污染物2浓度" width="100" />
                       </el-table>
                       <div class="asdis_btn">
                         <div
@@ -95,6 +93,7 @@
                           @click="
                             firinit();
                             sdialog.adddialog = true;
+                            currentrow1=false;
                           "
                         >
                           <div class="btns"><span class="spantext">添加</span></div>
@@ -149,7 +148,7 @@
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
                         @row-click="handleDelete($event)"
                         max-height="350px"
-                        :highlight-current-row="true"
+                        :highlight-current-row="currentrow" 
                       >
                         <el-table-column prop="pname" label="选择巷道" width="130" />
                         <el-table-column prop="site" label="位置" width="70" />
@@ -181,7 +180,7 @@
                           class="flex_a"
                           @click="
                             shanchu('1');
-                            sdialog.dialogsgdelect = true;
+                        
                           "
                         >
                           <div class="btns"><span class="spantext">删除</span></div>
@@ -211,7 +210,7 @@
                         :row-class-name="tableRowClassName"
                         :header-cell-style="{ background: 'rgba(13, 22, 57, 0.96) ' }"
                         @row-click="handleDelete3($event)"
-                        :highlight-current-row="true"
+                        :highlight-current-row="currentrow1" 
                       >
                         <el-table-column prop="timeline" label="时间" />
                         <el-table-column prop="val1" label="突水量（m³/s）" />
@@ -233,7 +232,7 @@
                           class="flex_a"
                           @click="
                             shanchu('2');
-                            sdialog.dialogsgdelect = true;
+                           
                           "
                         >
                           <div class="btns"><span class="spantext">删除</span></div>
@@ -273,12 +272,12 @@
         </div>
       </template>
       <div class="demo-input-suffix firsttitle magintop">
-        <el-form-item label="管道名称" :label-width="formLabelWidth5">
+        <el-form-item label="巷道名称" :label-width="formLabelWidth5">
           <el-input
             v-model="selectstr"
+            disabled
             class="w-50 m-2"
-            placeholder="管道名称"
-            :prefix-icon="Search"
+            placeholder="巷道名称"
           />
         </el-form-item>
         <div class="btn2">
@@ -288,11 +287,11 @@
               fireclick();
               sdialog.dialogVisiblenode = true;
             "
-            >选择管道</el-button
+            >选择巷道</el-button
           >
         </div>
         <div class="btn2" style="padding-left: 10px">
-          <el-button type="primary" @click="Dclick()">3D管道选择</el-button>
+          <el-button type="primary" @click="Dclick()">3D巷道选择</el-button>
         </div>
       </div>
       <div class="input">
@@ -329,7 +328,7 @@
         </div>
       </div>
     </el-dialog>
-    <!-- 选择管道 -->
+    <!-- 选择巷道 -->
     <el-dialog
       v-model="sdialog.dialogVisiblenode"
       width="50%"
@@ -338,7 +337,7 @@
       <template #header="{ titleId, titleClass }">
         <div class="my-header">
           <el-image :src="icon" fit="contain"></el-image>
-          <h4 :id="titleId" :class="titleClass">选择管道</h4>
+          <h4 :id="titleId" :class="titleClass">选择巷道</h4>
         </div>
       </template>
       <div class="demo-input-suffix firsttitle leftbgimg2">
@@ -347,8 +346,8 @@
             <el-input
               v-model="searchtaggd"
               class="w-50 m-2"
-              placeholder="管道名称"
-              :prefix-icon="Search"
+              placeholder="巷道名称"
+              disabled 
             />
           </el-form-item>
           <div class="asdis_btn">
@@ -439,18 +438,24 @@
       </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"
+              v-model.Number="Disastersource.timeline"
               class="w-50 m-2"
-              placeholder="请输入"
+              placeholder="请输入时间秒"
+              maxlength="12"
+              step="0.01"
+              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
             />
           </el-form-item>
           <el-form-item label="温度℃" :label-width="formLabelWidth6">
             <el-input
-              v-model="Disastersource.val1"
+              v-model.Number="Disastersource.val1"
               class="w-50 m-2"
               placeholder="请输入"
+              maxlength="10"
+              step="0.01"
+              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
             />
           </el-form-item>
           <el-form-item label="污染物1浓度" :label-width="formLabelWidth6">
@@ -458,13 +463,18 @@
               v-model="Disastersource.val2"
               class="w-50 m-2"
               placeholder="请输入"
+              maxlength="10"
+              step="0.01"
+              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
             />
           </el-form-item>
           <el-form-item label="污染物2浓度" :label-width="formLabelWidth6">
             <el-input
-              v-model="Disastersource.val3"
+              v-model.Number="Disastersource.val3"
               class="w-50 m-2"
               placeholder="请输入"
+              maxlength="10"
+              oninput ="value=value.replace(/^0|[^0-9]/g,'')" 
             />
           </el-form-item>
         </el-form>
@@ -598,6 +608,8 @@ const changeModel= ()=>  {
   vtkmodel.clearJgAddMode();
   vtkmodel.renderWindow.render();
 }
+let currentrow = ref(false);
+let currentrow1 = ref(false);
 const props = defineProps({
   classradio: {
     type: String,
@@ -646,11 +658,11 @@ const formLabelWidth6 = ref(120);
 let source = reactive({ pname: "", site: 0.1 });
 let Disastersource = ref({
   svid: 0,
-  timeline: "",
-  val1: "",
-  val2: "",
-  val3: "",
-  val4: "",
+  timeline:Number,
+  val1:Number,
+  val2: Number,
+  val3:Number,
+  val4:Number,
 });
 let tableobj = ref({});
 const tableData2 = ref([]);
@@ -716,6 +728,10 @@ const handledisaster = (aidval) => {
 };
 // 灾情源添加
 const fireadd = () => {
+  currentrow.value = false;
+  if(firepid.value==null||firepid.value==""){
+    ElMessage.error("巷道不能为空")
+  }else{
   const params = {
     transCode: "D00004",
     pid: firepid.value,
@@ -734,6 +750,7 @@ const fireadd = () => {
     .catch((err) => {
       ElMessage.error(err.returnMsg);
     });
+  }
 };
 //添加保存
 const handleEditfire = () => {
@@ -753,13 +770,28 @@ const handleEditfire = () => {
 };
 //灾情源删除
 const handleDelete = (val) => {
-  console.log(val);
-  tableobj.value = val;
-  firesid.value = val.sid;
   zqname.value = val.pname;
+  tableobj.value=val;
+  currentrow.value=true;
+  shanchu.value = val;
+  sdialog.dialogsgdelect = true;
+  firesid.value = val.sid;
+
+    // }
 };
 const shanchu = (val) => {
-  biaoid.value = val;
+  console.log(val)
+  if(val=='1'){
+  if (zqname.value == "") {
+ ElMessage.error("你还没有选中删除的项目")
+ } else {
+    sdialog.value.dialogsgdelect = true;
+  
+    biaoid.value = val;
+    }
+  }else {
+
+  }
 };
 const fundeledata = () => {
   if (biaoid.value == "1") {
@@ -786,7 +818,7 @@ const fundeledata2 = () => {
       ElMessage.error(err.returnMsg);
     });
 };
-// 管道搜索
+// 巷道搜索
 function searchgd() {
   pipelinedata(searchtaggd.value);
 }
@@ -797,6 +829,7 @@ const handleCurrentChange = (val) => {
 };
 //新建fire
 const newtable = () => {
+  currentrow.value=false;
   selectstr.value = "";
   firepid.value = "";
   source.site = 0;
@@ -808,9 +841,10 @@ const newtable = () => {
 const xiugaitable = () => {
   gdadd.value = "3";
   zhtext.value = "修改";
-  if (JSON.stringify(tableobj.value) == "{}") {
+  if (zqname.value == "") {
     ElMessage.error("你还没有选中修改的项目");
   } else {
+    console.log(tableobj.value)
     sdialog.value.dianadddialog = true;
     aid.value = tableobj.value.aid;
     firepid.value = tableobj.value.pid;
@@ -868,7 +902,7 @@ const projectsSelectionSelect = (selection, row) => {
 
   // console.log(row)
 };
-//管道数据查询
+//巷道数据查询
 const pipelinedata = (searchtag) => {
   const params = {
     transCode: "D00001",
@@ -1002,6 +1036,7 @@ const zaiyuxiugaiapi = () => {
 // 灾源突水检测添加
 //灾情检测删除
 const handleDelete2 = (val) => {
+  currentrow1.value=true;
   console.log(val);
   jiancobj.value = val;
   firesid.value = val.sid;
@@ -1009,7 +1044,7 @@ const handleDelete2 = (val) => {
   svid.value = val.svid;
 };
 const handleDelete3 = (val) => {
-  console.log(val);
+  currentrow1.value=true;
   jiancobj.value = val;
   firesid.value = val.sid;
   zqname.value = "检测表的一条信息";

src/view/components/MenuCheck.vue

@@ -61,7 +61,7 @@
 
                 </div>
             </template>
-            <h4 class="delecttitle"> 是否确认删除 <span class="spanclad">编号{{ zqname }}</span></h4>
+            <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="dialogsgdelect = false">取消</el-button></div>
@@ -90,9 +90,9 @@
           <div class="demo-input-suffix firsttitle magintop guand_1">
             
        <el-form-item label="巷道名称" :label-width="formLabelWidth5">
-          <el-input  v-model="source.selectstr"
-              class="w-50 m-2"
-              placeholder="巷道名称"  />
+          <el-input  v-model="source.selectstr" disabled 
+              class="w-50 m-2 text-disabled"
+              placeholder="请选择巷道"  />
           </el-form-item>
           <div class="btn2">
           <el-button type="primary"  @click="fireclick();sdialog.dialogVisiblenode=true">选择巷道</el-button></div>
@@ -109,7 +109,7 @@
           </div>
           <div class="dialog-footer footer_div l_btn">
               <div class="footerbtn flex1"><div class="borderimg"><el-button @click="sdialog.dianadddialog=false">取消</el-button></div></div>
-              <div class="footerbtn flex1"><div class="borderimg"><el-button  @click="addEditaip(); sdialog.dianadddialog=false">
+              <div class="footerbtn flex1"><div class="borderimg"><el-button  @click="addEditaip(); ">
           确定
               </el-button></div></div>
           </div>
@@ -219,7 +219,7 @@ let source=ref({
 })
 let  firepid=ref("")
 const resultactiveName = ref("first");
-let tableHeight = ref(570);
+let tableHeight = ref(400);
 let tableData = ref([]);
 let tableobj = ref({});
 let zqname = ref();
@@ -306,6 +306,12 @@ const addEditaip=()=>{
     }
     request(params)
         .then((res) => {
+            sdialog.value.dianadddialog=false;
+            ElMessage({
+                message: res.returnMsg,
+                type: 'success',
+            })
+      
             tableData.value = res.rows;
             getsensor();
         })

src/view/components/MenuMine.vue

@@ -142,16 +142,16 @@
 
                 <el-form>
                     <el-form-item label="名称" :label-width="formLabelWidth6">
-                        <el-input v-model="nodeobj.name"    maxlength="12" class="w-50 m-2" placeholder="请输入" />
+                        <el-input v-model="nodeobj.name"    maxlength="18" class="w-50 m-2" placeholder="请输入" />
                     </el-form-item>
                     <el-form-item label="X" :label-width="formLabelWidth6">
-                        <el-input v-model="nodeobj.x"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
+                        <el-input v-model="nodeobj.x"  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
                     </el-form-item>
                     <el-form-item label="Y" :label-width="formLabelWidth6">
-                        <el-input v-model="nodeobj.y"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
+                        <el-input v-model="nodeobj.y"  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
                     </el-form-item>
                     <el-form-item label="Z" :label-width="formLabelWidth6">
-                        <el-input v-model="nodeobj.z"  maxlength="10" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
+                        <el-input v-model="nodeobj.z"  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
                     </el-form-item>
 
                 </el-form>
@@ -201,11 +201,11 @@
             </template>
             <div>
                 <el-form-item label="名称" :label-width="formLabelWidth7">
-                    <el-input v-model="guandaoobj.name"  maxlength="12" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="guandaoobj.name"  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">
-                        <el-input v-model="guandaoobj.snId" class="w-50 m-2" oninput ="value=value.replace(/[^0-9.]/g,'')"  placeholder="请选择节点序号" />
+                        <el-input v-model="guandaoobj.snId" disabled  class="w-50 m-2" oninput ="value=value.replace(/[^0-9.]/g,'')"  placeholder="请选择节点" />
                     </el-form-item>
                     <div class="btn2">
                         <el-button type="primary" @click="nodeclick('start');">选择开始节点</el-button>
@@ -213,7 +213,7 @@
                 </div>
                 <div class="demo-input-suffix firsttitle magintop guand_1">
                     <el-form-item label="结束节点" :label-width="formLabelWidth7">
-                        <el-input v-model="guandaoobj.enId" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请选择节点序号" />
+                        <el-input v-model="guandaoobj.enId" disabled="disabled"  oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请选择节点" />
                     </el-form-item>
                     <div class="btn2">
                         <el-button type="primary" @click="nodeclick('end');">选择结束节点</el-button>
@@ -258,7 +258,7 @@
                     </div>
                 </div>
                 <div class="footerbtn flex1">
-                    <div class="borderimg"><el-button @click="guandaoapi(); sdialog.gdadddialog = false">
+                    <div class="borderimg"><el-button @click="guandaoapi();">
                             确定
                         </el-button></div>
                 </div>
@@ -343,10 +343,10 @@ let nodeobj = ref({
 let guandaoobj = ref({
     pid: '',
     name: '',
-    snId: 0,
-    enId: 0,
+    snId: Number,
+    enId:Number ,
     roughCoe: '',
-    sectionType: 'circle',
+    sectionType: 'CIRCULAR',
     sectionPara1: '',
     sectionPara2: '',
     sectionPara3: '',
@@ -552,10 +552,10 @@ const guandaoadd = () => {
     currentrow1.value = false;
     guandaoobj.value.pid = '';
     guandaoobj.value.name = '';
-    guandaoobj.value.snId = 0;
-    guandaoobj.value.enId = 0;
+    guandaoobj.value.snId = '';
+    guandaoobj.value.enId = '';
     guandaoobj.value.roughCoe = '';
-    guandaoobj.value.sectionType = 'circle';
+    guandaoobj.value.sectionType = 'CIRCULAR';
     guandaoobj.value.sectionPara1 = '';
     guandaoobj.value.sectionPara2 = '';
     guandaoobj.value.sectionPara3 = '';
@@ -564,6 +564,7 @@ const guandaoadd = () => {
 }
 // 管道增加修改的接口
 const guandaoapi = () => {
+    if(guandaoobj.value.snId<guandaoobj.value.enId){
     const params = {
         transCode: 'D10002',
         pid: guandaoobj.value.pid,
@@ -577,10 +578,10 @@ const guandaoapi = () => {
         sectionPara3: guandaoobj.value.sectionPara3,
         sectionPara4: guandaoobj.value.sectionPara4,
         sectionPara5: guandaoobj.value.sectionPara5,
-
     }
     request(params)
         .then((res) => {
+            sdialog.value.gdadddialog = false;
             ElMessage({
                 message: res.returnMsg,
                 type: 'success',
@@ -590,6 +591,9 @@ const guandaoapi = () => {
         .catch((err) => {
             ElMessage.error(err.returnMsg)
         })
+    } else{
+        ElMessage.error("结束节点要大于开始节点")
+    }
 }
 // 管道删除
 //node删除
@@ -1141,9 +1145,6 @@ border-image: linear-gradient(180deg, rgba(31, 107, 255, 1), rgba(31, 107, 255,
     width: 100%;
 }
 
-.ddd .el-form-item {
-    width: 80%;
-}
 
 /* .el-input__inner::placeholder {
 			color: #fff !important;
@@ -1508,4 +1509,21 @@ ol {
 .elimg .el-image{
     height: 50px;
 }
+.el-input.is-disabled .el-input__inner{
+    color: #FFFFFF !important;
+    -webkit-text-fill-color:#FFFFFF !important;
+}
+input::-webkit-input-placeholder { /* WebKit browsers */
+color: #666;
+}
+input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+    color: #666;
+}
+input::-moz-placeholder { /* Mozilla Firefox 19+ */
+    color: #666;
+}
+input:-ms-input-placeholder { /* Internet Explorer 10+ */
+    color: #666;
+}
+
 </style>

src/view/components/MenuPhysics.vue

@@ -1,7 +1,8 @@
 <template>
+    <!-- 表格表头不一样wuli -->
     <div class="l_Dialog">
         <el-dialog v-model="sendialogVisible" width="470" align-center :modal="false" :close-on-click-modal="false"
-            modal-class="summary-dlg" draggable class="dialog_class bgcolor zhucentent wuli">
+            modal-class="summary-dlg" draggable class="dialog_class bgcolor zhucentent ">
             <template #header="{ titleId, titleClass }">
                 <div class="my-header xinxi_header">
                     <el-image :src="icon" fit="contain"></el-image>
@@ -63,19 +64,19 @@
             </template>
             <el-form class="demo-form-inline" :inline="true" :model="wuliobj">
                 <el-form-item label="编号" :label-width="formLabelWidth6">
-                    <el-input v-model="wuliobj.code" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="wuliobj.code" maxlength="15" class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <el-form-item label="名称" :label-width="formLabelWidth6">
-                    <el-input v-model="wuliobj.name" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="wuliobj.name" maxlength="18" class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <el-form-item label="密度" :label-width="formLabelWidth6">
-                    <el-input v-model="wuliobj.density" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="wuliobj.density" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <el-form-item label="扩散系数" :label-width="formLabelWidth6">
-                    <el-input v-model="wuliobj.diffcoe" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="wuliobj.diffcoe" maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')"  class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <el-form-item label="比热" :label-width="formLabelWidth6">
-                    <el-input v-model="wuliobj.speheat" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="wuliobj.speheat" maxlength="15" 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">
@@ -100,7 +101,7 @@
 
                 </div>
             </template>
-            <h4 class="delecttitle"> 是否确认删除 <span class="spanclad">编号{{ zqname }}</span></h4>
+            <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="dialogsgdelect = false">取消</el-button></div>

src/view/components/MenuSensor.vue

@@ -66,11 +66,11 @@
             </template>
             <el-form class="demo-form-inline" :inline="true" :model="senobj">
                 <el-form-item label="类型" :label-width="formLabelWidth6">
-                    <el-input v-model="senobj.type" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="senobj.type" maxlength="15" class="w-50 m-2" placeholder="请输入" />
                 </el-form-item>
                 <div class="demo-input-suffix firsttitle magintop guand_1">
                     <el-form-item label="巷道名称" :label-width="formLabelWidth6">
-                        <el-input v-model="source.selectstr" class="w-50 m-2" placeholder="巷道名称" />
+                        <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();">选择巷道</el-button>
@@ -105,7 +105,7 @@
 
                 </div>
             </template>
-            <h4 class="delecttitle"> 是否确认删除 <span class="spanclad">编号{{ zqname }}</span></h4>
+            <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="dialogsgdelect = false">取消</el-button></div>
@@ -138,7 +138,7 @@ let classradio1 = ref('Fire');
 const formLabelWidth6 = ref(100);
 let add = ref("")
 const resultactiveName = ref("first");
-let tableHeight = ref(570);
+let tableHeight = ref(400);
 let tableData = ref([]);
 let tableobj = ref({});
 let zqname = ref();
@@ -173,12 +173,11 @@ const shanchu = () => {
         ElMessage.error("你还没有选中修改的项目")
     } else {
         dialogsgdelect.value = true
-        zqname.value = tableobj.value.pname;
+        zqname.value = tableobj.value.type;
     }
 }
 const fundeledata = () => {
 
-    console.log(zqname.value);
     const params = {
         transCode: 'D10012',
         seid: tableobj.value.seid

src/view/components/SetNode.vue

@@ -17,7 +17,15 @@
           <h4 :id="titleId" :class="titleClass">{{ texttitle }}</h4>
         </div>
       </template>
-      <div>{{ msg }}</div>
+      <div class="mgstamkuang">
+      <ul>
+        <li><span>节点编号：</span>{{msg.id}}</li>
+        <li><span>名称：</span>{{msg.name}}</li>
+        <li><span>X：</span>{{msg.x}}</li>
+        <li><span>y：</span>{{msg.y}}</li>
+        <li><span>Z：</span>{{msg.z}}</li>
+      </ul>
+    </div>
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
@@ -44,7 +52,14 @@ let emit = defineEmits(['Dtext',])
 
 let dialoglog = ref(false);
 let texttitle = ref("节点信息");
-let msg = ref("内容");
+let msg=ref({
+  id: '',
+  name: "",
+  x:"",
+  y: '',
+  z: '',
+ 
+})
 defineExpose({ dialoglog });
 let timing = ref(null);
 //管道节点选择对象

src/view/components/SetPipe.vue

@@ -17,7 +17,18 @@
           <h4 :id="titleId" :class="titleClass">{{ texttitle }}</h4>
         </div>
       </template>
-      <div>{{ msg }}</div>
+      <div class="mgstamkuang">
+      <ul>
+        <li><span>名称：</span>{{msg.name}}</li>
+        <li><span>粗糙系数：</span>{{msg.roughCoe}}</li>
+        <li><span>截面类型：</span>{{msg.sectionType}}</li>
+        <li><span>截面参数1：</span>{{msg.sectionPara1}}</li>
+        <li><span>截面参数2：</span>{{msg.sectionPara2}}</li>
+        <li><span>截面参数3：</span>{{msg.sectionPara3}}</li>
+        <li><span>截面参数4：</span>{{msg.sectionPara4}}</li>
+        <li><span>截面参数5：</span>{{msg.sectionPara5}}</li>
+      </ul>
+    </div>
       <div class="dialog-footer footer_div l_btn">
         <div class="footerbtn flex1">
           <div class="borderimg">
@@ -44,7 +55,19 @@ let emit = defineEmits(['Dtext',])
 
 let dialoglog = ref(false);
 let texttitle = ref("管道信息");
-let msg = ref("内容");
+// let msg = ref("内容");
+let msg=ref({
+    name: '',
+    snId: Number,
+    enId:Number ,
+    roughCoe: '',
+    sectionType: 'CIRCULAR',
+    sectionPara1: '',
+    sectionPara2: '',
+    sectionPara3: '',
+    sectionPara4: '',
+    sectionPara5: '',
+})
 defineExpose({ dialoglog });
 let timing = ref(null);
 //管道节点选择对象
@@ -353,4 +376,18 @@ function jgSelect(){
   position: absolute;
   top: -7vh;
 }
+.mgstamkuang ul li{
+  color: #fff;
+  font-size: 14px;
+  font-weight: bold;
+  text-align: left;
+
+
+}
+.mgstamkuang ul li span{
+  display: inline-block;
+  width:140px;
+  text-align: right;
+  padding: 0 20px;
+}
 </style>

src/view/configurator.vue

@@ -235,7 +235,6 @@ watch(router, (to, from) => {
     right: 0;
     display: flex;
   .ve_time{
-    width: 190px;
     height: 55px;
     padding-top: 15px;
     height: 70px;