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

src/api/race.ts

@@ -89,10 +89,10 @@ export const getHistoryRaceList = (params: any) => {
   })
 }
 // 获取学生参加的比赛
-export const getStuRaceList = (params:any) => {
+export const getStuRaceList = (params: any) => {
   return request({
     url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/list4Stu',
-    params
+    params,
   })
 }
 
@@ -111,4 +111,11 @@ export const getTopicList = (params: any) => {
     url: '/topic/topic/selectList',
     params,
   })
-  }
+}
+export const sava = (data: any) => {
+  return request({
+    url: '/upfilePersion/upfilePersion/updateStatusById',
+    method: 'POST',
+    data,
+  })
+}

src/views/userInfo/components/reacList.vue

@@ -12,6 +12,11 @@
         <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 }">
+            {{ formatstatus(row.workStatus) }}
+          </template>
+        </el-table-column>
         <el-table-column label="作品名称" prop="fileName" />
         <el-table-column label="作品文件" prop="fileName">
           <template #default="{ row }">
@@ -19,14 +24,15 @@
               link
               type="primary"
               size="small"
-              @click="download(row.fileUrl,row.fileName)"
+              @click="download(row.fileUrl, row.fileName)"
               v-if="row.uploadWorkFlag != 'no'"
             >
-             下载文件
+              下载文件
             </el-button>
-            <div v-else>无文件</div>
+            <div v-else>无作品文件</div>
           </template>
         </el-table-column>
+
         <el-table-column label="操作">
           <template #default="{ row }">
             <el-button
@@ -41,9 +47,28 @@
             <el-tag v-else>已上传作品</el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="提交" prop="fileName">
+          <template #default="{ row }">
+            <el-button
+              link
+              type="primary"
+              size="small"
+              @click="saveEvent(row.enrollCode)"
+              :disabled="row.workStatus != '4'"
+            >
+              提交
+            </el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="page">
-        <el-pagination background layout="prev, pager, next" @change="headerChange" :size="page.pageSize"  :total="total" />
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          @change="headerChange"
+          :size="page.pageSize"
+          :total="total"
+        />
       </div>
     </el-card>
   </div>
@@ -90,7 +115,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 
-import { getStuRaceList, uploadFileZp } from '@/api/race'
+import { getStuRaceList, uploadFileZp, sava } from '@/api/race'
 import { ElMessage } from 'element-plus'
 const list = ref<any>([])
 const page = ref<any>({
@@ -143,14 +168,43 @@ const submit = async () => {
   getList()
 }
 const headerChange = (pageNumber: any) => {
-  console.log(pageNumber);
-  
+  console.log(pageNumber)
+
   page.value.pageNo = pageNumber
   getList()
 }
 // 下载文件
-const download = (url: any,fileName:any) => {
- window.open(url)
+const download = (url: any, fileName: any) => {
+  window.open(url)
+}
+
+const saveEvent = async (id: any) => {
+  const res: any = await sava({ applyCode: id, status: 5 })
+  ElMessage.success(res.message)
+}
+
+const formatstatus = (status: any) => {
+  if (!status) return '未上传作品'
+  switch (status) {
+    case '0':
+      return '待评分'
+      break
+    case '1':
+      return '已评分'
+      break
+    case '2':
+      return '待驳回'
+      break
+    case '3':
+      return '已驳回'
+      break
+    case '4':
+      return '待提交'
+      break
+    case '5':
+      return '已提交'
+      break
+  }
 }
 </script>