Merge branch 'fjc-dev' into 'dev'

fix: 应急管理-应急架构体系-队伍管理 修改样式

See merge request product-group-fe/sfy-safety-group/sfy-safety!182

src/views/emergency/organization/team-management/team-info/components/PersonalInfo.vue

@@ -19,8 +19,12 @@
       <el-table-column prop="jobTitle" label="职务" />
       <el-table-column fixed="right" label="操作">
         <template #default="scope">
-          <el-button link type="primary" size="small" @click.prevent="editRow(scope.row)"> 编辑 </el-button>
-          <el-button link type="primary" size="small" @click.prevent="deleteRow(scope.row)"> 删除 </el-button>
+          <el-button class="edit-btn" link type="primary" size="small" @click.prevent="editRow(scope.row)">
+            编辑
+          </el-button>
+          <el-button class="edit-btn" link type="primary" size="small" @click.prevent="deleteRow(scope.row)">
+            删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -126,5 +130,9 @@
   }
   .person-info-table {
     margin-top: 15px;
+
+    .edit-btn {
+      font-size: 14px;
+    }
   }
 </style>

src/views/emergency/organization/team-management/team-info/components/PositionSetting.vue

@@ -7,7 +7,7 @@
         <el-table-column align="center" label="岗位职责名称">
           <template #default="{ row, $index }">
             <el-form-item :prop="`[${$index}].title`" :rules="rules.title">
-              <el-input v-model="row.title" />
+              <el-input class="position-title" v-model="row.title" />
             </el-form-item>
           </template>
         </el-table-column>
@@ -106,5 +106,16 @@
 <style>
   .add-position-dialog {
     min-height: 0;
+
+    .el-table .cell {
+      overflow: visible;
+    }
+
+    .el-table__row > :nth-child(2) {
+      .cell {
+        height: 35px;
+        margin-top: 2px;
+      }
+    }
   }
 </style>

src/views/emergency/organization/team-management/team-info/components/TeamInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="title"> 队伍信息 </div>
+  <div class="team-info-title"> 队伍信息 </div>
   <el-form :model="formData" ref="ruleFormRef" :rules="rules" label-position="top">
     <el-form-item prop="memberCount" label="队伍人数">
       <el-input v-model="formData.memberCount" type="number" width="200" />
@@ -60,6 +60,9 @@
 </script>
 
 <style scoped lang="scss">
+  .team-info-title {
+    margin-bottom: 16px;
+  }
   // 去掉el input右侧的小箭头
   :deep(input::-webkit-outer-spin-button),
   :deep(input::-webkit-inner-spin-button) {