Merge branch 'dev' into dev_zlt

game_event_admin/README.md

@@ -1,93 +0,0 @@
-# game_event_admin
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin http://192.168.1.121/yp_web/game_event_admin.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](http://192.168.1.121/yp_web/game_event_admin/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.

src/api/system/article/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ArticleVO, ArticleForm, ArticleQuery } from '@/api/system/article/types';
+
+/**
+ * 查询文章(可用于活动预热)列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listArticle = (query?: ArticleQuery): AxiosPromise<ArticleVO[]> => {
+  return request({
+    url: '/system/article/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询文章(可用于活动预热)详细
+ * @param id
+ */
+export const getArticle = (id: string | number): AxiosPromise<ArticleVO> => {
+  return request({
+    url: '/system/article/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增文章(可用于活动预热)
+ * @param data
+ */
+export const addArticle = (data: ArticleForm) => {
+  return request({
+    url: '/system/article',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改文章(可用于活动预热)
+ * @param data
+ */
+export const updateArticle = (data: ArticleForm) => {
+  return request({
+    url: '/system/article',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除文章(可用于活动预热)
+ * @param id
+ */
+export const delArticle = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/system/article/' + id,
+    method: 'delete'
+  });
+};

src/api/system/article/types.ts

@@ -0,0 +1,107 @@
+export interface ArticleVO {
+  /**
+   *
+   */
+  id: string | number;
+
+  /**
+   * 赛事id
+   */
+  eventId: string | number;
+
+  eventName: string;
+
+  /**
+   * 标题
+   */
+  title: string;
+
+  /**
+   * 内容
+   */
+  content: string;
+
+  /**
+   * 文章类型
+   */
+  type: number;
+
+  /**
+   * 是否展示 0:展示 1:隐藏
+   */
+  status: string;
+}
+
+export interface ArticleForm extends BaseEntity {
+  /**
+   *
+   */
+  id?: string | number;
+
+  /**
+   * 赛事id
+   */
+  eventId?: string | number;
+
+  /**
+   * 赛事名称
+   */
+  eventName?:string;
+
+  /**
+   * 标题
+   */
+  title?: string;
+
+  /**
+   * 内容
+   */
+  content?: string;
+
+  /**
+   * 文章类型
+   */
+  type?: number;
+
+  /**
+   * 是否展示 0:展示 1:隐藏
+   */
+  status?: string;
+}
+
+export interface ArticleQuery extends PageQuery {
+  /**
+   * 赛事id
+   */
+  eventId?: string | number;
+
+  /**
+   * 赛事名称
+   */
+  eventName?:string;
+
+  /**
+   * 标题
+   */
+  title?: string;
+
+  /**
+   * 内容
+   */
+  content?: string;
+
+  /**
+   * 文章类型
+   */
+  type?: number;
+
+  /**
+   * 是否展示 0:展示 1:隐藏
+   */
+  status?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

src/api/system/gameEvent/index.ts

@@ -61,3 +61,16 @@ export const delGameEvent = (eventId: string | number | Array<string | number>)
     method: 'delete'
   });
 };
+
+/**
+ * 查询赛事名称和id的map
+ * @param query
+ * @returns {*}
+ */
+
+export const getEventIdNameMap = () => {
+  return request({
+    url: '/system/gameEvent/map',
+    method: 'get'
+  });
+};

src/api/system/gameEvent/types.ts

@@ -85,7 +85,6 @@ export interface GameEventVO {
    * 备注
    */
   remark: string;
-
 }
 
 export interface GameEventForm extends BaseEntity {
@@ -163,7 +162,6 @@ export interface GameEventForm extends BaseEntity {
    * 备注
    */
   remark?: string;
-
 }
 
 export interface GameEventQuery extends PageQuery {
@@ -242,6 +240,3 @@ export interface GameEventQuery extends PageQuery {
    */
   params?: any;
 }
-
-
-

src/views/system/activityIntroduction/index.vue

@@ -0,0 +1,309 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <!--            <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="赛事名称" prop="eventName">
+              <el-select v-model="queryParams.eventName" placeholder="请选择赛事" clearable>
+                <el-option v-for="event in eventOptions" :key="event.eventId" :label="event.eventName" :value="event.eventName" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="标题" prop="title">
+              <el-input v-model="queryParams.title" placeholder="请输入标题" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="文章类型" prop="type">
+              <el-select v-model="queryParams.type" placeholder="请选择文章类型" clearable>
+                <el-option v-for="dict in article_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否展示" prop="status">
+              <el-select v-model="queryParams.status" placeholder="请选择是否展示" clearable>
+                <el-option v-for="dict in article_status" :key="dict.value" :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <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:article:add']">新增 </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:article:edit']"
+              >修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:article:remove']"
+              >删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:article:export']">导出 </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="articleList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="id" align="center" prop="id" v-if="true" />
+        <el-table-column label="赛事id" align="center" prop="eventId" />
+        <el-table-column label="赛事名称" align="center" prop="eventName" />
+        <el-table-column label="标题" align="center" prop="title" />
+        <!--        <el-table-column label="内容" align="center" prop="content" />-->
+        <el-table-column label="文章类型" align="center" prop="type">
+          <template #default="scope">
+            <dict-tag :options="article_type" :value="scope.row.type" />
+          </template>
+        </el-table-column>
+        <el-table-column label="是否展示" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :options="article_status" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:article:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:article:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改文章对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="1200px" append-to-body>
+      <el-form ref="articleFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="赛事" prop="eventId">
+          <el-select v-model="form.eventId" placeholder="请选择赛事" clearable>
+            <el-option v-for="event in eventOptions" :key="event.eventId" :label="event.eventName" :value="event.eventId" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题" />
+        </el-form-item>
+        <el-form-item label="内容">
+          <editor v-model="form.content" :min-height="192" />
+        </el-form-item>
+        <el-form-item label="文章类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择文章类型">
+            <el-option v-for="dict in article_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否展示" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in article_status" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="Article" lang="ts">
+import { listArticle, getArticle, delArticle, addArticle, updateArticle } from '@/api/system/article';
+import { ArticleVO, ArticleQuery, ArticleForm } from '@/api/system/article/types';
+import { getEventIdNameMap } from '@/api/system/gameEvent';
+
+// 定义事件选项接口
+interface EventOption {
+  eventId: string | number;
+  eventName: string;
+}
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { article_status, article_type } = toRefs<any>(proxy?.useDict('article_status', 'article_type'));
+
+const articleList = ref<ArticleVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const eventOptions = ref<EventOption[]>([]);
+
+const queryFormRef = ref<ElFormInstance>();
+const articleFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ArticleForm = {
+  id: undefined,
+  eventId: undefined,
+  title: undefined,
+  content: undefined,
+  type: undefined,
+  status: '0'
+};
+const data = reactive<PageData<ArticleForm, ArticleQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    eventId: undefined,
+    eventName: undefined,
+    title: undefined,
+    content: undefined,
+    type: undefined,
+    status: undefined,
+    params: {}
+  },
+  rules: {
+    eventId: [{ required: true, message: '赛事id不能为空', trigger: 'blur' }],
+    title: [{ required: true, message: '标题不能为空', trigger: 'blur' }],
+    content: [{ required: true, message: '内容不能为空', trigger: 'blur' }],
+    type: [{ required: true, message: '文章类型不能为空', trigger: 'change' }],
+    status: [{ required: true, message: '是否展示 0:展示 1:隐藏不能为空', trigger: 'change' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询文章列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listArticle(queryParams.value);
+  articleList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  articleFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ArticleVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加文章';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ArticleVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getArticle(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改文章';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  articleFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateArticle(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addArticle(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ArticleVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除文章编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await delArticle(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/article/export',
+    {
+      ...queryParams.value
+    },
+    `article_${new Date().getTime()}.xlsx`
+  );
+};
+
+/** 获取赛事选项数据 */
+const getEventOptions = async () => {
+  try {
+    const res = await getEventIdNameMap();
+    console.log('查询赛事名称和id的map:', res);
+    // 根据实际返回的数据结构处理
+    if (res.data && typeof res.data === 'object') {
+      eventOptions.value = Object.entries(res.data).map(([eventName, eventId]) => ({
+        eventId: eventId as string | number,
+        eventName: eventName
+      }));
+    } else {
+      eventOptions.value = [];
+    }
+    console.log('赛事选项数据:', eventOptions.value);
+  } catch (error) {
+    console.error('获取赛事数据失败:', error);
+    eventOptions.value = [];
+  }
+};
+
+onMounted(() => {
+  getList();
+  getEventOptions();
+});
+</script>

src/views/system/gameEventGroup/index.vue

@@ -32,16 +32,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:gameEventGroup:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:gameEventGroup:add']"> 新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:gameEventGroup:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:gameEventGroup:edit']"
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:gameEventGroup:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:gameEventGroup:remove']"
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:gameEventGroup:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:gameEventGroup:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -52,12 +56,8 @@
         <el-table-column label="主键" align="center" prop="groupId" v-if="false" />
         <el-table-column label="赛事ID" align="center" prop="eventId" />
         <el-table-column label="赛事组别" align="center" prop="groupName" />
-        <el-table-column label="包含项目" align="center" prop="projectList">
-          <template #default="scope">
-            {{ formatProjectList(scope.row.projectList) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="成员性别" align="center" prop="memberGender" >
+        <el-table-column label="包含项目" align="center" prop="projectList" />
+        <el-table-column label="成员性别" align="center" prop="memberGender">
           <template #default="scope">
             {{ genderMap[scope.row.memberGender] || '未知' }}
           </template>
@@ -113,7 +113,7 @@
           <el-input v-model="form.sortRule" placeholder="请输入排序规则(0升序1降序)" />
         </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>
@@ -143,7 +143,7 @@ const genderMap = {
 };
 
 const gameEventGroupList = ref<GameEventGroupVO[]>([]);
-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);
@@ -171,9 +171,9 @@ const initFormData: GameEventGroupForm = {
   sortRule: undefined,
   status: undefined,
   remark: undefined
-}
+};
 const data = reactive<PageData<GameEventGroupForm, GameEventGroupQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -184,19 +184,12 @@ const data = reactive<PageData<GameEventGroupForm, GameEventGroupQuery>>({
     sortOrder: undefined,
     sortRule: undefined,
     status: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
-    eventId: [
-      { required: true, message: "赛事ID不能为空", trigger: "blur" }
-    ],
-    groupName: [
-      { required: true, message: "项目组名称不能为空", trigger: "blur" }
-    ],
-    memberGender: [
-      { required: true, message: "成员性别不能为空", trigger: "change" }
-    ],
+    eventId: [{ required: true, message: '赛事ID不能为空', trigger: 'blur' }],
+    groupName: [{ required: true, message: '项目组名称不能为空', trigger: 'blur' }],
+    memberGender: [{ required: true, message: '成员性别不能为空', trigger: 'change' }]
     // status: [
     //   { required: true, message: "状态不能为空", trigger: "change" }
     // ],
@@ -212,7 +205,7 @@ const getList = async () => {
   gameEventGroupList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 // 获取赛事项目列表
 const getProjectList = async (eventId?: string) => {
@@ -221,91 +214,79 @@ const getProjectList = async (eventId?: string) => {
     pageNum: 1,
     pageSize: 1000
   });
-  gameEventProjectList.value = res.rows.map(item => ({
+  gameEventProjectList.value = res.rows.map((item) => ({
     key: String(item.projectId),
     label: `${item.projectName}`
   }));
-}
-
-// 格式化项目列表显示
-const formatProjectList = (projectList: string) => {
-  if (!projectList) return '';
-  // 将逗号分隔的ID列表转换为项目名称列表
-  const projectIds = projectList.split(',');
-  const projectNames = projectIds.map(id => {
-    const project = gameEventProjectList.value.find(p => p.key === id);
-    return project ? project.label : id;
-  });
-  return projectNames.join(', ');
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   gameEventGroupFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: GameEventGroupVO[]) => {
-  ids.value = selection.map(item => item.groupId);
+  ids.value = selection.map((item) => item.groupId);
   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?: GameEventGroupVO) => {
   reset();
-  const _groupId = row?.groupId || ids.value[0]
+  const _groupId = row?.groupId || ids.value[0];
   const res = await getGameEventGroup(_groupId);
   Object.assign(form.value, res.data);
-  
+
   // 处理项目列表，将逗号分隔的字符串转换为数组
   if (res.data.projectList) {
     form.value.selectedProjects = res.data.projectList.split(',');
   } else {
     form.value.selectedProjects = [];
   }
-  
+
   dialog.visible = true;
-  dialog.title = "修改赛事分组";
+  dialog.title = '修改赛事分组';
   // 获取项目列表
   nextTick(() => {
     if (form.value.eventId) {
       getProjectList(String(form.value.eventId));
     }
   });
-}
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -321,36 +302,40 @@ const submitForm = () => {
       }
       // 删除selectedProjects属性，因为它不需要提交到后端
       delete submitForm.selectedProjects;
-      
+
       if (form.value.groupId) {
-        await updateGameEventGroup(submitForm).finally(() =>  buttonLoading.value = false);
+        await updateGameEventGroup(submitForm).finally(() => (buttonLoading.value = false));
       } else {
-        await addGameEventGroup(submitForm).finally(() =>  buttonLoading.value = false);
+        await addGameEventGroup(submitForm).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: GameEventGroupVO) => {
   const _groupIds = row?.groupId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除赛事分组编号为"' + _groupIds + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除赛事分组编号为"' + _groupIds + '"的数据项？').finally(() => (loading.value = false));
   await delGameEventGroup(_groupIds);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('system/gameEventGroup/export', {
-    ...queryParams.value
-  }, `gameEventGroup_${new Date().getTime()}.xlsx`)
-}
+  proxy?.download(
+    'system/gameEventGroup/export',
+    {
+      ...queryParams.value
+    },
+    `gameEventGroup_${new Date().getTime()}.xlsx`
+  );
+};
 
 onMounted(() => {
   getList();
 });
-</script>
+</script>