Merge branch 'master' of http://192.168.0.130:13000/huangxingxing/disaster_web3

src/view/components/MenuMine.vue

@@ -34,7 +34,8 @@
                                             :highlight-current-row="currentrow" :row-class-name="tableRowClassName"
                                             @row-click="handleDelete($event)"
                                             :header-cell-style="{ 'background': 'rgba(13, 22, 57,0) ' }">
-                                            <el-table-column type="index" label="节点编号" width="80px" />
+                                            <el-table-column prop="id"  label="序号" width="80px" />
+                                            <el-table-column prop="code" label="节点编号" />
                                             <el-table-column prop="name" label="节点名称" />
                                             <el-table-column prop="x" label="X" />
                                             <el-table-column prop="y" label="Y" />
@@ -83,10 +84,13 @@
                                             ref="multipleTableRef" :highlight-current-row="currentrow1"
                                             @row-click="handleDelete2($event)" :data="tableData3" style="width: 100%"
                                             :header-cell-style="{ 'background': 'rgba(13, 22, 57, 0.96) ' }">
+                                                  <el-table-column property="id" label="序号"  />
                                             <el-table-column property="snId" label="开始节点" />
                                             <el-table-column property="enId" label="结束节点" />
-                                            <el-table-column property="id" label="编号" width="70" />
+                                      
+                                            <el-table-column property="code" label="编号" width="70" />
                                             <el-table-column property="name" label="名称" width="70" />
+                                            
                                             <el-table-column property="sectionType" label="截面类型" width="120" />
                                             <el-table-column property="roughCoe" label="粗糙系数" />
                                             <el-table-column property="sectionPara1" label="截面参数1" width="90" />
@@ -150,9 +154,13 @@
 <div>
 
     <el-form>
+      <el-form-item label="编号" :label-width="formLabelWidth6">
+            <el-input v-model="nodeobj.code"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+        </el-form-item>
         <el-form-item label="名称" :label-width="formLabelWidth6">
             <el-input v-model="nodeobj.name"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
+         
         <el-form-item label="X" :label-width="formLabelWidth6">
             <el-input v-model="nodeobj.x"  maxlength="15" oninput ="value=value.replace(/[^0-9.]/g,'')" class="w-50 m-2" placeholder="请输入" />
         </el-form-item>
@@ -209,6 +217,9 @@
     </div>
 </template>
 <div>
+  <el-form-item label="编号" :label-width="formLabelWidth7">
+            <el-input v-model="guandaoobj.code"    maxlength="18" oninput ="value=value.replace(/[^\a-\z\A-\Z0-9\u4E00-\u9FA5]/g,'')"  class="w-50 m-2" placeholder="请输入" />
+        </el-form-item>
     <el-form-item label="名称" :label-width="formLabelWidth7">
         <el-input v-model="guandaoobj.name"   oninput="value=value.replace(/[^\w_]/g,'');" maxlength="18" class="w-50 m-2" placeholder="请输入" />
     </el-form-item>
@@ -358,7 +369,7 @@
       x: "",
       y: "",
       z: "",
-  
+      code:'',
   })
   let guandaoobj = ref({
       pid: '',
@@ -372,6 +383,7 @@
       sectionPara3: '',
       sectionPara4: '',
       sectionPara5: '',
+      code:'',
   })
   let gd = ref({
       total: 1,
@@ -438,6 +450,7 @@
       nodeobj.value.y = "";
       nodeobj.value.z = "";
       nodeobj.value.nid = '';
+      nodeobj.value.code = '';
   
   }
   //节点添加api
@@ -445,6 +458,8 @@
       if(nodeobj.value.name==null||nodeobj.value.name==''){
       ElMessage.error('名称不能为空')
              
+      }else if(nodeobj.value.code==null||nodeobj.value.code==''){
+          ElMessage.error('标号不能为空')
       }else if(nodeobj.value.x==null||nodeobj.value.x==''){
           ElMessage.error('X不能为空')
       }else if(nodeobj.value.y==null||nodeobj.value.y==''){
@@ -460,6 +475,7 @@
           x: nodeobj.value.x,
           y: nodeobj.value.y,
           z: nodeobj.value.z,
+          code: nodeobj.value.code,
           desc: "",
           ntype: "mid",
       }
@@ -532,6 +548,7 @@
           nodeobj.value.y = nodedata.value.y;
           nodeobj.value.z = nodedata.value.z;
           nodeobj.value.nid = nodedata.value.id;
+          nodeobj.value.code = nodedata.value.code;
       }
   }
   //巷道查询
@@ -573,6 +590,7 @@
   const guandaoadd = () => {
       sdialog.value.gdadddialog = true;
       currentrow1.value = false;
+      guandaoobj.value.code = '';
       guandaoobj.value.pid = '';
       guandaoobj.value.name = '';
       guandaoobj.value.snId = '';
@@ -590,6 +608,7 @@
       if(guandaoobj.value.snId<guandaoobj.value.enId){
       const params = {
           transCode: 'D10002',
+          code: guandaoobj.value.code,
           pid: guandaoobj.value.pid,
           name: guandaoobj.value.name,
           snId: guandaoobj.value.snId,
@@ -654,6 +673,7 @@
       } else {
           zhtext.value = '修改';
           sdialog.value.gdadddialog = true;
+          guandaoobj.value.code = gddata.value.code;
           guandaoobj.value.pid = gddata.value.id;
           guandaoobj.value.name = gddata.value.name;
           guandaoobj.value.snId = gddata.value.snId;