Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-hs into develop

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/components/PeopleCard/index.vue

@@ -42,6 +42,10 @@ export default {
           key: "name",
           label: "姓名"
         },
+        {
+          key: "type",
+          label: "类型"
+        },
         {
           key: "postName",
           label: "岗位"
@@ -72,6 +76,7 @@ export default {
     display: flex;
     flex-direction: column;
     gap: 6px;
+    font-size: 14px;
   }
 
   .btns {

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/components/AddNEditDialog.vue

@@ -7,7 +7,7 @@
         ref="FormConfigRef"
         :formList="formList"
         column="1"
-        labelWidth="90px"
+        labelWidth="100px"
       />
     </div>
 
@@ -68,6 +68,24 @@ export default {
             },
           ],
         },
+        {
+          label: "人员类型:",
+          key: "employeesType",
+          required: true,
+          type: "select",
+          options: {
+            options: [
+              {
+                key: 1,
+                label: "路管人员",
+              },
+              {
+                key: 2,
+                label: "应急人员",
+              },
+            ],
+          },
+        },
         {
           label: "岗位:",
           key: "postId",
@@ -127,7 +145,7 @@ export default {
         getSelectOptionsStation(2),
       ]).then(([post, organization]) => {
         if (post.status === "fulfilled" && post.value.code == 200) {
-          this.formList[2].options.options = post.value.data.map((item) => ({
+          this.formList[3].options.options = post.value.data.map((item) => ({
             key: item.postId + "",
             label: item.postName,
           }));
@@ -137,7 +155,7 @@ export default {
           organization.status === "fulfilled" &&
           Array.isArray(organization.value)
         ) {
-          this.formList[3].options.options = organization.value;
+          this.formList[4].options.options = organization.value;
         }
       });
     },
@@ -181,7 +199,7 @@ export default {
 <style lang="scss" scoped>
 .AddNEditDialog {
   width: 450px;
-  height: 150px;
+  height: 200px;
   display: flex;
   flex-direction: column;
   gap: 15px;

ruoyi-ui/src/views/JiHeExpressway/pages/control/event/businessDataManagement/views/firstResponders/index.vue

@@ -203,7 +203,7 @@ export default {
     grid-gap: 9px;
     // grid-auto-flow: row;
     justify-content: space-between;
-    grid-auto-rows: minmax(270px, max-content);
+    grid-auto-rows: minmax(280px, max-content);
     position: relative;
   }
 }