优化

.gitignore

@@ -19,6 +19,8 @@ selenium-debug.log
 *.njsproj
 *.sln
 *.local
+src/utils/request.ts
+vite.config.ts
 
 package-lock.json
 yarn.lock

src/api/system/gameAthlete/types.ts

@@ -88,7 +88,6 @@ export interface GameAthleteVO {
    * 备注
    */
   remark: string;
-
 }
 
 export interface GameAthleteForm extends BaseEntity {
@@ -191,21 +190,29 @@ export interface GameAthleteForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface GameAthleteQuery extends PageQuery {
-
   /**
    * 赛事ID
    */
   eventId?: string | number;
 
+  /**
+   * 赛事名称
+   */
+  eventName?: string;
+
   /**
    * 队伍ID
    */
   teamId?: string | number;
 
+  /**
+   * 队伍名称
+   */
+  teamName?: string;
+
   /**
    * 运动员编号
    */
@@ -236,7 +243,13 @@ export interface GameAthleteQuery extends PageQuery {
    */
   params?: any;
 
-}
-
-
+  /**
+   * 电话号码
+   */
+  phone?: string;
 
+  /**
+   * 居住地址
+   */
+  location?: string;
+}

src/utils/request.ts

@@ -28,6 +28,7 @@ axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
 // 创建 axios 实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
+  // baseURL: 'http://meet2.sportsrobo.club:8080',
   timeout: 50000
 });
 
@@ -128,19 +129,19 @@ service.interceptors.response.use(
       // prettier-ignore
       if (!isRelogin.show) {
         isRelogin.show = true;
-        ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
+        ElMessageBox.confirm("登录状态已过期，您可以继续留在该页面，或者重新登录", "系统提示", {
+          confirmButtonText: "重新登录",
+          cancelButtonText: "取消",
+          type: "warning"
         }).then(() => {
           isRelogin.show = false;
           useUserStore().logout().then(() => {
             router.replace({
-              path: '/login',
+              path: "/login",
               query: {
-                redirect: encodeURIComponent(router.currentRoute.value.fullPath || '/')
+                redirect: encodeURIComponent(router.currentRoute.value.fullPath || "/")
               }
-            })
+            });
           });
         }).catch(() => {
           isRelogin.show = false;
@@ -173,36 +174,38 @@ service.interceptors.response.use(
     return Promise.reject(error);
   }
 );
+
 // 通用下载方法
 export function download(url: string, params: any, fileName: string) {
   downloadLoadingInstance = ElLoading.service({ text: '正在下载数据，请稍候', background: 'rgba(0, 0, 0, 0.7)' });
   // prettier-ignore
   return service.post(url, params, {
-      transformRequest: [
-        (params: any) => {
-          return tansParams(params);
-        }
-      ],
-      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-      responseType: 'blob'
-    }).then(async (resp: any) => {
-      const isLogin = blobValidate(resp);
-      if (isLogin) {
-        const blob = new Blob([resp]);
-        FileSaver.saveAs(blob, fileName);
-      } else {
-        const blob = new Blob([resp]);
-        const resText = await blob.text();
-        const rspObj = JSON.parse(resText);
-        const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'];
-        ElMessage.error(errMsg);
+    transformRequest: [
+      (params: any) => {
+        return tansParams(params);
       }
-      downloadLoadingInstance.close();
-    }).catch((r: any) => {
-      console.error(r);
-      ElMessage.error('下载文件出现错误，请联系管理员！');
-      downloadLoadingInstance.close();
-    });
+    ],
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    responseType: "blob"
+  }).then(async (resp: any) => {
+    const isLogin = blobValidate(resp);
+    if (isLogin) {
+      const blob = new Blob([resp]);
+      FileSaver.saveAs(blob, fileName);
+    } else {
+      const blob = new Blob([resp]);
+      const resText = await blob.text();
+      const rspObj = JSON.parse(resText);
+      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
+      ElMessage.error(errMsg);
+    }
+    downloadLoadingInstance.close();
+  }).catch((r: any) => {
+    console.error(r);
+    ElMessage.error("下载文件出现错误，请联系管理员！");
+    downloadLoadingInstance.close();
+  });
 }
+
 // 导出 axios 实例
 export default service;

src/views/system/gameAthlete/index.vue

@@ -7,8 +7,11 @@
             <el-form-item label="赛事ID" prop="eventId">
               <el-input v-model="queryParams.eventId" placeholder="请输入赛事ID" clearable @keyup.enter="handleQuery" />
             </el-form-item>
-            <el-form-item label="队伍ID" prop="teamId">
-              <el-input v-model="queryParams.teamId" placeholder="请输入队伍ID" clearable @keyup.enter="handleQuery" />
+            <el-form-item label="赛事名称" prop="eventName">
+              <el-input v-model="queryParams.eventName" placeholder="请输入赛事名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="队伍名称" prop="teamName">
+              <el-input v-model="queryParams.teamName" placeholder="请输入队伍名称" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="运动员编号" prop="athleteCode">
               <el-input v-model="queryParams.athleteCode" placeholder="请输入运动员编号" clearable @keyup.enter="handleQuery" />
@@ -16,6 +19,12 @@
             <el-form-item label="姓名" prop="name">
               <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="手机号" prop="phone">
+              <el-input v-model="queryParams.phone" placeholder="请输入手机号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="居住地址" prop="location">
+              <el-input v-model="queryParams.location" placeholder="请输入居住地址" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -29,16 +38,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:gameAthlete:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:gameAthlete:add']"> 新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:gameAthlete:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:gameAthlete:edit']"
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:gameAthlete:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:gameAthlete:remove']"
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:gameAthlete:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:gameAthlete:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -49,16 +62,17 @@
         <el-table-column label="主键" align="center" prop="athleteId" v-if="false" />
         <!-- <el-table-column label="用户ID" align="center" prop="userId" /> -->
         <el-table-column label="赛事ID" align="center" prop="eventId" />
-        <el-table-column label="运动员编号" align="center" prop="athleteCode" />
+        <el-table-column label="赛事名称" align="center" prop="eventName" width="120px" />
+        <el-table-column label="运动员编号" align="center" prop="athleteCode" width="100px" />
         <el-table-column label="姓名" align="center" prop="name" />
-        <el-table-column label="性别" align="center" prop="gender" >
+        <el-table-column label="性别" align="center" prop="gender">
           <template #default="scope">
             <el-tag v-if="scope.row.gender === '0'">男</el-tag>
             <el-tag v-if="scope.row.gender === '1'">女</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="年龄" align="center" prop="age" />
-        <el-table-column label="参与项目" align="center" prop="projectValue">
+        <el-table-column label="参与项目" align="center" prop="projectValue" width="200px">
           <template #default="scope">
             {{ formatProjectList(scope.row.projectValue) }}
           </template>
@@ -77,7 +91,7 @@
         <el-table-column label="号码" align="center" prop="number" />
         <el-table-column label="状态" align="center" prop="status" />
         <el-table-column label="备注" align="center" prop="remark" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:gameAthlete:edit']"></el-button>
@@ -102,12 +116,7 @@
         </el-form-item>
         <el-form-item label="队伍" prop="teamId">
           <el-select v-model="form.teamId" placeholder="请选择队伍">
-            <el-option
-              v-for="team in gameTeamList"
-              :key="team.teamId"
-              :label="team.teamName"
-              :value="team.teamId"
-            />
+            <el-option v-for="team in gameTeamList" :key="team.teamId" :label="team.teamName" :value="team.teamId" />
           </el-select>
         </el-form-item>
         <el-form-item label="运动员编号" prop="athleteCode">
@@ -151,7 +160,7 @@
           />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -177,7 +186,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const gameTeamList = ref<GameTeamVO[]>([]); // 队伍列表
 const gameAthleteList = ref<GameAthleteVO[]>([]);
-const gameEventProjectList = ref<Array<{key: string, label: string}>>([]); // 赛事项目列表（用于穿梭框）
+const gameEventProjectList = ref<Array<{ key: string; label: string }>>([]); // 赛事项目列表（用于穿梭框）
 const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
@@ -214,37 +223,30 @@ const initFormData: GameAthleteForm = {
   selectedProjects: [], // 添加已选项目列表
   status: undefined,
   remark: undefined
-}
+};
 const data = reactive<PageData<GameAthleteForm, GameAthleteQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     eventId: undefined,
+    eventName: undefined,
     teamId: undefined,
+    teamName: undefined,
     athleteCode: undefined,
     name: undefined,
     groupType: undefined,
     status: undefined,
-    params: {
-    }
+    phone: undefined,
+    location: undefined,
+    params: {}
   },
   rules: {
-    userId: [
-      { required: true, message: "用户ID不能为空", trigger: "blur" }
-    ],
-    teamId: [
-      { required: true, message: "队伍ID不能为空", trigger: "blur" }
-    ],
-    athleteCode: [
-      { required: true, message: "运动员编号不能为空", trigger: "blur" }
-    ],
-    gender: [
-      { required: true, message: "性别不能为空", trigger: "blur" }
-    ],
-    age: [
-      { required: true, message: "年龄不能为空", trigger: "blur" }
-    ],
+    userId: [{ required: true, message: '用户ID不能为空', trigger: 'blur' }],
+    teamId: [{ required: true, message: '队伍ID不能为空', trigger: 'blur' }],
+    athleteCode: [{ required: true, message: '运动员编号不能为空', trigger: 'blur' }],
+    gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+    age: [{ required: true, message: '年龄不能为空', trigger: 'blur' }]
     // idCard: [
     //   { required: true, message: "证件号不能为空", trigger: "blur" }
     // ],
@@ -279,7 +281,7 @@ const { queryParams, form, rules } = toRefs(data);
 
 /** 获取队伍名称 */
 const getTeamNameById = (teamId: string | number) => {
-  const team = gameTeamList.value.find(team => team.teamId === teamId);
+  const team = gameTeamList.value.find((team) => team.teamId === teamId);
   return team ? team.teamName : '';
 };
 
@@ -291,23 +293,23 @@ const getProjectList = async (eventId?: string) => {
     pageSize: 1000
   });
   console.log(res);
-  gameEventProjectList.value = res.rows.map(item => ({
+  gameEventProjectList.value = res.rows.map((item) => ({
     key: String(item.projectId),
     label: `${item.projectName}`
   }));
-}
+};
 
 // 格式化项目列表显示
 const formatProjectList = (projectValue: string) => {
   if (!projectValue) return '';
   // 将逗号分隔的ID列表转换为项目名称列表
   const projectIds = projectValue.split(',');
-  const projectNames = projectIds.map(id => {
-    const project = gameEventProjectList.value.find(p => p.key === id);
+  const projectNames = projectIds.map((id) => {
+    const project = gameEventProjectList.value.find((p) => p.key === id);
     return project ? project.label : id;
   });
   return projectNames.join(', ');
-}
+};
 
 /** 查询参赛队员列表 */
 const getList = async () => {
@@ -316,7 +318,7 @@ const getList = async () => {
   gameAthleteList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 // 获取队伍列表
 const getTeamList = async () => {
@@ -325,75 +327,75 @@ const getTeamList = async () => {
     pageSize: 1000
   });
   gameTeamList.value = res.rows || [];
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   gameAthleteFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: GameAthleteVO[]) => {
-  ids.value = selection.map(item => item.athleteId);
+  ids.value = selection.map((item) => item.athleteId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加参赛队员";
+  dialog.title = '添加参赛队员';
   // 获取项目列表
   nextTick(() => {
     if (form.value.eventId) {
       getProjectList(String(form.value.eventId));
     }
   });
-}
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: GameAthleteVO) => {
   reset();
-  const _athleteId = row?.athleteId || ids.value[0]
+  const _athleteId = row?.athleteId || ids.value[0];
   const res = await getGameAthlete(_athleteId);
   Object.assign(form.value, res.data);
-  
+
   // 处理项目列表，将逗号分隔的字符串转换为数组
   if (res.data.projectValue) {
     form.value.selectedProjects = res.data.projectValue.split(',');
   } else {
     form.value.selectedProjects = [];
   }
-  
+
   dialog.visible = true;
-  dialog.title = "修改参赛队员";
+  dialog.title = '修改参赛队员';
   // 获取项目列表
   nextTick(() => {
     if (form.value.eventId) {
       getProjectList(String(form.value.eventId));
     }
   });
-}
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -409,34 +411,38 @@ const submitForm = () => {
       }
       // 删除selectedProjects属性，因为它不需要提交到后端
       delete submitForm.selectedProjects;
-      
+
       if (form.value.athleteId) {
-        await updateGameAthlete(submitForm).finally(() =>  buttonLoading.value = false);
+        await updateGameAthlete(submitForm).finally(() => (buttonLoading.value = false));
       } else {
-        await addGameAthlete(submitForm).finally(() =>  buttonLoading.value = false);
+        await addGameAthlete(submitForm).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: GameAthleteVO) => {
   const _athleteIds = row?.athleteId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除参赛队员编号为"' + _athleteIds + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除参赛队员编号为"' + _athleteIds + '"的数据项？').finally(() => (loading.value = false));
   await delGameAthlete(_athleteIds);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('system/gameAthlete/export', {
-    ...queryParams.value
-  }, `gameAthlete_${new Date().getTime()}.xlsx`)
-}
+  proxy?.download(
+    'system/gameAthlete/export',
+    {
+      ...queryParams.value
+    },
+    `gameAthlete_${new Date().getTime()}.xlsx`
+  );
+};
 
 onMounted(() => {
   getList();

vite.config.ts

@@ -24,6 +24,7 @@ export default defineConfig(({ mode, command }) => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
+          // target: 'http://meet2.sportsrobo.club:8080',
           target: 'http://localhost:8080',
           changeOrigin: true,
           ws: true,