修改

src/views/match/one.vue

@@ -10,9 +10,31 @@
           <el-empty description="暂无数据" />
         </template>
         <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="no" align="center" label="编号" width="100"> </el-table-column>
-        <el-table-column prop="user_name" align="center" label="用户"> </el-table-column>
-        <el-table-column prop="time" align="center" label="报名时间" />
+        <el-table-column prop="no" align="center" label="编号" width="100">
+          <template #default="scope">
+            {{ scope.row.no || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="user_name" align="center" label="用户">
+          <template #default="scope">
+            {{ scope.row.user_name || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="project_name" align="center" label="项目名称">
+          <template #default="scope">
+            {{ scope.row.project_name || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="person_unit" align="center" label="单位名称">
+          <template #default="scope">
+            {{ scope.row.person_unit || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="time" align="center" label="报名时间">
+          <template #default="scope">
+            {{ scope.row.time || '——' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="ext_status" align="center" label="流程状态">
           <template #default="scope">
             {{ getDict(scope.row.ext_status, 'ext_status') || '暂无' }}

src/views/match/thr.vue

@@ -26,13 +26,51 @@
           <el-empty description="暂无数据" />
         </template>
         <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="no" align="center" label="编号" width="100"> </el-table-column>
-        <el-table-column prop="user_name" align="center" label="用户"> </el-table-column>
-        <el-table-column prop="time" align="center" label="报名时间" />
-        <el-table-column prop="start_time" align="center" label="初审时间"> </el-table-column>
-        <el-table-column prop="score" align="center" label="初审分数"> </el-table-column>
-        <el-table-column prop="final_start_time" align="center" label="决赛时间"> </el-table-column>
-        <el-table-column prop="final_score" align="center" label="决赛分数"> </el-table-column>
+        <el-table-column prop="no" align="center" label="编号" width="100">
+          <template #default="scope">
+            {{ scope.row.no || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="user_name" align="center" label="用户">
+          <template #default="scope">
+            {{ scope.row.user_name || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="project_name" align="center" label="项目名称">
+          <template #default="scope">
+            {{ scope.row.project_name || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="person_unit" align="center" label="单位名称">
+          <template #default="scope">
+            {{ scope.row.person_unit || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="time" align="center" label="报名时间">
+          <template #default="scope">
+            {{ scope.row.time || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" align="center" label="初审时间">
+          <template #default="scope">
+            {{ scope.row.start_time || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="score" align="center" label="初审分数">
+          <template #default="scope">
+            {{ scope.row.score || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="final_start_time" align="center" label="决赛时间">
+          <template #default="scope">
+            {{ scope.row.final_start_time || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="final_score" align="center" label="决赛分数">
+          <template #default="scope">
+            {{ scope.row.final_score || '——' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="ext_status" align="center" label="流程状态">
           <template #default="scope">
             {{ getDict(scope.row.ext_status, 'ext_status') || '暂无' }}
@@ -43,13 +81,14 @@
             {{ getDict(scope.row.final_confirm, 'final_confirm') || '暂无' }}
           </template>
         </el-table-column>
-        <el-table-column prop="final_order_no" align="center" label="排序"> </el-table-column>
-        <el-table-column prop="last_order_no" align="center" label="最后名次"> </el-table-column>
-        <el-table-column prop="status" align="center" label="状态" width="100">
+        <el-table-column prop="final_order_no" align="center" label="排序">
           <template #default="scope">
-            <el-tag v-if="scope.row.status == '0'" type="primary">待审核</el-tag>
-            <el-tag v-else-if="scope.row.status == '1'" type="success">已通过</el-tag>
-            <el-tag v-else type="info">已退回</el-tag>
+            {{ scope.row.final_order_no || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="last_order_no" align="center" label="最后名次">
+          <template #default="scope">
+            {{ scope.row.last_order_no || '——' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="160">
@@ -72,7 +111,18 @@
     </el-col>
     <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
       <div v-if="dialog.type == '1'">
-        <el-descriptions title="" :column="1" border>
+        <el-descriptions title="参赛结果信息" :column="2" border>
+          <el-descriptions-item label="编号">{{ form.no }}</el-descriptions-item>
+          <el-descriptions-item label="用户名称">{{ form.user_name }}</el-descriptions-item>
+          <el-descriptions-item label="赛事名称">{{ form.match_name }}</el-descriptions-item>
+          <el-descriptions-item label="报名时间">{{ form.time }}</el-descriptions-item>
+          <el-descriptions-item label="初审时间">{{ form.start_time }}</el-descriptions-item>
+          <el-descriptions-item label="初审分数">{{ form.score }}</el-descriptions-item>
+          <el-descriptions-item label="决赛时间">{{ form.final_start_time }}</el-descriptions-item>
+          <el-descriptions-item label="决赛分数">{{ form.final_score }}</el-descriptions-item>
+          <el-descriptions-item label="流程状态">{{ getDict(form.ext_status, 'ext_status') || '暂无' }}</el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions style="margin: 10px 0 0 0" title="项目详情信息" :column="1" border>
           <el-descriptions-item v-for="(item, index) in extInfo" :key="index" :label="item.problem">
             <div class="type" v-if="item.type == '0' || item.type == '2' || item.type == '3' || item.type == '4' || item.type == '5'">{{ item.reply || '暂无内容' }}</div>
             <div class="type" v-if="item.type == '1' && item.reply">{{ item.reply.join(',') }}</div>
@@ -97,12 +147,6 @@
               </div>
             </div>
           </el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="初审时间">{{ form.start_time }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="初审分数">{{ form.score }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="是否进入决赛">{{ getDict(form.final_confirm, 'final_confirm') || '暂无' }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="决赛时间">{{ form.final_start_time }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="决赛分数">{{ form.final_score }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="流程状态">{{ getDict(form.ext_status, 'ext_status') || '暂无' }}</el-descriptions-item>
         </el-descriptions>
       </div>
       <div v-else-if="dialog.type == '2'">

src/views/match/two.vue

@@ -25,11 +25,41 @@
           <el-empty description="暂无数据" />
         </template>
         <el-table-column type="selection" width="55"> </el-table-column>
-        <el-table-column prop="no" align="center" label="编号" width="100"> </el-table-column>
-        <el-table-column prop="user_name" align="center" label="用户"> </el-table-column>
-        <el-table-column prop="time" align="center" label="报名时间" />
-        <el-table-column prop="start_time" align="center" label="初审时间"> </el-table-column>
-        <el-table-column prop="score" align="center" label="初审分数"> </el-table-column>
+        <el-table-column prop="no" align="center" label="编号" width="100">
+          <template #default="scope">
+            {{ scope.row.no || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="user_name" align="center" label="用户">
+          <template #default="scope">
+            {{ scope.row.user_name || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="project_name" align="center" label="项目名称">
+          <template #default="scope">
+            {{ scope.row.project_name || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="person_unit" align="center" label="单位名称">
+          <template #default="scope">
+            {{ scope.row.person_unit || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="time" align="center" label="报名时间">
+          <template #default="scope">
+            {{ scope.row.time || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" align="center" label="初审时间">
+          <template #default="scope">
+            {{ scope.row.start_time || '——' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="score" align="center" label="初审分数">
+          <template #default="scope">
+            {{ scope.row.score || '——' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="ext_status" align="center" label="流程状态">
           <template #default="scope">
             {{ getDict(scope.row.ext_status, 'ext_status') || '暂无' }}
@@ -53,7 +83,16 @@
     </el-col>
     <el-dialog v-model="dialog.show" :title="dialog.title" :destroy-on-close="false" @close="toClose">
       <div v-if="dialog.type == '1'">
-        <el-descriptions title="" :column="1" border>
+        <el-descriptions title="参赛结果信息" :column="2" border>
+          <el-descriptions-item label="编号">{{ form.no }}</el-descriptions-item>
+          <el-descriptions-item label="用户名称">{{ form.user_name }}</el-descriptions-item>
+          <el-descriptions-item label="赛事名称">{{ form.match_name }}</el-descriptions-item>
+          <el-descriptions-item label="报名时间">{{ form.time }}</el-descriptions-item>
+          <el-descriptions-item label="初审时间">{{ form.start_time }}</el-descriptions-item>
+          <el-descriptions-item label="初审分数">{{ form.score }}</el-descriptions-item>
+          <el-descriptions-item label="流程状态">{{ getDict(form.ext_status, 'ext_status') || '暂无' }}</el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions style="margin: 10px 0 0 0" title="项目详情信息" :column="1" border>
           <el-descriptions-item v-for="(item, index) in extInfo" :key="index" :label="item.problem">
             <div class="type" v-if="item.type == '0' || item.type == '2' || item.type == '3' || item.type == '4' || item.type == '5'">{{ item.reply || '暂无内容' }}</div>
             <div class="type" v-if="item.type == '1' && item.reply">{{ item.reply.join(',') }}</div>
@@ -78,12 +117,6 @@
               </div>
             </div>
           </el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="初审时间">{{ form.start_time }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="初审分数">{{ form.score }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="是否进入决赛">{{ getDict(form.final_confirm, 'final_confirm') || '暂无' }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="决赛时间">{{ form.final_start_time }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="决赛分数">{{ form.final_score }}</el-descriptions-item>
-          <el-descriptions-item v-if="is_look" label="流程状态">{{ getDict(form.ext_status, 'ext_status') || '暂无' }}</el-descriptions-item>
         </el-descriptions>
       </div>
       <div v-else-if="dialog.type == '2'">

src/views/screen/index.vue

@@ -4,7 +4,7 @@
       <div class="one">
         <div class="left" style="left: 10%"></div>
         <div class="center">
-          <span>{{ info.name }}</span>
+          <span>{{ info.name || '赛事名称' }}</span>
           <img :src="bg_1" alt="" class="ding_img" />
         </div>
         <div class="right" style="right: 10%">
@@ -25,7 +25,7 @@
             <ul>
               <li v-for="(item, index) in list" :key="index">
                 <span>{{ item.no }}</span>
-                <span>{{ item.name }}</span>
+                <span>{{ item.project_name }}</span>
                 <span>{{ item.user_name }}</span>
                 <span>{{ item.start_time }}</span>
                 <span>{{ item.final_start_time }}</span>
@@ -43,15 +43,17 @@
 import { Vue3SeamlessScroll } from 'vue3-seamless-scroll'
 
 import { MatchExtStore } from '@/store/api/platform/matchExt'
+import { MatchStore } from '@/store/api/platform/match'
 const matchExtStore = MatchExtStore()
+const store = MatchStore()
 // 路由
 const route = useRoute()
 // 图片引入
 import bg_1 from '/images/顶图.png'
-const info = ref({ name: '赛事名称' })
 // 时间
 const formattedTime = ref('')
 const list = ref([])
+const info = ref({})
 // 请求
 onMounted(async () => {
   await search()
@@ -60,9 +62,13 @@ onMounted(async () => {
 const search = async () => {
   let id = route.query.id
   if (id) {
-    let res = await matchExtStore.lastList(id)
+    const arr = await matchExtStore.lastList(id)
+    if (arr.errcode == '0') {
+      list.value = arr.data
+    }
+    const res = await store.fetch(id)
     if (res.errcode == '0') {
-      list.value = res.data
+      info.value = res.data
     }
   }
 }