Merge branch 'all-v4-qindao' into 'all-v4'

fix: 修复【操作日志】-姓名和登录账号字段显示相反，【账号管理】租户管理员文案未显示全，	人员分组-编辑分组，人员名称显示错误

See merge request skyeye/skyeye_frontend/skyeye-admin!301

src/api/message/person-group.ts

@@ -75,7 +75,7 @@ export function ToPushObjectqueryUserGroupList() {
 }
 export function queryUserGroupDetail(userGroupList: number[]) {
   return http.request({
-    url: `/alarmMessage/queryUserGroupDetail?userGroupList=${userGroupList}`,
+    url: `/userGroup/queryUserGroupDetail?userGroupList=${userGroupList}`,
     method: 'post',
   });
 }

src/layout/components/Header/SwitchTenant.vue

@@ -72,7 +72,7 @@ const handleChange = (targetTenantId: string) => {
   }).catch(() => {
     ElMessage({
       type: 'info',
-      message: '取消删除',
+      message: '取消切换',
     });
   });
 };

src/views/message/reportmessage/components/CustomPersonSelection.vue

@@ -2,7 +2,7 @@
   <div>
     <el-select v-model="prop.form.customPushConfigList[index].customUserList" value-key="id" multiple
       placeholder="请选择人员" @click="dialogVisible = !disableType.contentDisable" :disabled="disableType.contentDisable">
-      <el-option v-for="user in selectedUser" :key="user.id" :label="user.staffNo + '-' + user.nickname"
+      <el-option v-for="user in selectedUser" :key="user.id" :label="user.staffNo + '-' + user.realname"
         :value="user" />
     </el-select>
     <el-dialog v-model="dialogVisible" title="添加人员" align-center :close-on-click-modal="false" style="height: 583px"

src/views/message/reportmessage/components/DefaultPersonSelection.vue

@@ -11,7 +11,7 @@
       <el-option
         v-for="user in selectedUser"
         :key="user.id"
-        :label="user.staffNo + '-' + user.nickname"
+        :label="user.staffNo + '-' + user.realname"
         :value="user"
       />
     </el-select>

src/views/message/reportmessage/components/DesignatedPersonSelection.vue

@@ -50,7 +50,7 @@ onBeforeUpdate(() => {
     selectedUser.value = prop.form.designatedUserList.map((item) => {
       return {
         id: item.userId,
-        nickname: item.userNickname,
+        realname: item.userNickname,
         staffNo: item.userLoginName,
       };
     });

src/views/system/log/components/LoginLog.vue

@@ -53,7 +53,7 @@
         <el-button type="primary" @click="handleExport()">导出数据</el-button>
       </template>
       <el-table height="calc(100vh - 500px)" :data="loginLogList" v-loading="loading">
-        <el-table-column label="序号" width="100" prop="id" />
+        <el-table-column type="index" label="序号" width="100" />
         <el-table-column label="登录账号" prop="userName" />
         <el-table-column label="姓名" prop="realName" />
         <el-table-column label="组织"  prop="deptName" />
@@ -79,10 +79,12 @@
            <el-icon :size="24" color="#F56C6C" v-else><CircleCloseFilled /></el-icon>
           </template>
         </el-table-column>
+        <el-table-column label="登录IP"  prop="loginIp" />
         <el-table-column label="操作时间"  prop="createdAt" />
       </el-table>
 
       <section class="mt-4 flex justify-end">
+        <!-- 分页组件，显示总条目数、每页显示条目数选择器、上一页、页码、下一页 -->
         <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="queryLoginLogPage" />

src/views/system/log/components/OperationLog.vue

@@ -57,9 +57,9 @@
         <el-button type="primary" @click="handleExport()">导出数据</el-button>
       </template>
       <el-table height="calc(100vh - 500px)" :data="operationLogList" v-loading="loading">
-        <el-table-column label="日志编号" width="100" prop="id" />
-        <el-table-column label="账号" prop="realName" />
-        <el-table-column label="姓名" prop="operatorName" />
+        <el-table-column type="index" width="100" label="日志编号"/>
+        <el-table-column label="账号" prop="operatorName" />
+        <el-table-column label="姓名" prop="realName" />
         <el-table-column label="应用侧" prop="platform" >
           <template #default="{ row }">
             {{  row.platform === 'ADMIN' ? '管理侧' : '平台侧' }}

src/views/system/log/components/SystemLog.vue

@@ -43,7 +43,7 @@
         <el-button type="primary" @click="handleExport()">导出数据</el-button>
       </template>
       <el-table height="calc(100vh - 450px)" :data="systemLogList" v-loading="loading">
-        <el-table-column label="序号" width="100" prop="id" />
+        <el-table-column type="index" label="序号" width="100" />
         <el-table-column label="事件类型" prop="realName" >
           <template #default="{ row }">
            <span>{{ eventTypeArr[row.eventType] }}</span>

src/views/system/user/CreateAdminDrawer.vue

@@ -11,7 +11,7 @@
         <el-select clearable v-model="formParams.roleIdList" multiple v-if="isCanAddTenant && isSysTenant">
           <el-option v-for="item in roleData" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
-        <el-input v-else placeholder="租户管理员默认拥有租全部角色权限" disabled />
+        <el-input v-else placeholder="租户管理员默认拥有全部角色权限" disabled />
       </el-form-item>
       <el-form-item v-if="isAddUser" label="密码" prop="password">
         <el-input type="password" show-password-on="mousedown" placeholder="请输入密码" v-model="formParams.password" />