Merge branch 'wyf-dev' into 'all-v4'

fix: 积分统计姓名字段修改为realname

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

src/api/datamanagement/dataplatform.ts

@@ -49,9 +49,7 @@ export interface UserAccessRecordList {
 /**
  * @description: 获取用户访问记录
  */
-export const getUserAccessRecords = (
-  data: PaginationRequest & { queryParam: UserAccessRecordQueryParams },
-) => {
+export const getUserAccessRecords = (data: PaginationRequest & { queryParam: UserAccessRecordQueryParams }) => {
   return http.request<PaginationResponse<UserAccessRecord>>({
     url: '/admin/userRecord/getList',
     method: 'post',
@@ -157,7 +155,7 @@ export interface ScoreTableQueryBody {
   /** 页面大小 */
   pageSize: number;
   /** 查询姓名 */
-  nickname?: string;
+  realname?: string;
   /** 查询工号 */
   staffNo?: string;
   /** 查询部门ID */
@@ -179,7 +177,7 @@ export const getScoreTable = (body: ScoreTableQueryBody) => {
 /** 用户访问记录列表数据 */
 export interface ScoreTableRecordList {
   staffNo: string;
-  nickname: string;
+  realname: string;
   deptId: number;
   deptName: string;
   score: number;

src/views/datamanager/platformdata/components/common/ScoreTable.vue

@@ -7,11 +7,7 @@
         :placeholder="'请输入' + tableQueryType"
       >
         <template #prepend>
-          <el-select
-            v-model="tableQueryType"
-            style="width: 74px"
-            @change="handleTableQueryTypeChange"
-          >
+          <el-select v-model="tableQueryType" style="width: 74px" @change="handleTableQueryTypeChange">
             <el-option value="姓名" />
             <el-option value="工号" />
           </el-select>
@@ -32,9 +28,7 @@
         />
       </div>
       <div style="float: right">
-        <el-button type="primary" @click="submitTableQuery" style="width: 65px; height: 32px"
-          >搜 索</el-button
-        >
+        <el-button type="primary" @click="submitTableQuery" style="width: 65px; height: 32px">搜 索</el-button>
         <el-button @click="resetTable" style="width: 65px; height: 32px">重 置</el-button>
       </div>
     </div>
@@ -47,15 +41,10 @@
       highlight-current-row
       @sort-change="handleSortChange"
     >
-      <el-table-column label="姓名" prop="nickname" align="center"></el-table-column>
+      <el-table-column label="姓名" prop="realname" align="center"></el-table-column>
       <el-table-column label="工号" prop="staffNo" align="center"></el-table-column>
       <el-table-column label="部门" prop="deptName" align="center"></el-table-column>
-      <el-table-column
-        label="累计积分"
-        prop="score"
-        sortable="custom"
-        align="center"
-      ></el-table-column>
+      <el-table-column label="累计积分" prop="score" sortable="custom" align="center"></el-table-column>
     </el-table>
     <el-pagination
       v-model:current-page="tableQueryParams.pageNumber"
@@ -72,10 +61,7 @@
 <script setup lang="ts">
   import { ref } from 'vue';
   import { defineProps } from 'vue';
-  import {
-    type ScoreTableRecord,
-    type ScoreTableQueryBody,
-  } from '@/api/datamanagement/dataplatform';
+  import { type ScoreTableRecord, type ScoreTableQueryBody } from '@/api/datamanagement/dataplatform';
 
   const scoreTableRef = ref();
 
@@ -93,7 +79,7 @@
     pageNumber: 1,
     pageSize: 10,
     deptId: '',
-    // nickname: "",
+    // realname: "",
     // staffNo: "",
     // order: "",
   });
@@ -127,7 +113,7 @@
     if (v === '姓名') {
       delete tableQueryParams.value.staffNo;
     } else {
-      delete tableQueryParams.value.nickname;
+      delete tableQueryParams.value.realname;
     }
     tableQueryTypeContent.value = '';
   };
@@ -139,7 +125,7 @@
   const tableQueryTypeContent = ref<string>();
   function submitTableQuery() {
     if (tableQueryType.value === '姓名') {
-      tableQueryParams.value.nickname = tableQueryTypeContent.value;
+      tableQueryParams.value.realname = tableQueryTypeContent.value;
     } else {
       tableQueryParams.value.staffNo = tableQueryTypeContent.value;
     }