锁定站和开关布局 必填地图名称

src/views/mes/dv/lotoStation/index.vue

@@ -173,6 +173,12 @@
         <el-form-item label="锁定站名称" prop="lotoName">
           <el-input v-model="form.lotoName" placeholder="请输入锁定站名称" />
         </el-form-item>
+        <el-form-item label="地图名称" prop="mapId">
+          <el-select style="width:290px" v-model="form.mapId" placeholder="地图名称">
+            <el-option v-for="item in this.MapOptions" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
 <!--        <el-row>-->
 <!--          <el-col :span="15">-->
 <!--            <el-form-item label="锁定站编码" prop="lotoCode">-->
@@ -215,12 +221,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="地图名称" prop="mapId">
-          <el-select style="width:290px" v-model="form.mapId" placeholder="地图名称">
-            <el-option v-for="item in this.MapOptions" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item label="锁定站信息" prop="map">
           <el-input
             v-model="form.map"
@@ -305,6 +306,9 @@ export default {
         lotoName: [
           { required: true, message: "锁定站名称不能为空", trigger: "blur" },
         ],
+        mapId:[
+          { required: true, message: "地图名称不能为空", trigger: "blur" },
+        ]
       },
       // 日期选择
       pickerOptions: {

src/views/mes/dv/switchmanagement/index.vue

@@ -152,10 +152,16 @@
         <el-form-item label="布局名称" prop="switchMapName">
           <el-input v-model="form.switchMapName" placeholder="请输入布局名称" />
         </el-form-item>
-
+        <el-form-item label="地图名称" prop="mapId">
+          <el-select style="width:290px" v-model="form.mapId" placeholder="地图名称">
+            <el-option v-for="item in this.MapOptions" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="排序" prop="orderNum">
           <el-input-number type="number" v-model="form.orderNum" />
         </el-form-item>
+
         <el-form-item label="岗位" prop="workstationId" >
           <treeselect v-model="form.workstationId" :options="marsOptions" :normalizer="Marsnormalizer" placeholder="选择岗位"/>
         </el-form-item>
@@ -173,12 +179,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="地图名称" prop="mapId">
-          <el-select style="width:290px" v-model="form.mapId" placeholder="地图名称">
-            <el-option v-for="item in this.MapOptions" :key="item.id" :label="item.name" :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
+
         <el-form-item label="布局信息" prop="map">
           <el-input
             v-model="form.map"
@@ -263,6 +264,9 @@ export default {
         switchMapName: [
           { required: true, message: "布局名称不能为空", trigger: "blur" },
         ],
+        mapId:[
+          { required: true, message: "地图名称不能为空", trigger: "blur" },
+        ]
       },
       // 日期选择
       pickerOptions: {
@@ -456,11 +460,7 @@ export default {
     look(row) {
       console.log(row, "row预览");
       const data = row.switchMapId;
-      if(row.mapId==null){
-        this.$message.warning('无绑定地图，请先绑定')
-      }else {
-        this.$router.push(`/mes/dv/switchmanagement/index/LookDetail?switchMapId=${data}`);
-      }
+      this.$router.push(`/mes/dv/switchmanagement/index/LookDetail?switchMapId=${data}`);
       // this.dialogVisibleMap = true; // 显示地图预览弹框
     },
     /** 删除按钮操作 */