update

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

@@ -76,6 +76,11 @@ export function updateContestRuleBook(data: ContestBookUpdateParams) {
 export function getContestBook(params: { competition_id: string }) {
   return httpRequest.get('/api/resource/v1/backend/competition-book/detail', { params })
 }
+
+// 获取赛项指导书详情
+export function getContestBooks(params: { competition_id: string }) {
+  return httpRequest.get('/api/resource/v1/backend/competition-book/list', { params })
+}
 // 添加赛项指导书
 export function createContestBook(data: ContestBookUpdateParams) {
   return httpRequest.post('/api/resource/v1/backend/competition-book/create', data)
@@ -85,7 +90,7 @@ export function updateContestBook(data: ContestBookUpdateParams) {
   return httpRequest.post('/api/resource/v1/backend/competition-book/update', data)
 }
 // 删除赛项指导书
-export function deleteContestBook(data: { competition_id: string }) {
+export function deleteContestBook(data: { id: string }) {
   return httpRequest.post('/api/resource/v1/backend/competition-book/delete', data)
 }
 
@@ -137,3 +142,8 @@ export function getExpert(params: { id: string }) {
 export function getContestantList(params?: { student_name?: string; page?: number; 'per-page'?: number }) {
   return httpRequest.get('/api/resource/v1/backend/competition-competitor/list', { params })
 }
+
+// 获取平台标识列表
+export function getPlatformKeys(params?: { competition_id: string }) {
+  return httpRequest.get('/api/resource/v1/backend/competition-book/platform-keys', { params })
+}

src/modules/admin/contest/items/components/ViewBook.vue

@@ -4,7 +4,7 @@ import { CirclePlus } from '@element-plus/icons-vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import AppList from '@/components/base/AppList.vue'
 import ViewBookPreviewDialog from './ViewBookPreviewDialog.vue'
-import { getContestBook, deleteContestBook } from '../api'
+import { getContestBooks, deleteContestBook } from '../api'
 
 const FormDialog = defineAsyncComponent(() => import('./ViewBookFormDialog.vue'))
 
@@ -18,17 +18,18 @@ const appList = $ref<InstanceType<typeof AppList> | null>(null)
 const listOptions = {
   hasPagination: false,
   remote: {
-    httpRequest: getContestBook,
+    httpRequest: getContestBooks,
     params: { competition_id: props.id },
     callback(res: any) {
-      return res.detail?.id ? { list: [res.detail] } : { list: [] }
+      // return res.detail?.id ? { list: [res.detail] } : { list: [] }
+      return res?.items ? { list: res?.items } : { list: [] }
     }
   },
   columns: [
     { label: '序号', type: 'index', width: 60 },
     { label: '训练指导书名称', prop: 'name' },
     { label: '文件类型', prop: 'type' },
-    { label: '创建人', prop: 'create_user.real_name' },
+    { label: '创建人', prop: 'created_operator.real_name' },
     { label: '创建时间', prop: 'updated_time' },
     { label: '更新时间', prop: 'updated_time' },
     { label: '操作', slots: 'table-x', width: 180 }
@@ -56,7 +57,7 @@ function handleView(row: ContestBookItem) {
 // 删除
 function handleRemoveClass(row: ContestBookItem) {
   ElMessageBox.confirm('确定要删除吗？', '提示').then(() => {
-    deleteContestBook({ competition_id: row.competition_id }).then(() => {
+    deleteContestBook({ id: row.id }).then(() => {
       ElMessage({ message: '删除成功', type: 'success' })
       onUpdateSuccess()
     })

src/modules/admin/contest/items/components/ViewBookFormDialog.vue

@@ -4,7 +4,7 @@ import type { ContestItem, ContestBookItem, ContestBookUpdateParams } from '../t
 import { ElMessageBox, ElMessage } from 'element-plus'
 import { pick } from 'lodash-es'
 import AppUpload from '@/components/base/AppUpload.vue'
-import { createContestBook, updateContestBook } from '../api'
+import { createContestBook, updateContestBook, getPlatformKeys } from '../api'
 import { useMapStore } from '@/stores/map'
 
 interface Props {
@@ -12,6 +12,8 @@ interface Props {
 }
 const props = defineProps<Props>()
 
+const route = useRoute()
+
 const emit = defineEmits<{
   (e: 'update'): void
   (e: 'update:modelValue', visible: boolean): void
@@ -30,7 +32,8 @@ const form = reactive<any>({
   type: '',
   name: '',
   status: '1',
-  protocol: false
+  protocol: false,
+  platform_key: ''
 })
 watchEffect(() => {
   if (!props.data) return
@@ -75,7 +78,7 @@ function handleUploadSuccess(file: any) {
 function handleSubmit() {
   formRef?.validate().then(() => {
     const [file] = form.files
-    const params = Object.assign({}, pick(form, ['competition_id', 'name', 'type', 'status']), {
+    const params = Object.assign({}, pick(form, ['competition_id', 'name', 'type', 'status', 'platform_key']), {
       url: JSON.stringify({ name: file.name, url: file.url, size: file.size })
     })
     isUpdate ? handleUpdate(params) : handleCreate(params)
@@ -91,12 +94,28 @@ function handleCreate(params: ContestBookUpdateParams) {
 }
 // 修改
 function handleUpdate(params: ContestBookUpdateParams) {
+  params.id = props.data?.id
   updateContestBook(params).then(() => {
     ElMessage({ message: '修改成功', type: 'success' })
     emit('update')
     emit('update:modelValue', false)
   })
 }
+
+// 获取平台标识列表
+let platformKeys = $ref<{ platform_key: string; name: string }[]>([])
+const getPlatformKeysList = function () {
+  console.log(route, 'route')
+  getPlatformKeys({ competition_id: route.params?.id as string }).then(res => {
+    if (res.data?.items) {
+      platformKeys = res.data?.items
+      if (form.platform_key === '') {
+        form.platform_key = res.data?.items[0]?.platform_key
+      }
+    }
+  })
+}
+getPlatformKeysList()
 </script>
 
 <template>
@@ -120,11 +139,13 @@ function handleUpdate(params: ContestBookUpdateParams) {
       <el-form-item label="关联赛项">
         <el-input :value="detail.name" disabled></el-input>
       </el-form-item>
-      <el-form-item label="默认有效" prop="status">
-        <el-radio-group v-model="form.status">
-          <!-- <el-radio v-for="item in status" :key="item.id" :label="item.value">{{ item.label }}</el-radio> -->
-          <el-radio :key="1" label="1">商业数据分析实验</el-radio>
-          <el-radio :key="1" label="2">数字营销实操</el-radio>
+      <el-form-item label="关联实验">
+        <el-radio-group v-model="form.platform_key">
+          <el-radio v-for="item in platformKeys" :key="item.platform_key" :label="item.platform_key">{{
+            item.name
+          }}</el-radio>
+          <!-- <el-radio :key="1" label="1">商业数据分析实验</el-radio>
+          <el-radio :key="1" label="2">数字营销实操</el-radio> -->
         </el-radio-group>
       </el-form-item>
       <el-form-item label="有效状态" prop="status">

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

@@ -71,6 +71,7 @@ export interface ContestBookItem {
 }
 
 export interface ContestBookUpdateParams {
+  id?: string
   competition_id: string
   name: string
   url: string

src/modules/student/contest/api.ts

@@ -36,6 +36,11 @@ export function getExperimentBook(params: { competition_id: string }) {
   return httpRequest.get('/api/lab/v1/student/competition/book', { params })
 }
 
+// 获取实验指导书
+export function getExperimentBooks(params: { competition_id: string; platform_key: string }) {
+  return httpRequest.get('/api/lab/v1/student/competition/books', { params })
+}
+
 // 获取实验视频
 export function getExperimentVideoList(params: { competition_id: string }) {
   return httpRequest.get('/api/lab/v1/student/competition/videos', { params })

src/modules/student/contest/components/Book.vue

 <script setup lang="ts">
 import type { ExperimentBookType } from '../types'
+import { CloseBold } from '@element-plus/icons-vue'
 import Preview from '@/components/Preview.vue'
-import { getExperimentBook } from '../api'
+import { getExperimentBooks } from '../api'
 
 interface Props {
   competition_id: string
 }
 const props = defineProps<Props>()
 
-let detail = $ref<ExperimentBookType>()
+const route = useRoute()
+
+let list = $ref<ExperimentBookType[]>([])
 function fetchInfo() {
-  getExperimentBook({ competition_id: props.competition_id }).then(res => {
-    detail = res.data.detail
+  getExperimentBooks({ competition_id: props.competition_id, platform_key: route.query?.type as string }).then(res => {
+    list = res.data.items
   })
 }
 watchEffect(() => {
   fetchInfo()
 })
 
-const isEmpty = $computed(() => {
-  return !props.competition_id || !detail?.id
-})
+// const isEmpty = $computed(() => {
+//   return !props.competition_id || !detail?.id
+// })
 
-const file = $computed(() => {
-  if (!detail) return {}
-  return JSON.parse(detail.url)
-})
+// const file = $computed(() => {
+//   if (!detail) return {}
+//   return JSON.parse(detail.url)
+// })
+
+let currentRaw = $ref<ExperimentBookType | undefined>()
+let currentRawUrl = $ref('')
+let show = $ref(false)
+// 预览
+function handleView(row: ExperimentBookType) {
+  currentRaw = row
+  currentRawUrl = row.url ? (JSON.parse(row.url)?.url as string) : ''
+  console.log(row, 'row')
+  show = true
+}
+// 关闭
+function handleClose() {
+  show = false
+}
 </script>
 
 <template>
-  <el-empty description="暂无数据" v-if="isEmpty" />
+  <!-- <el-empty description="暂无数据" v-if="isEmpty" />
   <template v-else>
     <Preview :url="file.url"></Preview>
-  </template>
+  </template> -->
+  <div v-if="list.length">
+    <ul class="book-list">
+      <li v-for="item in list" :key="item.id" @click="handleView(item)">
+        <el-icon><Document /></el-icon>
+        <p>{{ item.name }}</p>
+      </li>
+    </ul>
+  </div>
+  <el-empty description="暂无数据" v-else />
+  <!-- 预览 -->
+  <div class="book-preview" v-if="show && currentRaw">
+    <div class="book-preview__close" @click="handleClose">
+      <el-button type="info" circle :icon="CloseBold" />
+    </div>
+    <Preview :url="currentRawUrl"></Preview>
+  </div>
 </template>
+
+<style lang="scss">
+.book-list {
+  li {
+    display: flex;
+    align-items: center;
+    margin-bottom: 10px;
+    font-size: 14px;
+    cursor: pointer;
+    .el-icon {
+      margin-right: 5px;
+    }
+  }
+}
+.book-preview {
+  position: absolute;
+  top: 15px;
+  left: 15px;
+  right: 15px;
+  bottom: 15px;
+  background-color: #fff;
+}
+.book-preview__close {
+  position: absolute;
+  right: -12px;
+  top: -12px;
+  font-size: 20px;
+  color: #fff;
+  cursor: pointer;
+}
+</style>

vite.config.ts

@@ -26,6 +26,16 @@ export default defineConfig(({ mode }) => ({
       cert: fs.readFileSync(path.join(__dirname, './https/ezijing.com.pem'))
     },
     proxy: {
+      '/api/resource': {
+        target: 'http://com-resource-admin-test.ezijing.com',
+        changeOrigin: true,
+        rewrite: path => path.replace(/^\/api\/resource/, '')
+      },
+      '/api/lab': {
+        target: 'http://com-resource-api-test.ezijing.com',
+        changeOrigin: true,
+        rewrite: path => path.replace(/^\/api\/lab/, '')
+      },
       '/api': 'https://saas-lab.ezijing.com'
     }
   },