Merge branch 'base' of http://182.92.169.222:3000/dlsx/ContestPortal into base

src/api/race.ts

@@ -88,3 +88,26 @@ export const getHistoryRaceList = (params: any) => {
     params,
   })
 }
+// 获取学生参加的比赛
+export const getStuRaceList = () => {
+  return request({
+    url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/list4Stu',
+  })
+}
+
+// 上传作品
+export const uploadFileZp = (data: any) => {
+  return request({
+    url: '/upfilePersion/upfilePersion/workUpload',
+    method: 'POST',
+    data,
+  })
+}
+
+// 获取题目列表
+export const getTopicList = (params: any) => {
+  return request({
+    url: '/topic/topic/selectList',
+    params,
+  })
+  }

src/views/registrationGroup/index.vue

@@ -126,6 +126,19 @@
             <el-form-item label="队伍名称" prop="teamName">
               <el-input v-model.number="ruleForm.teamName" />
             </el-form-item>
+            <el-form-item label="选择题目" prop="teamName">
+              <el-select
+                v-model="ruleForm.topicId"
+                placeholder="请选择题目"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
           </el-form>
         </div>
 
@@ -162,6 +175,7 @@ import { getSignUpApi } from '@/api/person'
 import stuList from './components/stuList.vue'
 import teaList from './components/teaList.vue'
 import { getNdbswxqList, getComppxqList } from '@/api/person'
+import {getTopicList} from '@/api/race'
 const user = userStore()
 const route = useRoute()
 const router = useRouter()
@@ -227,6 +241,34 @@ const submit = () => {
     })
     .finally(() => (loading.value = false))
 }
+const options = [
+  {
+    value: 'Option1',
+    label: 'Option1',
+  },
+  {
+    value: 'Option2',
+    label: 'Option2',
+  },
+  {
+    value: 'Option3',
+    label: 'Option3',
+  },
+  {
+    value: 'Option4',
+    label: 'Option4',
+  },
+  {
+    value: 'Option5',
+    label: 'Option5',
+  },
+]
+const getTopicListApi = async() => {
+    const res = await getTopicList({annualCompid:route.query.id})
+    console.log(res);
+    
+}
+getTopicListApi()
 </script>
 
 <style lang="scss" scoped>

src/views/userInfo/components/reacList.vue

@@ -0,0 +1,119 @@
+<template>
+  <div class="container">
+    <el-card>
+      <template #header>
+        <div style="font-size: 16px; font-weight: 600">我的比赛</div>
+      </template>
+      <el-table :data="list">
+        <el-table-column label="比赛名称" prop="annualCompid_dictText" />
+        <el-table-column label="比赛类型" prop="entryFormat" />
+        <el-table-column label="报名编号" prop="enrollCode" />
+        <el-table-column label="比赛状态" prop="enrollStatic_dictText" />
+        <el-table-column label="操作">
+          <template #default="{ row }">
+            <el-button
+              link
+              type="primary"
+              size="small"
+              @click="uploadZp(row.annualCompid, row.enrollStatic)"
+              v-if="row.uploadWorkFlag != 'yes'"
+            >
+              上传作品
+            </el-button>
+            <el-tag v-else>已上传作品</el-tag>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+  <el-dialog
+    v-model="dialogVisible"
+    title="上传作品"
+    width="500"
+    :before-close="handleClose"
+    v-if="dialogVisible"
+    :close-on-click-modal="false"
+  >
+    <el-form label-width="80" style="padding-right: 30px">
+      <el-form-item label="比赛名称">
+        <el-input v-model="raceName" />
+      </el-form-item>
+      <el-form-item label="证书">
+        <el-upload
+          ref="upload"
+          class="upload-demo"
+          action="#"
+          v-model:file-list="fileList"
+          :limit="1"
+          :auto-upload="false"
+        >
+          <template #trigger>
+            <el-button type="primary" >选择文件</el-button>
+          </template>
+
+          <template #tip>
+            <div class="el-upload__tip text-red">作品只允许上传一个</div>
+          </template>
+        </el-upload>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleClose">取消</el-button>
+        <el-button type="primary" @click="submit">确认</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+
+import { getStuRaceList, uploadFileZp } from '@/api/race'
+import { ElMessage } from 'element-plus'
+const list = ref<any>([])
+const getList = async () => {
+  const res: any = await getStuRaceList()
+  console.log(res)
+  list.value = res.result.records
+}
+getList()
+const fileList = ref<any>([])
+const raceName = ref<any>('')
+const dialogVisible = ref(false)
+const annualCompid = ref('')
+const uploadZp = (id: any, staus: any) => {
+  if (staus == 1) return ElMessage.warning('审核后方可上传作品')
+  console.log(id)
+  annualCompid.value = id
+  dialogVisible.value = true
+}
+const handleClose = () => {
+  dialogVisible.value = false
+  fileList.value = []
+  raceName.value = ''
+  annualCompid.value = ''
+}
+const submit = async () => {
+  if (!raceName.value) return ElMessage.warning('请输入作品名称')
+  if (!fileList.value.length) return ElMessage.warning('请上传作品')
+  console.log(fileList.value[0].raw, raceName, 'fileList.value[0].raw')
+  const fromData = new FormData()
+  fromData.append('files', fileList.value[0].raw)
+  fromData.append('annualCompid', annualCompid.value)
+  fromData.append('workName', raceName.value)
+  const res: any = await  uploadFileZp(fromData).then((res: any) => {
+    console.log(res)
+    if (res.code == 500) return ElMessage.warning(res.message)
+    ElMessage.success(res.message)
+  })
+  console.log(res)
+  handleClose()
+}
+</script>
+
+<style scoped lang="scss">
+.container {
+  margin-top: 25px;
+}
+</style>

src/views/userInfo/index.vue

@@ -90,7 +90,9 @@
         </div>
       </div>
     </el-card>
+    <reacList />
     <awardeList />
+   
   </div>
   <el-dialog
     v-model="dialogVisible"
@@ -156,6 +158,7 @@ import { useRouter } from 'vue-router'
 import userStore from '@/store/module/user'
 import { getFaculties, uploadFile, editUserInfoApi } from '@/api/race'
 import awardeList from './components/awardeList.vue'
+import reacList from './components/reacList.vue'
 const useUserStore = userStore()
 const userInfo = ref<any>({})
 console.log(useUserStore.userInfo, 'useUserStore')