3.12 下班之前上传

src/view/components/MenuMine.vue

@@ -162,7 +162,7 @@
                     </div>
                 </div>
                 <div class="footerbtn flex1">
-                    <div class="borderimg"><el-button @click="nodeconfirm(); sdialog.adddialog = false">
+                    <div class="borderimg"><el-button @click="nodeconfirm()">
                             确定
                         </el-button></div>
                 </div>
@@ -201,11 +201,11 @@
             </template>
             <div>
                 <el-form-item label="名称" :label-width="formLabelWidth7">
-                    <el-input v-model="guandaoobj.name" class="w-50 m-2" placeholder="请输入" />
+                    <el-input v-model="guandaoobj.name"  maxlength="12" 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" placeholder="巷道名称" />
+                        <el-input v-model="guandaoobj.snId" 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" class="w-50 m-2" placeholder="巷道名称" />
+                        <el-input v-model="guandaoobj.enId" 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>
@@ -229,10 +229,10 @@
                                 :value="item.value"></el-option>
                         </el-select>
                         <div class="btn2">
-                            <div class="elimg"  v-if="guandaoobj.sectionType=='circle'">
-                            <el-image :src="g" fit="contain"></el-image></div>
-                            <div class="elimg"  v-else-if="guandaoobj.sectionType=='square'" ><el-image :src="j" fit="contain"></el-image></div>
-                            <div class="elimg" v-else><el-image :src="y" fit="contain"></el-image></div>
+                            <div class="elimg"  v-if="guandaoobj.sectionType=='CIRCULAR'">
+                            <el-image :src="y" fit="contain"></el-image></div>
+                            <div class="elimg"  v-else-if="guandaoobj.sectionType=='RECTANGLE'" ><el-image :src="j" fit="contain"></el-image></div>
+                            <div class="elimg" v-else><el-image :src="g" fit="contain"></el-image></div>
                         </div>
                     </el-form-item>
                 </div>
@@ -311,10 +311,10 @@ let tableHeight = ref(570);
 let total = ref(1);
 let searchtag = ref("");
 let options = ref([{
-    label: 'circle', value: "circle"
+    label: 'CIRCULAR', value: "CIRCULAR"
 },
 {
-    label: 'square', value: "square"
+    label: 'RECTANGLE', value: "RECTANGLE"
 },
 ])
 const currentPage4 = ref(1);
@@ -422,6 +422,17 @@ const addsg = () => {
 }
 //节点添加api
 const nodeconfirm = () => {
+    if(nodeobj.value.name==null){
+    ElMessage.error('名称不能为空')
+           
+    }else if(nodeobj.value.x==null){
+        ElMessage.error('X不能为空')
+    }else if(nodeobj.value.y==null){
+        ElMessage.error('Y不能为空')
+    }else if(nodeobj.value.z==null){
+        ElMessage.error("Z不能为空")
+    } else{
+    
     const params = {
         transCode: 'D10000',
         nid: nodeobj.value.nid,
@@ -434,6 +445,7 @@ const nodeconfirm = () => {
     }
     request(params)
         .then((res) => {
+            sdialog.value.adddialog = false;
             pipelinedata();
             ElMessage({
                 message: res.returnMsg,
@@ -444,6 +456,7 @@ const nodeconfirm = () => {
         .catch((err) => {
             ElMessage.error(err.returnMsg)
         })
+    }
 }
 //选中node节点的一行
 const handleDelete = (val) => {
@@ -517,6 +530,8 @@ const guandaodata = () => {
 }
 // 节点选中开始结束
 const nodeclick = (val) => {
+    console.log(111);
+    nodeselect.value.searchtaggd='';
     nodeselect.value.dialogVisiblenode = true;
     nodeselect.value.pipelinedata("");
     sideid.value = val;

src/view/components/NodeLine.vue

@@ -40,7 +40,7 @@
                 </div>
                 <div class="dialog-footer footer_div l_btn">
                     <div class="footerbtn flex1">
-                        <div class="borderimg"><el-button @click="dialogVisiblenode = false">取消</el-button></div>
+                        <div class="borderimg"><el-button @click="dialogVisiblenode = false; searchtag='';">取消</el-button></div>
                     </div>
                     <div class="footerbtn flex1">
                         <div class="borderimg"><el-button @click="queding(); dialogVisiblenode = false">
@@ -140,9 +140,10 @@ const selectfun = () => {
 }
 //  确定
 const queding = () => {
+    searchtag.value='';
     selectfun();
 }
-defineExpose({ dialogVisiblenode, pipelinedata });
+defineExpose({ dialogVisiblenode, pipelinedata,searchtaggd });
 </script>
 
 <style lang="scss" scoped>