Merge branch 'dev-lhf' into 'dev'

style: 样式走查

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

src/layout/MenuLayout.vue

@@ -114,7 +114,7 @@
     border-radius: 4px;
     .el-menu-item,
     :deep(.el-sub-menu__title) {
-      font-size: 18px;
+      font-size: 16px;
       color: #333;
     }
     .el-menu-item.is-active {

src/views/system/dictionary/components/AddDict.vue

@@ -49,14 +49,14 @@
                 :prop="`sysDictDataList.${index}.itemValue`"
                 :rules="[{ required: true, message: '请输入字典项值', trigger: 'blur' }]"
               >
-                <el-input v-model="item.itemValue" placeholder="请输入" />
+                <el-input v-model="item.itemValue" placeholder="请输入字典项值" />
               </el-form-item>
               <el-form-item
                 :label="`字典项编码`"
                 :prop="`sysDictDataList.${index}.itemCode`"
                 :rules="[{ required: true, message: '请输入字典项编码', trigger: 'blur' }]"
               >
-                <el-input v-model="item.itemCode" placeholder="请输入" />
+                <el-input v-model="item.itemCode" placeholder="请输入字典项编码" />
               </el-form-item>
               <el-form-item label="图标">
                 <!-- // 在模板部分修改上传组件的ref绑定 -->
@@ -119,7 +119,7 @@
           v-model="formData.description"
           type="textarea"
           :rows="3"
-          placeholder="请描述灾害处置过程, 不超过1000字"
+          placeholder="请输入字典描述"
           maxlength="1000"
           show-word-limit
         />
@@ -451,13 +451,14 @@
     background: white;
     padding: 20px 0;
     z-index: 100;
-    box-shadow: 0 -4px 10px rgba(0, 0, 0, 0.06);
+    // box-shadow: 0 -4px 10px rgba(0, 0, 0, 0.06);
     text-align: right;
   }
 
   .add-dict-form {
     height: calc(100vh - 120px); // 根据实际抽屉高度调整
     overflow-y: auto;
+    padding-right: 10px;
     .el-select,
     .el-input-number {
       width: 100%;

src/views/system/permission/PagePermission.vue

@@ -60,8 +60,8 @@
             <template #header>
               <div class="editPermission">
                 <el-space>
-                  <span>编辑权限: </span>
-                  <span>{{ treeItemTitle }}</span>
+                  <span>编辑权限 </span>
+                  <span v-if="treeItemTitle">:{{ treeItemTitle }}</span>
                 </el-space>
                 <el-popconfirm
                   v-if="isEditing"

src/views/system/role/components/RoleDrawer.vue

@@ -1,6 +1,6 @@
 <template>
   <el-drawer :title="title" v-model="drawerOpened" @close="clear">
-    <el-form label-position="left" label-width="80px" :model="formData" :rules="formRules" ref="formInstance">
+    <el-form label-position="right" label-width="80px" :model="formData" :rules="formRules" ref="formInstance">
       <el-form-item label="角色名称" prop="roleName">
         <el-input placeholder="角色名称" v-model="formData.roleName" />
       </el-form-item>

src/views/system/role/role.vue

@@ -4,9 +4,9 @@
       <Breadcrumb />
     </template>
 
-    <div>
-      <el-card class="mb-3 proCard">
-        <el-space align="center">
+    <div class="content">
+      <div class="toolbar">
+        <div>
           <el-input
             :style="{ width: '320px' }"
             v-model="requestParams.queryParam!.roleName"
@@ -14,46 +14,42 @@
             placeholder="请输入角色名称"
             @keyup.enter="queryRolesPage"
           />
-          <el-button type="primary" :icon="Search" @click="queryRolesPage">查询</el-button>
-        </el-space>
-      </el-card>
+          <el-button type="primary" :icon="Search" @click="queryRolesPage" style="margin-left: 20px">查询</el-button>
+        </div>
 
-      <el-card shadow="never">
-        <template #header>
-          <el-button type="primary" @click="openDrawer()" v-permission="PERM_USER.ROLE"> 添加角色 </el-button>
-        </template>
+        <el-button type="primary" @click="openDrawer()" v-permission="PERM_USER.ROLE"> 添加角色 </el-button>
+      </div>
 
-        <el-table :data="roleList">
-          <el-table-column label="角色ID" width="100" prop="id" />
-          <el-table-column label="角色名称" prop="roleName" />
-          <el-table-column label="备注" prop="remark" />
-          <el-table-column label="创建时间" width="200" prop="createdAt" />
-          <el-table-column label="操作" width="160">
-            <template #default="{ row }">
-              <section class="actions">
-                <img src="@/assets/icons/edit.png" @click="openDrawer(row)" v-permission="PERM_USER.ROLE" />
-                <img
-                  src="@/assets/icons/delete.png"
-                  @click="deleteRole(row.id)"
-                  v-permission="{ action: [PERM_USER.ROLE] }"
-                />
-              </section>
-            </template>
-          </el-table-column>
-        </el-table>
+      <el-table :data="roleList">
+        <el-table-column label="角色ID" width="100" prop="id" />
+        <el-table-column label="角色名称" prop="roleName" />
+        <el-table-column label="备注" prop="remark" />
+        <el-table-column label="创建时间" width="200" prop="createdAt" />
+        <el-table-column label="操作" width="160">
+          <template #default="{ row }">
+            <section class="actions">
+              <img src="@/assets/icons/edit.png" @click="openDrawer(row)" v-permission="PERM_USER.ROLE" />
+              <img
+                src="@/assets/icons/delete.png"
+                @click="deleteRole(row.id)"
+                v-permission="{ action: [PERM_USER.ROLE] }"
+              />
+            </section>
+          </template>
+        </el-table-column>
+      </el-table>
 
-        <section class="paginationPosition">
-          <el-pagination
-            background
-            layout="total, sizes, prev, pager, next"
-            :page-sizes="[10, 30, 50]"
-            :total="total"
-            v-model:page-size="requestParams.pageSize"
-            v-model:current-page="requestParams.pageNumber"
-            @change="queryRolesPage"
-          />
-        </section>
-      </el-card>
+      <section class="paginationPosition">
+        <el-pagination
+          background
+          layout="total, sizes, prev, pager, next"
+          :page-sizes="[10, 30, 50]"
+          :total="total"
+          v-model:page-size="requestParams.pageSize"
+          v-model:current-page="requestParams.pageNumber"
+          @change="queryRolesPage"
+        />
+      </section>
 
       <RoleDrawer :title="drawerTitle" ref="drawerInstance" @submitted="onSubmitRole" />
     </div>
@@ -117,4 +113,13 @@
     margin-right: 24px;
     cursor: pointer;
   }
+
+  .content {
+    padding: 20px;
+  }
+  .toolbar {
+    margin-bottom: 20px;
+    display: flex;
+    justify-content: space-between;
+  }
 </style>

src/views/system/user/component/AddUser.vue

@@ -2,9 +2,9 @@
   <div v-if="props.modelValue">
     <el-card v-if="cardVisible" class="pop-card">
       <template #header>
-        <div class="flex justify-between items-center pop-head">
+        <div class="pop-head">
           <div style="font-size: 16px">批量导入</div>
-          <el-icon :size="16" class="mr-3" @click="updateValue(false)"><Close /></el-icon
+          <el-icon :size="16" class="mr-3" style="cursor: pointer" @click="updateValue(false)"><Close /></el-icon
         ></div>
       </template>
       <div class="upload-content">
@@ -41,15 +41,11 @@
             <Download />
           </el-icon>
           <el-tooltip content="点击下载组织/角色id信息" placement="top" effect="light">
-            <span
-              style="color: #409efc; margin-top: 6px; margin-right: 12px; cursor: pointer"
-              @click="handleDownloadInfoForm"
-              >组织/角色id信息查询</span
-            >
+            <span class="downloadText" @click="handleDownloadInfoForm">组织/角色id信息查询</span>
           </el-tooltip>
 
-          <el-button @click="handleDownload" style="margin-right: 10px">下载模板</el-button>
-          <el-button type="primary" @click="handleImport" :disabled="isImportEnable"
+          <el-button @click="handleDownload" style="margin-right: 10px; font-weight: unset">下载模板</el-button>
+          <el-button type="primary" @click="handleImport" :disabled="isImportEnable" style="font-weight: unset"
             >导入</el-button
           ></div
         ></div
@@ -220,10 +216,7 @@
         headers: getHeaders(),
         responseType: 'blob',
       };
-      const response = await axios.get(
-        './skyeye-file-upload/skyeye/CAMERALIST_TEMPLATE/importTemplate.xlsx',
-        config,
-      );
+      const response = await axios.get('./skyeye-file-upload/skyeye/CAMERALIST_TEMPLATE/importTemplate.xlsx', config);
       const blob = new Blob([response.data], {
         type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
       });
@@ -301,15 +294,9 @@
         if (errDetail.value.length > 0) {
           errDetail.value.forEach((item, index) => {
             if (item.indexOf('【添加失败】') >= 0) {
-              errDetail.value[index] = item.replace(
-                '【添加失败】',
-                '<span style="color: #ff4d4f">【添加失败】</span>',
-              );
+              errDetail.value[index] = item.replace('【添加失败】', '<span style="color: #ff4d4f">【添加失败】</span>');
             } else if (item.indexOf('【添加成功】') >= 0) {
-              errDetail.value[index] = item.replace(
-                '【添加成功】',
-                '<span style="color: #52c41a">【添加成功】</span>',
-              );
+              errDetail.value[index] = item.replace('【添加成功】', '<span style="color: #52c41a">【添加成功】</span>');
             }
           });
         }
@@ -461,4 +448,15 @@
       margin: 0 20px 20px 0;
     }
   }
+  .pop-head {
+    display: flex;
+    justify-content: space-between;
+  }
+  .downloadText {
+    color: #409efc;
+    margin-top: 6px;
+    margin-right: 12px;
+    cursor: pointer;
+    margin-left: 10px;
+  }
 </style>

src/views/system/user/component/SearchForm.vue

@@ -3,50 +3,40 @@
  * SearchFrom.vue
 -->
 <template>
-   <el-form ref="searchFormRef" :inline="true" :model="searchForm" class="form-inline">
-     <el-form-item  label-position="left" prop="queryType">
+  <el-form ref="searchFormRef" :inline="true" :model="searchForm" class="form-inline">
+    <el-form-item label-position="left" prop="queryType">
       <el-select v-model="searchForm.queryType" placeholder="选择类型" class="type-select">
-          <el-option
-            v-for="item in queryTypeSelect"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-        <el-input
-          :style="{ width: '180px' }"
-          v-model="searchForm.queryTypeContent"
-          clearable
-          placeholder="请输入查找内容"
-          :disabled="!searchForm.queryType"
-        />
+        <el-option v-for="item in queryTypeSelect" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
+      <el-input
+        :style="{ width: '180px' }"
+        v-model="searchForm.queryTypeContent"
+        clearable
+        placeholder="请输入查找内容"
+        :disabled="!searchForm.queryType"
+      />
     </el-form-item>
-    <el-form-item label="请选择角色："  label-position="left" prop="roleId">
+    <el-form-item label="请选择角色：" label-position="left" prop="roleId">
       <el-select v-model="searchForm.roleId" placeholder="请选择角色" class="protocal-select">
-          <el-option
-            v-for="item in roleData"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
+        <el-option v-for="item in roleData" :key="item.value" :label="item.label" :value="item.value" />
+      </el-select>
     </el-form-item>
     <el-form-item label="请选择组织：" label-position="left" prop="deptId">
-       <el-tree-select
-          v-model="searchForm.deptId"
-          :data="departmentList"
-          :render-after-expand="false"
-          :default-expand-all="true"
-          check-strictly
-          placeholder="请选择组织"
-          class="protocal-select"
-        />
+      <el-tree-select
+        v-model="searchForm.deptId"
+        :data="departmentList"
+        :render-after-expand="false"
+        :default-expand-all="true"
+        check-strictly
+        placeholder="请选择组织"
+        class="protocal-select"
+      />
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" :icon="Filter" @click="serachHandle">查询</el-button>
-      <el-button :icon="Refresh" @click="resetFormHandle(searchFormRef)">重置</el-button>
+      <el-button type="primary" @click="serachHandle">查询</el-button>
+      <el-button @click="resetFormHandle(searchFormRef)">重置</el-button>
     </el-form-item>
-   </el-form>
+  </el-form>
 </template>
 
 <script setup lang="ts">
@@ -55,14 +45,14 @@
   import { FormInstance } from 'element-plus';
   import { queryTypeSelect } from '../constant';
   import { OptionsProps } from '../types';
-    
+
   interface Props {
-    roleData: OptionsProps[],
-    departmentList: OptionsProps[]
+    roleData: OptionsProps[];
+    departmentList: OptionsProps[];
   }
   const props = defineProps<Props>();
   console.log('props: ', props.roleData);
-  
+
   interface SearchFromProps {
     queryType: string;
     queryTypeContent: string;
@@ -74,15 +64,15 @@
     queryType: '',
     queryTypeContent: '',
     roleId: '',
-    deptId: ''
-  })
+    deptId: '',
+  });
 
- // 重置表单
+  // 重置表单
   const searchFormRef = ref<FormInstance>();
   const resetFormHandle = (formEl: FormInstance | undefined) => {
     if (!formEl) return;
     formEl?.resetFields();
-    searchForm.value.queryTypeContent = ''
+    searchForm.value.queryTypeContent = '';
     emit('resetForm');
   };
 
@@ -100,8 +90,7 @@
 </script>
 
 <style scoped lang="scss">
-
-.type-select {
+  .type-select {
     width: 100px;
   }