Merge branch 'dev-lhf' into 'dev'

style: \字典管理和菜单管理样式优化

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

src/views/system/dictionary/dictionary.vue

@@ -4,46 +4,44 @@
       <Breadcrumb />
     </template>
     <div class="dictionary-container">
-      <el-card shadow="never">
-        <div class="table-operations">
-          <el-button type="primary" @click="handleAddDialogShow" :icon="Plus">新增字典项</el-button>
-        </div>
-
-        <el-table v-loading="loading" :data="dataSource" style="width: 100%; margin-top: 16px">
-          <el-table-column prop="dictName" label="字典名称" />
-          <el-table-column prop="dictCode" label="字典编码" />
-          <el-table-column prop="description" label="字典描述" show-overflow-tooltip />
-          <el-table-column prop="dictType" label="分类" width="180">
-            <template #default="{ row }">
-              {{ typeLabelMap[row.dictType] || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="status" label="状态" width="180">
-            <template #default="{ row }">
-              {{ statusLabelMap[row.status] || '' }}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" width="200" fixed="right">
-            <template #default="{ row }">
-              <el-button type="primary" link @click="handleEdit(row)">编辑</el-button>
-              <el-button type="primary" link @click="handleDelete(row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="paginationPosition">
-          <el-pagination
-            v-model:current-page="currentPage"
-            v-model:page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
-            :total="totalRow"
-            background
-            layout="total, prev, pager, next, sizes, jumper"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
-      </el-card>
+      <div class="table-operations">
+        <el-button type="primary" @click="handleAddDialogShow" :icon="Plus">新增字典项</el-button>
+      </div>
+
+      <el-table v-loading="loading" :data="dataSource" style="width: 100%; margin-top: 16px">
+        <el-table-column prop="dictName" label="字典名称" />
+        <el-table-column prop="dictCode" label="字典编码" />
+        <el-table-column prop="description" label="字典描述" show-overflow-tooltip />
+        <el-table-column prop="dictType" label="分类" width="180">
+          <template #default="{ row }">
+            {{ typeLabelMap[row.dictType] || '' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="status" label="状态" width="180">
+          <template #default="{ row }">
+            {{ statusLabelMap[row.status] || '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="200" fixed="right">
+          <template #default="{ row }">
+            <el-button type="primary" link @click="handleEdit(row)">编辑</el-button>
+            <el-button type="primary" link @click="handleDelete(row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="paginationPosition">
+        <el-pagination
+          v-model:current-page="currentPage"
+          v-model:page-size="pageSize"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="totalRow"
+          background
+          layout="total, prev, pager, next, sizes, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
       <AddDict
         v-if="dialogVisible"
         ref="addDictRef"
@@ -167,6 +165,7 @@
 
 <style lang="scss" scoped>
   .dictionary-container {
+    margin: 20px;
     .search-form {
       margin-bottom: 16px;
     }

src/views/system/user/user.vue

@@ -345,7 +345,7 @@
 <style scoped>
   .user-page {
     position: relative;
-    height: calc(100vh - 64px - 12px);
+    /* height: calc(100vh - 64px - 12px); */
     background-color: #ffffff;
   }