风险信息必填项bug修复

ruoyi-ui/src/views/ehs/ehsRisk/index.vue

@@ -302,7 +302,7 @@
 
     <!-- 添加或修改风险信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
           <el-col :span="8">
             <el-form-item label="风险点等级" prop="riskGrade">
@@ -330,17 +330,39 @@
           </el-col>
         </el-row>
 
-        <el-form-item label="风险点位置" prop="riskLocation">
+
-          <el-input v-model="form.riskLocation1" placeholder="请输入风险点位置" style="width: 200px;"/>村（社区）
+        <el-row>
-          <el-input v-model="form.riskLocation2" placeholder="请输入风险点位置"  style="width: 200px;"/>位置
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="风险点位置" prop="riskLocation1">
+              <el-input v-model="form.riskLocation1" placeholder="请输入村(社区)" style="width: 200px;"/>村(社区)
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item  label-width="0px" prop="riskLocation2">
+              <el-input v-model="form.riskLocation2" placeholder="请输入详细位置"  style="width: 200px;"/>位置
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+
         <el-form-item label="风险点概况" prop="riskDesc">
           <el-input v-model="form.riskDesc" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="涉及群众数量" prop="peopleQuantity">
+
-          <el-input v-model="form.peopleQuantity1" placeholder="请输入涉及群众数量" style="width: 200px;"/>户
+
-          <el-input v-model="form.peopleQuantity2" placeholder="请输入涉及群众数量" style="width: 200px;"/>人
+        <el-row>
-        </el-form-item>
+          <el-col :span="12">
+            <el-form-item label="涉及群众数量" prop="peopleQuantity1">
+              <el-input v-model="form.peopleQuantity1" placeholder="请输入户数" style="width: 200px;"/>户
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item  label-width="0px" prop="peopleQuantity2">
+              <el-input v-model="form.peopleQuantity2" placeholder="请输入人数"  style="width: 200px;"/>人
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="抢险救援物资保障地点" prop="materialsAddr">
           <el-input v-model="form.materialsAddr" placeholder="请输入抢险救援物资保障地点" />
         </el-form-item>
@@ -488,24 +510,24 @@
           riskGrade: [
             { required: true, message: "风险点等级不能为空", trigger: "change" }
           ],
-          riskLocation: [
+          /* riskLocation: [
             { required: true, message: "风险点位置不能为空", trigger: "change" }
-          ],
-          /* riskLocation1: [
-            { required: true, message: "位置不能为空", trigger: "change" }
           ], */
-          /* riskLocation2: [
+          riskLocation1: [
+            { required: true, message: "位置不能为空", trigger: "change" }
+          ],
+          riskLocation2: [
             { required: true, message: "位置不能为空", trigger: "change" }
-          ], */
-          peopleQuantity: [
-            { required: true, message: "涉及群众数量不能为空", trigger: "change" }
           ],
-         /*  peopleQuantity1: [
+         /*  peopleQuantity: [
             { required: true, message: "涉及群众数量不能为空", trigger: "change" }
           ], */
-          /* peopleQuantity2: [
+          peopleQuantity1: [
             { required: true, message: "涉及群众数量不能为空", trigger: "change" }
-          ], */
+          ],
+          peopleQuantity2: [
+            { required: true, message: "涉及群众数量不能为空", trigger: "change" }
+          ],
           reportAddressType: [
             { required: true, message: "风险点类型不能为空", trigger: "change" }
           ],