Merge branch 'master' of https://gitlab-pro.ezijing.com/ezijing-web/saas-lab

src/modules/admin/lab/experiment/components/ViewGradeRules.vue

@@ -36,7 +36,7 @@ onMounted(() => {
         <el-form-item :label="item.name" v-for="(item, index) in detail.rule_list" :key="index" style="margin: 0">
           <div style="width: 100%; display: flex; text-align: left">
             <span style="flex: 1">{{ item.percent }}%</span>
-            <span style="min-width: 90px">满分：{{ (data.score * item.percent) / 100 }}</span>
+            <span style="min-width: 90px">满分：{{ data.score }}</span>
           </div>
         </el-form-item>
       </el-form>

src/modules/student/contest/views/Lab.vue

@@ -6,6 +6,7 @@ import DragPanel from '@/components/DragPanel.vue'
 import { upload } from '@/utils/upload'
 import { getContest, getExperimentRecord, uploadExperimentPicture } from '../api'
 import dayjs from 'dayjs'
+import { useCookies } from '@vueuse/integrations/useCookies'
 
 const Book = defineAsyncComponent(() => import('../components/Book.vue'))
 const Video = defineAsyncComponent(() => import('../components/Video.vue'))
@@ -51,6 +52,7 @@ watchEffect(() => {
 })
 
 // 右侧
+const cookies = useCookies(['TGC'])
 let iframeKey = $ref(Date.now())
 // 返回首页
 function handleBackHome() {
@@ -110,9 +112,9 @@ function handleResize() {
 }
 
 const competitionUrl = computed(() => {
-  const item = competition?.train_platform_configs.find((item: any) => item.platform_key === route.query?.type)
-  console.log(item, 'ite,', competition?.train_platform_configs)
-  return item?.url
+  const item = competition?.train_platform_configs.find((item: any) => item.platform_key === route.query.type)
+  const url = item?.url || ''
+  return url.includes('?') ? `${url}&token=${cookies.get('TGC')}` : `${url}?token=${cookies.get('TGC')}`
 })
 </script>