Merge branch 'master' into dev

src/composables/useAppConfig.ts

@@ -4,6 +4,32 @@ const appConfigList = [
     logo: 'https://zws-imgs-pub.ezijing.com/pc/base/ezijing-logo.svg',
     hosts: ['saas-lab']
   },
+  {
+    title: '1+X实训平台（中级）',
+    logo: 'https://zws-imgs-pub.ezijing.com/pc/base/ezijing-logo.svg',
+    hosts: ['saas-x'],
+    studentMenus: [
+      { name: '首页', path: '/' },
+      { name: '我的实验', path: '/student/lab' },
+      { name: '理论学习', path: 'https://saas-learn.ezijing.com' }
+    ],
+    adminMenus: [
+      { name: '首页', path: '/' },
+      {
+        name: '我的实验',
+        path: '/admin/lab',
+        tag: ['v1-backend-experiment', 'v1-teacher'],
+        children: [
+          { name: '实验管理', path: '/admin/lab/experiment', tag: 'v1-backend-experiment' },
+          { name: '案例原文管理', path: '/admin/lab/case', tag: 'teacher-experiment-cases' },
+          { name: '实验指导书管理', path: '/admin/lab/book', tag: 'v1-teacher-book' },
+          { name: '实验操作视频管理', path: '/admin/lab/video', tag: 'v1-teacher-video' },
+          { name: '实验讨论交流', path: '/admin/lab/discuss', tag: 'v1-teacher-discussion' },
+          { name: '实验成绩管理', path: '/admin/lab/score', tag: 'v1-teacher-record' }
+        ]
+      }
+    ]
+  },
   {
     system: 'game',
     title: '商业数据分析竞赛平台',
@@ -14,11 +40,6 @@ const appConfigList = [
     title: '数字营销实验室',
     logo: 'https://zws-imgs-pub.ezijing.com/pc/base/ezijing-logo.svg',
     hosts: ['saas-dml-web']
-  },
-  {
-    title: '2023年全国大学生商业数据分析与应用大赛',
-    logo: 'https://zws-imgs-pub.ezijing.com/pc/base/ezijing-logo.svg',
-    hosts: ['dasai']
   }
 ]
 

src/modules/admin/contest/check/api.ts

@@ -46,3 +46,8 @@ export function importScore(data: { competition_id: string; file: File }) {
     headers: { 'Content-Type': 'multipart/form-data' }
   })
 }
+
+// 获取大赛学员提交报告列表
+export function getReportList(params: { competition_id: string; student_id: string }) {
+  return httpRequest.get('/api/lab/v1/expert/report/list', { params })
+}

src/modules/admin/contest/check/components/ScoreDialog.vue

 <script setup lang="ts">
 import { ElMessage } from 'element-plus'
+import { ArrowDown } from '@element-plus/icons-vue'
 import { usePrecision } from '@vueuse/math'
-
+import type { ReportItem } from '../types'
 import { submitScore } from '../api'
 
+defineProps<{ reportList: ReportItem[] }>()
+
 const emit = defineEmits<{
   (e: 'update'): void
   (e: 'update:modelValue', visible: boolean): void
@@ -57,6 +60,20 @@ function handleSubmit() {
       <el-form-item label="赛项名称">{{ detail.competition_id_name }}</el-form-item>
       <el-form-item label="选手姓名">{{ detail.student_name }}</el-form-item>
       <el-form-item label="选手ID">{{ detail.login_id }}</el-form-item>
+      <el-form-item label="报告">
+        <el-dropdown>
+          <el-button text>
+            查看报告<el-icon class="el-icon--right"><arrow-down /></el-icon>
+          </el-button>
+          <template #dropdown>
+            <el-dropdown-menu v-if="reportList.length">
+              <el-dropdown-item v-for="item in reportList" :key="item.id">
+                <a :href="item.url" target="_blank">{{ item.platform.name }}</a>
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+      </el-form-item>
     </el-form>
     <el-table :data="tableList" :header-cell-style="{ background: '#ededed' }">
       <el-table-column label="评分规则" prop="name" align="center"></el-table-column>

src/modules/admin/contest/check/types.ts

@@ -25,3 +25,17 @@ export interface FileItem {
   url: string
   upload_time: string
 }
+
+export interface ReportItem {
+  id: string
+  name: string
+  type: string
+  url: string
+  size: number
+  platform: {
+    platform_key: string
+    name: string
+    url: string
+  }
+  created_at: string
+}

src/modules/admin/contest/check/views/Detail.vue

 <script setup lang="ts">
+import type { ReportItem } from '../types'
+import { ArrowDown } from '@element-plus/icons-vue'
 import Preview from '@/components/Preview.vue'
 import DragPanel from '@/components/DragPanel.vue'
-import { getCheckView } from '../api'
+import { getCheckView, getReportList } from '../api'
 
 const ScoreDialog = defineAsyncComponent(() => import('../components/ScoreDialog.vue'))
 
@@ -16,15 +18,39 @@ provide('detail', $$(detail))
 
 // 评分规则文件
 const file = $computed(() => {
-  return detail ? JSON.parse(detail?.competition_rubric.url) : { url: '' }
+  return detail?.competition_rubric ? JSON.parse(detail.competition_rubric?.url) : { url: '' }
 })
-function fetchInfo() {
-  getCheckView({ id: props.id }).then(res => {
+
+const platformUrl = ref('')
+
+const platformList = computed(() => {
+  if (!detail) return []
+  return detail.competition_platform_configs.filter((item: any) => item.is_show === '1')
+})
+
+watchEffect(() => {
+  const [first = {}] = platformList.value
+  platformUrl.value = first.url
+})
+
+const currentPlatformUrl = computed(() => {
+  return platformUrl.value + (platformUrl.value?.includes('?') ? '&' : '?') + `student_id=${detail?.student_id}`
+})
+
+async function fetchInfo() {
+  const res = await getCheckView({ id: props.id })
   detail = res.data
-  })
 }
-watchEffect(() => {
-  fetchInfo()
+
+const reportList = ref<ReportItem[]>([])
+async function fetchReport() {
+  const res = await getReportList({ competition_id: detail.competition_id, student_id: detail.student_id })
+  reportList.value = res.data.items
+}
+
+onMounted(async () => {
+  await fetchInfo()
+  await fetchReport()
 })
 
 // 评分
@@ -34,10 +60,6 @@ let resizeKey = $ref(0)
 function handleResize() {
   resizeKey = Date.now()
 }
-
-const goPage = function (url: string) {
-  window.open(url)
-}
 </script>
 
 <template>
@@ -66,11 +88,21 @@ const goPage = function (url: string) {
             </p>
           </div>
           <div>
-            <template v-for="item in detail.competition_platform_configs">
-              <el-button type="primary" :key="item.id" v-if="item.is_show === '1'" @click="goPage(item.url)">{{
-                item.name
-              }}</el-button>
+            <el-select v-model="platformUrl">
+              <el-option v-for="item in platformList" :key="item.id" :label="item.name" :value="item.url"></el-option>
+            </el-select>
+            <el-dropdown style="margin: 0 10px">
+              <el-button plain>
+                查看报告<el-icon class="el-icon--right"><arrow-down /></el-icon>
+              </el-button>
+              <template #dropdown>
+                <el-dropdown-menu v-if="reportList.length">
+                  <el-dropdown-item v-for="item in reportList" :key="item.id">
+                    <a :href="item.url" target="_blank">{{ item.platform.name }}</a>
+                  </el-dropdown-item>
+                </el-dropdown-menu>
               </template>
+            </el-dropdown>
             <el-button type="primary" @click="dialogVisible = true" v-permission="'v1-expert-check-set-score'"
               >评分</el-button
             >
@@ -78,11 +110,11 @@ const goPage = function (url: string) {
         </el-row>
       </AppCard>
       <div class="lab-box">
-        <iframe :src="detail.competition_uri" frameborder="0" class="iframe" ref="iframeRef"></iframe>
+        <iframe :src="currentPlatformUrl" frameborder="0" class="iframe" ref="iframeRef"></iframe>
       </div>
     </template>
   </DragPanel>
-  <ScoreDialog v-model="dialogVisible"></ScoreDialog>
+  <ScoreDialog v-model="dialogVisible" :reportList="reportList"></ScoreDialog>
 </template>
 
 <style lang="scss" scoped>

src/stores/menu.ts

 import type { IMenuItem } from '@/types'
 import { defineStore } from 'pinia'
 import { useUserStore } from '@/stores/user'
+import { useAppConfig } from '@/composables/useAppConfig'
 
 interface State {
   studentMenus: IMenuItem[]
@@ -9,141 +10,63 @@ interface State {
 
 // 学生菜单
 const studentMenus: IMenuItem[] = [
-  {
-    name: '首页',
-    path: '/'
-  },
-  {
-    name: '我的实验',
-    path: '/student/lab'
-  },
-  {
-    name: '理论学习',
-    path: 'https://saas-learn.ezijing.com'
-  },
-  {
-    name: '我的大赛',
-    path: '/student/contest'
-  },
-  {
-    name: '大赛成绩查询',
-    path: '/student/contest/score'
-  },
-  {
-    name: '金融产品数字化营销证书',
-    path: '/student/cert'
-  }
+  { name: '首页', path: '/' },
+  { name: '我的实验', path: '/student/lab' },
+  { name: '理论学习', path: 'https://saas-learn.ezijing.com' },
+  { name: '我的大赛', path: '/student/contest' },
+  { name: '大赛成绩查询', path: '/student/contest/score' },
+  { name: '金融产品数字化营销证书', path: '/student/cert' }
 ]
 // 管理员菜单
 const adminMenus: IMenuItem[] = [
-  {
-    name: '首页',
-    path: '/'
-  },
+  { name: '首页', path: '/' },
   {
     name: '我的实验',
     path: '/admin/lab',
     tag: ['v1-backend-experiment', 'v1-teacher'],
     children: [
-      {
-        name: '实验管理',
-        path: '/admin/lab/experiment',
-        tag: 'v1-backend-experiment'
-      },
-      {
-        name: '案例原文管理',
-        path: '/admin/lab/case',
-        tag: 'teacher-experiment-cases'
-      },
-      {
-        name: '实验指导书管理',
-        path: '/admin/lab/book',
-        tag: 'v1-teacher-book'
-      },
-      {
-        name: '实验操作视频管理',
-        path: '/admin/lab/video',
-        tag: 'v1-teacher-video'
-      },
-      {
-        name: '实验讨论交流',
-        path: '/admin/lab/discuss',
-        tag: 'v1-teacher-discussion'
-      },
-      {
-        name: '实验成绩管理',
-        path: '/admin/lab/score',
-        tag: 'v1-teacher-record'
-      }
+      { name: '实验管理', path: '/admin/lab/experiment', tag: 'v1-backend-experiment' },
+      { name: '案例原文管理', path: '/admin/lab/case', tag: 'teacher-experiment-cases' },
+      { name: '实验指导书管理', path: '/admin/lab/book', tag: 'v1-teacher-book' },
+      { name: '实验操作视频管理', path: '/admin/lab/video', tag: 'v1-teacher-video' },
+      { name: '实验讨论交流', path: '/admin/lab/discuss', tag: 'v1-teacher-discussion' },
+      { name: '实验成绩管理', path: '/admin/lab/score', tag: 'v1-teacher-record' }
     ]
   },
   {
     name: '技能大赛',
     path: '/admin/contest',
     children: [
-      {
-        name: '赛项管理',
-        path: '/admin/contest/items',
-        tag: 'competition'
-      },
-      {
-        name: '参赛选手管理',
-        path: '/admin/contest/contestants',
-        tag: 'competition-competitor'
-      },
-      {
-        name: '评分专家管理',
-        path: '/admin/contest/experts',
-        tag: 'expert'
-      },
-      {
-        name: '大赛训练答疑',
-        path: '/admin/contest/discuss',
-        tag: 'v1-teacher-train-discussion'
-      },
-      {
-        name: '大赛评分',
-        path: '/admin/contest/check',
-        tag: 'v1-expert-check'
-      },
-      {
-        name: '大赛发布成绩',
-        path: '/admin/contest/score',
-        tag: 'v1-expert-score'
-      }
+      { name: '赛项管理', path: '/admin/contest/items', tag: 'competition' },
+      { name: '参赛选手管理', path: '/admin/contest/contestants', tag: 'competition-competitor' },
+      { name: '评分专家管理', path: '/admin/contest/experts', tag: 'expert' },
+      { name: '大赛训练答疑', path: '/admin/contest/discuss', tag: 'v1-teacher-train-discussion' },
+      { name: '大赛评分', path: '/admin/contest/check', tag: 'v1-expert-check' },
+      { name: '大赛发布成绩', path: '/admin/contest/score', tag: 'v1-expert-score' }
     ]
   },
   {
     name: '成绩分析',
     path: '/admin/contest/analyze',
     children: [
-      {
-        name: '赛项成绩画像',
-        path: '/admin/contest/analyze/score'
-      },
-      {
-        name: '学生个人成绩画像',
-        path: '/admin/contest/analyze/student'
-      }
+      { name: '赛项成绩画像', path: '/admin/contest/analyze/score' },
+      { name: '学生个人成绩画像', path: '/admin/contest/analyze/student' }
     ]
   }
 ]
+const appConfig = useAppConfig()
 
 export const useMenuStore = defineStore({
   id: 'menu',
-  state: (): State => ({
-    studentMenus,
-    adminMenus
-  }),
+  state: (): State => ({ studentMenus, adminMenus }),
   getters: {
-    menus: state => {
+    menus: (state): IMenuItem[] => {
       const userStore = useUserStore()
       if (userStore.role?.id === 1) {
-        return state.studentMenus
+        return appConfig.studentMenus || state.studentMenus
       } else {
-        return state.adminMenus
+        return appConfig.adminMenus || state.adminMenus
+      }
     }
   }
-  },
-  actions: {}
 })